Drop unneeded gconf dependency (bug #398751, thanks to Olof Kindgren for reporting). Drop old.

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

5 files changed, 18 insertions, 67 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index b7a87dcac6a9..784bfba1232e 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnome-keyring
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.30 2011/11/17 06:10:33 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.31 2012/01/13 20:23:49 tetromino Exp $
+
+  13 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgnome-keyring-2.32.0.ebuild, -libgnome-keyring-3.2.0.ebuild,
+  libgnome-keyring-3.2.2.ebuild:
+  Drop unneeded gconf dependency (bug #398751, thanks to Olof Kindgren for
+  reporting). Drop old.
 
 *libgnome-keyring-3.2.2 (17 Nov 2011)
 
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 1ebb9948a436..8df2c312f599 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -5,17 +5,15 @@ AUX libgnome-keyring-2.32.0-drop-test.patch 3415 RMD160 dfe6b9b0b017cddf1eb4ee21
 AUX libgnome-keyring-2.32.0-hang-tests.patch 607 RMD160 13926efd8ba29ead2648bd345cf3453a1353f4a7 SHA1 1f7117a9ebf87a337d6956d923f318e0011d1242 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 RMD160 58b7eb297dd901a0bb4d1abd54091f36ce82847a SHA1 c93f326daf89f0a91c86ad05b638375e77a7f15f SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 RMD160 201df6c60a931a43edd58c994dea5bb20d5d378f SHA1 9d7c9dc923e03ed2f201cb563e28922e35b88ea0 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c
-DIST libgnome-keyring-3.2.0.tar.xz 358448 RMD160 475fdc8c093f1039770f4e1102ec38bbfd4720b6 SHA1 709369de82598f04b91eb384511712063ee4cfa9 SHA256 0516403432b06ecc173c9f9dbe3eaa87b2c7a230806fcac4dfd73ad998e928f5
 DIST libgnome-keyring-3.2.2.tar.xz 358976 RMD160 ea1483361d3865b00f90d4ca24fc6f0af0329c35 SHA1 1c8c02bcfa68d8457437ac9ea8f5ad76e9a997d8 SHA256 2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3
-EBUILD libgnome-keyring-2.32.0.ebuild 1683 RMD160 63d9be3a642def5984ab38066f3942483bed3405 SHA1 42a23296dec1f65fa5ee14d569113b52a5347973 SHA256 3d7c79b8518182bd59ba575afbb9d0ba1ea979309cb867b4f4ee9e434939ab84
-EBUILD libgnome-keyring-3.2.0.ebuild 1341 RMD160 9f20a2a6223acd7cccac1b2eb1b05ad90b1acfcc SHA1 9f1dec2270e31fbe5cde7aec9c997a9c5f46cb56 SHA256 b30460ae8a66d457c88dbf46311247c4d31e330e5c311c0b09fed5eba3c41d16
-EBUILD libgnome-keyring-3.2.2.ebuild 1341 RMD160 507ab48f87ddccea9d9230db0b6f39fcf40ddd6c SHA1 923162dfc8c936c9a522bf49f25cb6daaf5f3a5e SHA256 657f01440ffe613e153ec4ea39aa8fee2f8c1cc804413b026589832c7456babb
-MISC ChangeLog 5005 RMD160 66945972ebaf3b530ec9c8c806b46cc12b7ad0a0 SHA1 7ba54623bda944a0c42d9079085890d37a761b48 SHA256 b9e16d5567032f017c6aba163dd9d4ccc2257e1fe0ec279d8a0ee70d8bcab2d7
+EBUILD libgnome-keyring-2.32.0.ebuild 1669 RMD160 6fe1c5ad4a95cf10ce23944a04976ec2c6d9924a SHA1 200adcdbae51efb475c7abb9927b39b604285586 SHA256 cc7f8a1d56915f5f52179e953cb86c6a82c2160fe53c944a817bee8c32a7806e
+EBUILD libgnome-keyring-3.2.2.ebuild 1323 RMD160 abea4c378bc25576da0611e5f0c8bdd2535611e0 SHA1 6d35a127690ed21107e88d216b318df246d35f88 SHA256 caabfe20207a951441911a2c184ec5a1d796d390fbaf1334469dea17ac045e8f
+MISC ChangeLog 5263 RMD160 ff91141e785000de24ad63c73fd43fadbf10fc5c SHA1 5c9ba3c094b819c601ab7e1fdb87261261b6588b SHA256 b8b074a5330c8f51f4c55b36a320ccf2d9f88cfddb2d35973da3cb5bc4a977a4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7EpV4ACgkQdjK8w9WeBnDqqQEAsYNtRVTAGKr69P09mZCmGBvL
-wlUNF9dsbKY13B0sv9wA/2ajNh5G4oBC4N9lBqkApIv0aUOblBkCqs8uknmfVAyl
-=qlHs
+iF4EAREIAAYFAk8QktsACgkQdjK8w9WeBnCaXgD8DDBpIkHG1YW/hR5F0P/j5dhH
+IR5f/e9jlRWyoO+dToEA/1JbIXNFrIdAEhiXCm+pyq+XisH5Rry7dbDGfKN0mLQi
+=gr/I
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
index 1aab4f2edbf6..446575a8d0bc 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.13 2011/09/12 08:41:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.14 2012/01/13 20:23:49 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -17,7 +17,6 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-lin
 IUSE="debug doc test"
 
 RDEPEND=">=sys-apps/dbus-1.0
-	gnome-base/gconf
 	>=gnome-base/gnome-keyring-2.29[test?]
 	!<gnome-base/gnome-keyring-2.29"
 DEPEND="${RDEPEND}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild
deleted file mode 100644
index a79a43237e3f..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild,v 1.1 2011/10/30 07:28:17 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc test"
-
-RDEPEND=">=sys-apps/dbus-1.0
-	gnome-base/gconf
-	>=gnome-base/gnome-keyring-3.1.92[test?]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests full)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-
-	# FIXME: Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.ac configure || die "sed 2 failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
index bae7185e2d85..f814c0a256a2 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:10:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.2 2012/01/13 20:23:49 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris
 IUSE="debug doc test"
 
 RDEPEND=">=sys-apps/dbus-1.0
-	gnome-base/gconf
 	>=gnome-base/gnome-keyring-3.1.92[test?]"
 DEPEND="${RDEPEND}
 	sys-devel/gettext