summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-17 08:29:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-17 08:29:05 +0000
commit3d8c4253e4064809618b439dd10e8549795e3f77 (patch)
tree7633d8a732725fd8a9ad60251edc3d222f494881
parentmarked x86 per bug 420041 (diff)
downloadgentoo-2-3d8c4253e4064809618b439dd10e8549795e3f77.tar.gz
gentoo-2-3d8c4253e4064809618b439dd10e8549795e3f77.tar.bz2
gentoo-2-3d8c4253e4064809618b439dd10e8549795e3f77.zip
Unmask sys-auth/polkit and sys-fs/udisks wrt #420269
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 02df90ce37c7..6145c8999a61 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6688 2012/06/17 06:38:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6689 2012/06/17 08:29:05 ssuominen Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 17 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Unmask sys-auth/polkit and sys-fs/udisks wrt #420269
+
17 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
targets/desktop/gnome/package.use:
Match curl's CURL_SSL defaults for pycurl to prevent block.
diff --git a/profiles/package.mask b/profiles/package.mask
index 81ac52f64da4..df62c7e23607 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13869 2012/06/16 20:41:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13870 2012/06/17 08:29:05 ssuominen Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -221,11 +221,6 @@ dev-python/generatorrunner
>=dev-lang/ocaml-4.00.0_alpha
>=dev-ml/findlib-1.3.2
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (09 Jun 2012)
-# Doesn't work, bug #420269. Bad dependencies, bugs #420173, #420307.
-=sys-auth/polkit-0.106
-=sys-fs/udisks-1.98.0
-
# Michael Weber <xmw@gentoo.org> (9 Jun 2012)
# The mentioned versions fail to assemble raid 0/1/5 devices.
# As reported in bug 416081 users end up with multiple raids