Remove USE="policykit" for sys-auth/policykit wrt #340335.

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

3 files changed, 10 insertions, 18 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 3507ba5be9be..3716352ef521 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.237 2010/12/16 22:44:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.238 2010/12/18 23:13:40 ssuominen Exp $
+
+  18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> gconf-2.26.2-r1.ebuild:
+  Remove USE="policykit" for sys-auth/policykit wrt #340335.
 
 *gconf-2.32.0-r1 (16 Dec 2010)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 382e844a79ed..a966474e7c43 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 RMD160 77e4fae8a19a57904d9e6706238a94172da5c223 SHA1 9deb172ce170e7333931e61e3cf2ae6ade24bb33 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0
 DIST GConf-2.26.2.tar.bz2 1474738 RMD160 280cd55dc3562445c716b88dfddba4ddd2508786 SHA1 bf5323d974fa22165de2144100234647fd50ef17 SHA256 717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed
 DIST GConf-2.28.1.tar.bz2 1476141 RMD160 9ee3b6e68553997a128ca2b49992ddfbe157609b SHA1 944e067a85b43e7a778b9ee244f85508931a49a0 SHA256 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000
 DIST GConf-2.32.0.tar.bz2 1541688 RMD160 9ef6adca69e5ac8e2386f28f5af8e8c5c9fbb52e SHA1 2711c7b53761d2c789112bb1f989f1c1a6de5265 SHA256 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0
-EBUILD gconf-2.26.2-r1.ebuild 2599 RMD160 b8c407651d1e8997931bbaf78a8e42a245328c96 SHA1 49515bb55e2c3242795a133ac36cd08d82383ee4 SHA256 00de89e14cc3f013d89b73faa9e628097cf9c5e159822d66b05de72c47a5e9fe
+EBUILD gconf-2.26.2-r1.ebuild 2540 RMD160 837f7b17ec71581401aecec1bcf9d29e27507f70 SHA1 54bb9cdf64dcbec10a2724b8cc4ba03d0ad23aec SHA256 e64084d3f69e2f97f22944f7eb643b4a667d1e5c0e7e95ea3ded6bc145cf8079
 EBUILD gconf-2.28.1.ebuild 2720 RMD160 0310462704540d7a17f929aab0c239e27c289f6a SHA1 da4691ecb6f0999f308135b6ea5e6102c414b037 SHA256 4fcafbf1b82317502618374121ac41e54950cffaf4b94edaad5f32459aca9cd5
 EBUILD gconf-2.32.0-r1.ebuild 2636 RMD160 7d823e346dccc91fc37acb550a4ddb725d698c43 SHA1 07461e7a83d0b6d6971ebf89b8a302dd6bd38d67 SHA256 2ad345322160482ef08ec2246b8371f9c27750e75f1c32c20df82d80af449555
 EBUILD gconf-2.32.0.ebuild 2616 RMD160 a83f137b2b44a85bcbcf25545222036f66b4aba0 SHA1 e519adc5366bd32bf041a6c484460983b5470894 SHA256 6e5e69fad2ae715073f6f61ecceaecded1e7436f73ed25be00b84929fc2338cb
-MISC ChangeLog 31298 RMD160 4b4a87497ac6aad7a92f7664a2e6fa5ec73edd65 SHA1 7997ddb1ba74993b76ce502a3edfacf11d8cdc91 SHA256 254caaeb40ddc0cc847c61599b84e43f9cacf3e0627bbff2991645843d84ef0c
+MISC ChangeLog 31444 RMD160 8c5cfc82fa464bc19fba2417a6fd85c96f0bf468 SHA1 7b6fc7ecada6e204a5c0fb19d34605bb49a68d59 SHA256 ddf9772270cfc1f60550eb91aaf8622f408033c671b13e184d17a88c8f14763f
 MISC metadata.xml 271 RMD160 e40f6a4275515a716f4f9ebd453f40385873fa9c SHA1 5da5e829df17818099633d3ebe2880a830088f63 SHA256 091ef40c3b351c464d5718aee2e63cc81da0674a41a052d2c3a0a247b548ea88
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0KlmwACgkQ1fmVwcYIWAbpQgCg04iNfJevXhIAGySbaoQ7r2DA
-Nh4An0U+GYY8Xgo7rBxjd7czmiLtoCUS
-=il/o
------END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.26.2-r1.ebuild b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
index 54bd1e5bb01d..598699931442 100644
--- a/gnome-base/gconf/gconf-2.26.2-r1.ebuild
+++ b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.26.2-r1.ebuild,v 1.10 2010/07/20 15:32:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.26.2-r1.ebuild,v 1.11 2010/12/18 23:13:40 ssuominen Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc ldap policykit"
+IUSE="debug doc ldap"
 
 RDEPEND=">=dev-libs/glib-2.14
 	>=x11-libs/gtk+-2.8.16
@@ -25,8 +25,7 @@ RDEPEND=">=dev-libs/glib-2.14
 	>=sys-apps/dbus-1
 	>=gnome-base/orbit-2.4
 	>=dev-libs/libxml2-2
-	ldap? ( net-nds/openldap )
-	policykit? ( >=sys-auth/policykit-0.7 )"
+	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
@@ -42,7 +41,7 @@ pkg_setup() {
 		--enable-gtk
 		--disable-static
 		$(use_with ldap openldap)
-		$(use_enable policykit defaults-service)"
+		--disable-defaults-service"
 	kill_gconf
 
 	# Need host's IDL compiler for cross or native build, bug #262747