Clean up old revision, small policy fixes to 3.8 ebuild.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 20 insertions, 63 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index f6a17b277a8a..c27ed153473b 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.39 2013/03/28 17:15:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.40 2013/03/29 19:36:23 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnome-keyring-3.4.1.ebuild, libgnome-keyring-3.8.0.ebuild:
+  Clean up old revision, small policy fixes to 3.8 ebuild.
 
 *libgnome-keyring-3.8.0 (28 Mar 2013)
 
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 97bdc802499b..fa41960f1114 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -5,19 +5,17 @@ AUX libgnome-keyring-2.32.0-drop-test.patch 3415 SHA256 4928c561f46b6dabab93d19a
 AUX libgnome-keyring-2.32.0-hang-tests.patch 607 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0 SHA512 6c842e018253841b5ea2138f19fae6a8cecafddb9b697f4ad8cdc287774d4db292f686e58ab0be47e66da72914a3205a3676819553ca5eda3708fee8a6b734ab WHIRLPOOL 3f7c92558aed3b013d7e8756c18be6e81756634dec7f9e4dde1b63e359e23929ed2f4177db259f352b97f2749e1f609fe69f32a194c3fe659678510a3d96b0ea
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740 SHA512 3b002273d3655efca39f343eaeda1806420739041cd71ad4af6023dacae55e8d7f7ea6d25e482c64436005754dec4362005d03242792df01866a27f55c92ae0c WHIRLPOOL 7b4edfcc610fdd6bcb1a8b3c1d38966ea5c03c6efffed37823969fe19e78a6f19e59ff671d914cebb0691f1ce7ded76165d55e5b5cbae4640628a4cb66ed457d
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b
-DIST libgnome-keyring-3.4.1.tar.xz 417752 SHA256 e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8 SHA512 a6fd998fcc310390e8523a4c67818e0db28bc14799457475f00d2327ab72dac1b0ff8500e84de5f498e67c10f95ed38bf5f661454169651afc6860d6cb7a8c44 WHIRLPOOL e999052493cd1fd8f695a75d761436568b4050a88eade2c42f7306ab4c7aa4667dd963806ffab73f809cae767d578bd24dd2f946cbac8b0b9ca89b69453824b4
 DIST libgnome-keyring-3.6.0.tar.xz 423376 SHA256 6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830 SHA512 23913270972423abfe3eef785d553f4460f2a9930b464509897b22120fd5d376c67945d0a92d49cfd03aea514985511acbbfc46e776b9bfd2cd2cace49d0fbee WHIRLPOOL 589b05557efed6ae6e9916d8903e986d5fd1acfc1ddf348adaf7e6db6086ea627ee07e7bfba4ec46acb3ecffb38d67605828a9d62a19be5d2c6292e2084476f9
 DIST libgnome-keyring-3.8.0.tar.xz 426056 SHA256 a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76 SHA512 9c2991ee7066e206b095ba82bc576d386b854d26637c1b6a9ae30ed9200bbb34a9c06c488624edcd6b607ad3b58b7954e6a3f1ee79fc9f595b7c517f23c06de7 WHIRLPOOL 4e862549281573d692c233a4b1bea7e3866223983a1e85f2e37d81a2d1dac9e2472c1d6cef3ac60e79304d3b67aa1548680bd9c57ca77b28b62f1b9d69844018
 EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
-EBUILD libgnome-keyring-3.4.1.ebuild 1337 SHA256 40b5f5bbac3568d33b1bfffa30ea50b0103069c436b5176ccc7f78ea0a08abb6 SHA512 9cf73397ef0efe1b124e1fed9c7bc738301a1d51a422381f91425c647066f21332abaa4ecfbf717f388a735037269dd4ca120505c4795d5baacba65650c20393 WHIRLPOOL 688f3a2e560ab75ecaf2309b2b4a8ac94ab2e2e2894932562a703730ae82147f0cb0cc35392564e4c30193f47e8e417e273f643581b42028e8cab987fa35a4bd
 EBUILD libgnome-keyring-3.6.0.ebuild 1505 SHA256 f2f3678e2387e9bb0112a153c0c44f93b274b60e5fb10c31cae5804b667ad3f9 SHA512 047f699a9f40ebedec711282fde3f6885301b6ddda3ed18ac1fb0b57518e23cfe88651046359ce775007926100eb7e9d3dfc112d27bb490dbf49aab5b438c0b6 WHIRLPOOL 1a039d23b9a1b5bb03220559b8f6cb0be38371a45adc2b577b30bee4c83aa033ce2ed95d49618fc1ee8b9e333391e88812ba39d1bd94c527b139cbd93370b7fb
-EBUILD libgnome-keyring-3.8.0.ebuild 1454 SHA256 9841a0d8688a8ec3037833c756894bc7554aed9e95fe8c1966b6442cbe0a030b SHA512 c9f8e04d146b80388fec6007b5ca5215a8421e6cbed23f3ebd74f7071d4c58a0d5f0706b386c0e5e60c884391f9587ac963df63af46309c9352e25a0bb017937 WHIRLPOOL 45a32f65029846c361a372a1c5b97591a549a0da09fc32f38206e6882a450accc45f39f0e9489c7c2fe84cb6abe2adf0822c95e9e3ba6b872ccdb3f43ab8193c
-MISC ChangeLog 6736 SHA256 12f7b0dc3d026a1ca758e51d7ba5e0e0f00e228dd9d9539616eec07a230b381c SHA512 8254f8da80a27cff7941788989be0cbb5767ba44e9c48bf14f7ce02f6adf5774f8db05e88bd8aaead67f6b570048dcc1fce7613742b49aa6f51697d839e7e519 WHIRLPOOL 7a5e4740961ac6124547dd12430d4cb0510ef49fdeeb2367402aa58997c8bae6f95dda76c4d18b73cfc09ce5ef47ec107607a01c2e7b8ff28000cc7fcc90948d
+EBUILD libgnome-keyring-3.8.0.ebuild 1493 SHA256 0199de61549be6013990151c3420284a14b2c1fc4a9415d94a936756dc4d97ee SHA512 b12cd26c47dd1315a20fc82838a6687df1b32c913d8f98939db5581e41e1a032a7a2aba009021b55aa200f38c7c2d3f3aee3de341d6bf60c0d5b256bc8062aeb WHIRLPOOL d90e2956ab9e0a435bb88e89243bcb0d97458f2750b5fbbb331098b6a894fa9928bbc54421d8d3518a0b975af677bfe65e93aa43dccf0b4d5de29c2e8588e936
+MISC ChangeLog 6913 SHA256 01caae2c045757d5c5c4aa7184f451a19f2a3ce827ee129674e4a205feb0c4a1 SHA512 a9aeb5fe3545ffc8a8c3ba09b9b434a4292155d4139c1078d3a0b7c410d80f346dbbb2b5e3db79066b730a5d722c9506167e7b9c77898200b3ac95046554bcab WHIRLPOOL 959d2ea4f2f99c8d99c1e3f9ea5057271a48ce6d55350f5174579f05240e50b22db25b6e5b81f1a4a5c36cd20038f05a2075f1df0bfe1f660840cc8e04f3b3c5
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUes0ACgkQCaWpQKGI+9QyJgCcD3ktSp4sLTeT/T2Z6DK4+vVK
-D5EAn3l9qv8MWP9tqmQ1pHA01j3CK3u2
-=F5bd
+iEYEAREIAAYFAlFV7TgACgkQ1fmVwcYIWAaVFACgvUYInv1lIAGfOq7Xe8duvlr2
+DKMAoMcwH6WTwUvUeLoFxjrbCYzl+6YG
+=5tFU
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
deleted file mode 100644
index ae1bcca0ac9f..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.4.1.ebuild,v 1.2 2012/12/17 04:46:05 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 python
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug +introspection test"
-
-RDEPEND=">=sys-apps/dbus-1.0
-	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( =dev-lang/python-2* )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed 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.8.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
index cb3d9d98e744..3a22e8e30349 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.0.ebuild,v 1.1 2013/03/28 17:15:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild,v 1.2 2013/03/29 19:36:23 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -20,9 +20,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-RDEPEND=">=sys-apps/dbus-1.0
+RDEPEND="
+	>=sys-apps/dbus-1
 	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
@@ -32,16 +34,19 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )"
 
 src_prepare() {
-	G2CONF="${G2CONF} $(use_enable vala)"
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 
-	# FIXME: Remove silly CFLAGS
+	# FIXME: Remove silly CFLAGS, report upstream
 	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
 		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
 		-i configure.ac configure || die "sed failed"
 }
 
+src_configure() {
+	gnome2_src_configure $(use_enable vala)
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	dbus-launch emake check || die "tests failed"