Drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

13 files changed, 28 insertions, 491 deletions

diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog
index 2264e58392b1..513f54634efe 100644
--- a/app-crypt/gcr/ChangeLog
+++ b/app-crypt/gcr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gcr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.33 2014/04/21 10:28:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.34 2014/04/23 20:40:28 pacho Exp $
+
+  23 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gcr-3.4.1-invalid-whitespace.patch, -gcr-3.4.1-r2.ebuild,
+  -gcr-3.8.2.ebuild:
+  Drop old
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gcr-3.10.1.ebuild:
   Stable for arm, wrt bug #507568
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 31de5a17ab2c..8f6f555ea922 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,29 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gcr-3.4.1-invalid-whitespace.patch 1752 SHA256 ec744e55714d7f700dd8179f3c365da9a9538e9866be4f0616ffd880ff3a8a02 SHA512 f4bf4e8643b5a7be9cbb2173ff6bd9ecde542e1bf6d65752104b1727fc315faba647cf1d867130d9e5193b3cdaad911fdc1b5935bc84949e5723d31abdc2da57 WHIRLPOOL 7b423338f123ffc89f34b2441098e745ab38dd59290a65e046be205ff0d5f3d8017cdb694959fe1077d3cd20768272d6fbcb28c4b3169d4f61cfcd15e4d3dc4e
 DIST gcr-3.10.1.tar.xz 1402524 SHA256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b SHA512 2c02465398a12d2cd7210a4a7478076e7706d01b80413598feb02c967179b86d77388321ba510112bf820f7600ea139fb126ba9cd7eed2236a055052cea811b2 WHIRLPOOL b6af579de0564b41861606f2f36156319b1e7f127baa2edb49aa6bde58a63a549cbbc842bb362ced3e01ff32dca9c1b5c998ea92b24805fe0bc34a0dca7a5306
-DIST gcr-3.4.1.tar.xz 1335160 SHA256 a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609 SHA512 bfd298b2fe52a97bcae6988b865dbe4f43ade209531cb5ddeebbd4a5f9ac3310f2bf9aebfc6101da63b2db427b8d4b822d3711693ab91a6227f632a7d9189874 WHIRLPOOL 01386f8b140f99861c9dc24b25dc675b862d851ef31cae94ac071d30701e5fc357fb7d763c23ba0d64578fb0f2ece36ec087302e356aafb3f9abe1b53a1f936a
-DIST gcr-3.8.2.tar.xz 1393924 SHA256 a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1 SHA512 487e6de7f42f996f77099eb1ec660720c9583806c03c544fe05fc828d56dd60fdd12b2523d3cb3cfa1c67954b3722cb21169cbd8050d81bd15ab780ef66a5f9d WHIRLPOOL 52f09b87f9f62628bd5417fdb206a47ef00df10a58b576dddbf461c3ec81ae958bd2ec4bb85bde9786c16b7cc3c7140686a92f608f165ae18be6ef9b90c900b6
 EBUILD gcr-3.10.1.ebuild 1907 SHA256 e2031af77b388bd8aa37f72b260a761231d16963149eeebaaeecd7c82d872fb7 SHA512 f99a36fb3330e1a0adaed37091f9c499d0d158cb2258fbfe2269fd0a82d503e61256bce126ddd7db64316d20ec60246a27d543d5effb0ee16d35e87243c981aa WHIRLPOOL 6ab46d68017f0589f75b10077c8c9449810ab2ac6f4ff73ccc84cae977a3fe7f24c2c99907018d537ef30e963dd457ab5ca866e3d70e243fdc4b24b6356905b0
-EBUILD gcr-3.4.1-r2.ebuild 1717 SHA256 b23b38df15f227ce883feb0992e8363ddb16349c80edab493784fd137bf20d98 SHA512 5852b33954599f2ebdf895de6d7f24fb48a200e22f269b470843dfb58eb13cea3bb9d26b4436d7f3fdb2b5d555f3495f88f6b1a8866e9d08861cedca02a2e721 WHIRLPOOL ea13e22cc729dc71ff9826c4bddc2b1381c21515a24eb6a68d0934e97d9c2c2e31b6052e554a8ca098c2a79e38530e17464c05d187ec89c52605eb51824ea2cc
-EBUILD gcr-3.8.2.ebuild 1731 SHA256 6607ae516f21d53c8e7bf8a03b994f852d57ee7768b90ad8820702bb10763bbb SHA512 d214b607f15eda724449c828f996ecc8c2d664340a21c046dba25be52cfaec1844b02d86b0ff2d3d29c57f620597d0877816b546c80e1614682e365efe1495c6 WHIRLPOOL 833c0906626c935a36bc6e4cd1c6f2331ae8e3b195e3f4e7afb254b6e27d25870093167714abc778cc3609c92808ff8d694720cdc7f9b6ef22ca61795c9f6a68
-MISC ChangeLog 4333 SHA256 1250b854da75e62444e18752a838b5360e3cdb3ef9795858ec072211b37b80b8 SHA512 0d33482f8b066ec31696e9144dae3079f2b4c50ff126912388bcc1f33e363bd8dd65e5a5a8a0d85ef1d78a7a7664b65363658fa2653548ea8253ed29d6e872aa WHIRLPOOL 3015015e6cefca72a61b5ebaffcef0e07fba83c4bd34f430042e0b4bba818f587b09d92b1c78274f6bfc5ae1c9210a3f91d70df6c4193ce9561cba56e57e6626
+MISC ChangeLog 4481 SHA256 28d0904cbe8d945c1257e7def0d1c00d1c8509131acbec060e7b1d6ccb2ac764 SHA512 88fcb1b7f2c0f826dfe31a8f2c50be0496a70f2d6f6f8af419a02f3a705bc3c8718041203e990c29ebf3efdc54636fb9764b66816e57c315223dbf0569749636 WHIRLPOOL d96a9b41e55aaddf9cc716262373e7a73f6abae170c1e729d804ca70b4970355df742e02b5dc9c3cd262105c13c89556c3b8a5749f3825086cb64979659c61ee
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVPLNAAoJELp701BxlEWfjB4P/2akXTL1r2co6bRF1JJeVI/4
-3VfAevSxUTzFHh2/a5hUBCuHQOCbHa/Y2W+5osiVxZA8c8h9Xwdx+jGae+Wze7/M
-wi9FqFsBz+OpxkzQ3rTHJMzd179SNbO5R4Ndz7QS0oI5OfEW31SycP2fTrbh4xbH
-SBwN+lXwEM0tUa/Vkg3JzlVVlWileo5fZM6U9D6epf4VxrSWO8Xjor2W1B0TRsO2
-fwrzhNoqmV9+4Wg0e5PfrGxibdbMO2cmsN8GgueRt6S4zgcRcu++a8jwnfYkMQIu
-U6e6iRbQkhX4WR8ycV0TWkDM83W7LLVZ7An0nJy6NRq6G+GZQmls+Ljh4Ly+RJDf
-LafLhTIQv3Wv6YLEwk/Gryz5RdZdfORBDOhnRe+hohuqTQ/putONyn/Qj/WsR0K/
-pxSDngck+rFRvdAEf4sMQSLjaYSp6LhKVq780Gug+YyEMmCKE2ij+Fme+unvsnjc
-oJZM0Eh3BBBWcPFGkD7UnE9pYYDwgeZkXLDnV+EqL67GW5VUR4O5S2ICofn5RrDR
-44jhir55bnhvBZ5WJaxlBj11AROMLkywzhT3iah5c+JB0maxnBPhmotR3rf0chNW
-C1t3fJ1Qd0gBom6Y+tUiwQ9lOd2y8JdwYPGynUmoAqy1xJcjfL4HWfy1D7XhFTVF
-EPd8kSRsUJjM3J771AUT
-=ADrK
+iEYEAREIAAYFAlNYJT0ACgkQCaWpQKGI+9ToHwCfbC6NYSpBh7rzs50w6PMFq4zu
+ArcAniadY0DkogEmZVoZI59gFIRuQACe
+=Nqkp
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gcr/files/gcr-3.4.1-invalid-whitespace.patch b/app-crypt/gcr/files/gcr-3.4.1-invalid-whitespace.patch
deleted file mode 100644
index 4f3287ca7dfb..000000000000
--- a/app-crypt/gcr/files/gcr-3.4.1-invalid-whitespace.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b7e899d45a49085e2cedbff1cf76e6d8450b0bea Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Sat, 30 Jun 2012 13:10:31 +0200
-Subject: [PATCH] gcr: Fix invalid warning when sending a secret exchange
-
- * We checked the prefix of the sent data, but didn't correctly
-   remove whitespace. In addition the check was inverted
- * Exposed by recent changes to glib, which changed the whitespace
-   in the format a GKeyFile slightly
----
- gcr/gcr-secret-exchange.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
-index cb3941f..f6eb32e 100644
---- a/gcr/gcr-secret-exchange.c
-+++ b/gcr/gcr-secret-exchange.c
-@@ -292,9 +292,9 @@ gcr_secret_exchange_begin (GcrSecretExchange *self)
- 	result = g_key_file_to_data (output, NULL, NULL);
- 	g_return_val_if_fail (result != NULL, NULL);
- 
--	g_strchomp (result);
-+	g_strchug (result);
- 
--	if (g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
-+	if (!g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
- 		g_warning ("the prepared data does not have the correct protocol prefix");
- 
- 	g_key_file_free (output);
-@@ -540,10 +540,10 @@ gcr_secret_exchange_send (GcrSecretExchange *self,
- 	result = g_key_file_to_data (output, NULL, NULL);
- 	g_return_val_if_fail (result != NULL, NULL);
- 
--	g_strchomp (result);
-+	g_strchug (result);
- 
--	if (g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
--		g_warning ("the prepared data does not have the correct protocol prefix");
-+	if (!g_str_has_prefix (result, SECRET_EXCHANGE_PROTOCOL_1_PREFIX))
-+		g_warning ("the prepared data does not have the correct protocol prefix: %s", result);
- 
- 	g_key_file_free (output);
- 	return result;
--- 
-1.7.12
-
diff --git a/app-crypt/gcr/gcr-3.4.1-r2.ebuild b/app-crypt/gcr/gcr-3.4.1-r2.ebuild
deleted file mode 100644
index 90cc7efa1f5a..000000000000
--- a/app-crypt/gcr/gcr-3.4.1-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.4.1-r2.ebuild,v 1.9 2014/03/01 22:23:44 mgorny Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2 virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="debug +introspection"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND=">=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.6
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/libgcrypt-1.2.2:0
-	>=dev-libs/libtasn1-1
-	>=sys-apps/dbus-1.0
-	>=x11-libs/gtk+-3.0:3
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable introspection)
-		--disable-update-icon-cache
-		--disable-update-mime"
-
-	epatch "${FILESDIR}/${P}-invalid-whitespace.patch" #434422
-
-	# FIXME: failing tests
-	if use test; then
-		sed -e 's:test-subject-public-key::' \
-			-e 's:test-system-prompt:$(NULL):' \
-			-i gcr/tests/Makefile.am || die "sed failed"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
diff --git a/app-crypt/gcr/gcr-3.8.2.ebuild b/app-crypt/gcr/gcr-3.8.2.ebuild
deleted file mode 100644
index 673d2cd42af9..000000000000
--- a/app-crypt/gcr/gcr-3.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.8.2.ebuild,v 1.4 2014/03/01 22:23:44 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://developer.gnome.org/gcr/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-IUSE="debug gtk +introspection"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.6
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	dev-libs/gobject-introspection-common
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
diff --git a/app-crypt/libsecret/ChangeLog b/app-crypt/libsecret/ChangeLog
index de21228560a3..c208c29753df 100644
--- a/app-crypt/libsecret/ChangeLog
+++ b/app-crypt/libsecret/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/libsecret
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/ChangeLog,v 1.35 2014/04/21 10:28:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/ChangeLog,v 1.36 2014/04/23 20:42:52 pacho Exp $
+
+  23 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libsecret-0.15-r1.ebuild,
+  -libsecret-0.15.ebuild:
+  Drop old
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsecret-0.16.ebuild:
   Stable for arm, wrt bug #507568
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 2b31a16a2420..fc01792abb09 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,27 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libsecret-0.15.tar.xz 484532 SHA256 33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8 SHA512 d89f3b52c5300306b92b222a56c976e5c42f761c2a8691b0dbac9f533853a54f6dd91f9f22f577e336c77e9771dd3cb098963dab086759ead2750f2a8fce5dca WHIRLPOOL 23eb06d6ed09023704b73cd9c1927bed09e38a58ec9694e43f8838879ce4f34ac67efb7a8f0b7770b26260ccb474c2f4e7c398f326b94dd08b63d7fe22e03ff1
 DIST libsecret-0.16.tar.xz 499888 SHA256 b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218 SHA512 2223861439733bf0e97d59236327aded8d17f89ce81aff17bd18c632960e7024c43be1480cd4591495401ac161dcb725d3d5fcd0b43120bfc6472c4a021ed770 WHIRLPOOL 32c7edafa67d0b26c9ec1d87d42ee4ff47abd134f34189a1b22d5c89b7386fa4403321c8595f587f6c02da36c5ce6e313e8ef7841527ddc1990efe8323194183
-EBUILD libsecret-0.15-r1.ebuild 1777 SHA256 24174982a7c354453193e85ef424551186ccccdb46f1308f36e8176703c74a06 SHA512 849036274c7dc8e7f661e168bcf3d4d9b458d0b310e38c5fa6d09e563625a6c1610189298dc68a7c852ae463493e66508591f45f6570a0dcd998e4d89f9b7820 WHIRLPOOL 0c6812f8ba05eb0bacfdaf29e0c74cd7da1145f24bd4e43d0f7a1d946c967d19daaa17d964a84ad68c70fc946bc88c2a0f937a80bf00504c0e7a2ab47c9c3d9c
-EBUILD libsecret-0.15.ebuild 1835 SHA256 aa606b129d967b2b6cdaa74b2e12ead02a4f1fc749c686abd1376cbf5530358a SHA512 0e9da1a342bf0aa31b79f8ba1d1d5a1d86e179e9027649c178de7b628126706c82c2a66130004d9bf4fc2d588d2899e55e7d04ff5e0e1b1a7831ac248c607c17 WHIRLPOOL 910e426c00b566c179d02ba4fe616c9c4a4327530660a8c7b7be3a7fb8fe469861c1891a0c751ef219c0a95e05288cfa1e0325a75659e220cf2b9f76d4a6f124
 EBUILD libsecret-0.16.ebuild 1772 SHA256 fc5c9ed63e506d9fe8437ab51e833cc5bc81933cec001365a22d46e19c5a7b33 SHA512 2d5800e99e27018ca68557f2753c29112072835bf2cad05b647386782422138fc2bcb8ca595d41e0a410b75241f2c8963d2c14d38251e76eb2594c8074f108cb WHIRLPOOL 31ff80ce5578ddad051f27c4acf507c482351446503fb272e92003e785ae9c955d6f8b861c3e552ffcfcaf304f1d3f1b1333c9488441e049ea62a9088597230e
-MISC ChangeLog 4999 SHA256 65b486e59ec238f534871f213057797b100379118b3a972b2e67d470c8871150 SHA512 d385da5dcb5b4119f547a4bb6815707a97ca874bfdede837da8543d5c9cfd67c0a7f75f42582fdcf55ccc2562035b7f99c1d9b457232cd578af61fa1adef2db0 WHIRLPOOL 4098a554e5609678197573e6e97d38f3c797aada8d081c2d2301b6469b8572a34d0e5a5726a7b25574d372e3b0745c5890e5f3f702985983b3ca4e45aabd8153
+MISC ChangeLog 5112 SHA256 4de94b9fb672c972624510d789fb0b4830f63a7005871e18cf7eec37a126cc13 SHA512 454a162e1b5f00cf6807d9a84d1481df8a866dd64348ede57eb214707265358f0da921d7503fa4a25b4b7e735abf924101ee490ef2c810b1dccdaa4dfb91636e WHIRLPOOL bb83e29a2eb999e436dd10997b425f862460b6a37508229c6395027acd61c802cd26eb9e68b2d1f1bf1d6d7c9b249e852ec1057158f616b0d80b335414e28214
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVPLPAAoJELp701BxlEWfvVYP/RaM1oQ7v8V8sCuLuzAyyNtA
-9QPIhgYrx9DlCaJTIQjgIOxrFc5bkEPbPeuXYwtgto6MXNSQeAVFTRpUhVh/27z0
-vuM+vN9wm+nQ6p6eb6J2tKWl6XTG5KsTVf1vB5WIrrE+QntcelyjWro8PEOeDT74
-8NXyDmTKkJfO+oyvihaXFw786gZvIp75Q2UVa8FwKpqdTtVNLMWHT/LRg9Q2H9Qj
-Dgb03EgNkWeL2pfeIivK9+aZth0XhDlQu3Mc0vl+53RkqUN3BgJPEkrZPAEWo8/8
-6YST5/pUPapZgJMZIISCHbCMhWl004U5RSdyx7dyz2ee9ii8DyXE5QV/0te0b46X
-GdorxisYF80kNFqPsiEuJQxklZUyezNWkITdupSE3O/D/1MWIpyJIKGCj0Mc0HHu
-MCm80lL5KclqydTtaQZpxGkte5IoOD/DrqrYFsi8/WLJ3e1x1bZ8RObO0mdPdrlJ
-8vfuySo8gmDT+64sg3510JJ/rahdY4GXAiEP/s6fQPOlnDlcjj1qbrPZTf+LMd72
-vDjRk+gyIWLSgrjjiYyisZi0xLCxEyvQsxtJSfR7wSyeDKWIsOwmRVNI0/5mfR8i
-tpwy69BuvgX1JnSGUqbj8aPGqpJtCGiOqd94j4LetbHb5aGZ83dXfiJjFX59ujxU
-t0Cmv+8wxVnFQ8DGKQSf
-=5yud
+iEYEAREIAAYFAlNYJc0ACgkQCaWpQKGI+9RqOwCfbea3kMCQ0wkJXqoAypnPU79k
+oW8AmgNM7q1NSsQIF92TWSQdJBFkReDf
+=Gqhz
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/libsecret/libsecret-0.15-r1.ebuild b/app-crypt/libsecret/libsecret-0.15-r1.ebuild
deleted file mode 100644
index 044d11d7d48a..000000000000
--- a/app-crypt/libsecret/libsecret-0.15-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15-r1.ebuild,v 1.4 2014/03/01 22:30:47 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-VALA_MIN_API_VERSION=0.18
-VALA_USE_DEPEND=vapigen
-
-inherit eutils gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://live.gnome.org/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-IUSE="+crypt debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-keyring-3"
-# Add ksecrets to RDEPEND when it's added to portage
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-python/mock
-		introspection? (
-			${PYTHON_DEPS}
-			>=dev-libs/gjs-1.32
-			dev-python/pygobject:3 )
-	)
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# FIXME: disable failing test
-	sed -e '/test_get_sync);/d' \
-		-e '/test_get_async);/d' \
-		-i libsecret/tests/test-service.c || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--enable-manpages \
-		--disable-strict \
-		--disable-coverage \
-		--disable-static \
-		$(use_enable crypt gcrypt) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/app-crypt/libsecret/libsecret-0.15.ebuild b/app-crypt/libsecret/libsecret-0.15.ebuild
deleted file mode 100644
index bed092f50a93..000000000000
--- a/app-crypt/libsecret/libsecret-0.15.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15.ebuild,v 1.4 2014/03/01 22:30:47 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-VALA_MIN_API_VERSION=0.18
-VALA_USE_DEPEND=vapigen
-
-inherit eutils gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://live.gnome.org/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-IUSE="+crypt debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-RDEPEND="${COMMON_DEPEND}"
-# Temporarily removed from RDEPEND to allow stabilization:
-#	>=gnome-base/gnome-keyring-3
-# Add ksecrets to RDEPEND when it's added to portage
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-python/mock
-		introspection? (
-			${PYTHON_DEPS}
-			>=dev-libs/gjs-1.32
-			dev-python/pygobject:3 )
-	)
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# FIXME: disable failing test
-	sed -e '/test_get_sync);/d' \
-		-e '/test_get_async);/d' \
-		-i libsecret/tests/test-service.c || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--enable-manpages \
-		--disable-strict \
-		--disable-coverage \
-		--disable-static \
-		$(use_enable crypt gcrypt) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index f3cc81995add..c49bda7de36e 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.179 2014/03/16 00:01:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.180 2014/04/23 20:44:41 pacho Exp $
+
+  23 Apr 2014; Pacho Ramos <pacho@gentoo.org> -seahorse-3.10.2.ebuild,
+  -seahorse-3.8.2.ebuild:
+  Drop old
 
   16 Mar 2014; Pacho Ramos <pacho@gentoo.org> seahorse-3.10.2-r1.ebuild:
   amd64 stable, bug #504582
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 103805a950e7..dd25ec7ae29b 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -5,17 +5,14 @@ AUX seahorse-2.32.0-libnotify-0.7.patch 729 SHA256 8f7b2fc0ad1cb572de3c31ed694e5
 AUX seahorse-3.10.2-include-correct-headers-for-vala.patch 943 SHA256 3070918a99ac4ff1de4f67a4db82e867578259ae3454c30660f368cbb6d62f52 SHA512 02f8cf69b74e7f34a85b24557518782e25701ee7b5c622f1e5de46563d07970a28527017fba5426899455d03cb59d803a403dda3c1042a572c6762e76f4127fc WHIRLPOOL ae4194912805bb52b0f2fca7468c5ad94de8af5ded27186ee836eb76aaa3b7aad25d8d788a095bb688e8513e219ccec09654f2846ad865d9f3e0e73e6cb115f3
 DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d SHA512 b75d94dbce8a00ecec4c230975104b0868f5b51bbcaf18a3b0a2520156c1b1336ad60a978775657fdca0bdabd0ebcd52a5e086a25ed8be1cbae9354245705879 WHIRLPOOL ce686c02f8f3935e963ef2fcf4b334372cb8698eb67353891276c79e3f587e50d3b9cb8bd5291eaff21e1e7bc48a82ddc8fa87a24cdf39e1c1732846d71d1e5d
 DIST seahorse-3.10.2.tar.xz 2109592 SHA256 89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16 SHA512 7257f96c4e77902c018cfcff9e2096ab216fd4bfde729c08d7305f20e58664675381ad60e394d0536e392345cc6bcfb2de59af1a2a4e3e5ae56856aa8fc0d80c WHIRLPOOL 9c940ac1168b12c19884aff2b8ffbad48b1e0f1aaebca182489722e2c542f54fedafcc17c912b21afff547e4c6b1253c2d8c2a2f2195978b21edef3b055151b8
-DIST seahorse-3.8.2.tar.xz 2012712 SHA256 b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12 SHA512 bef79052b874e752a6adcce7273bb5bc0ef513c9814374494f5da1e78e8653f0ef59ea7b5233e59419113e2b18d35578e2d902cc8ffbdeb50a419a0257fc3ada WHIRLPOOL 59ad2c53bfed0ca731e1fe1e61af215eea5c7a81c133a6fd5b5787731626a3fd44fca58b490063a5c4d1ccffed614f5ae6ccd59d4d551b02ea66c9d45456834f
 EBUILD seahorse-2.32.0.ebuild 2162 SHA256 badf51a1c01e93ba577a0458f68d3724a2b313a44bba565b6b1696a20b11dfe5 SHA512 484f27fda351e6adb8732da527f091fe2299a56bc909a5a9fc2edc4b00fef795111bd07090c97bf73e8f7feca6b5863ca7bf41c991e64adabbb6bddd1d2607ef WHIRLPOOL 8a565ff071f14a638622473909ae2214192f7a49233e44709151f1807258c2bfbd3135d18087144f532d56f140acfc76e3a5ce9c4010a4ecddda59bd6041a04b
 EBUILD seahorse-3.10.2-r1.ebuild 1987 SHA256 c04a92833a3210f06e65ff0620a744b7499d181cdc1fd98233759d1b04048f3e SHA512 5b9941c1fd711166bb54811e81c0937ebdcbbe9e6397c9d95a5abbb01b93b975b18037c3a7e29aa8ee0cd5ce2b3d9911fe3d30982441dff83113940e563c1b5f WHIRLPOOL c3dd69376a0b147c378405b6b3614463fff1e540fd5047462a4fab4d5369a1185bb57337846d5f8a6efa054a4ab673c118b67b610017fdef58d1483510b4eaf8
-EBUILD seahorse-3.10.2.ebuild 1534 SHA256 1e9e95982555b27f92d9080cea46cec9fbe2ec94470e4f311860dfd3715bcb72 SHA512 93760005543f3f8900cf0306c5777dd235b345590922a25f7b33fdf64e632ec0456a8fff57f859f9413da9e117dddec9dea6e50fb4fc0a7e599a41fd4e276a21 WHIRLPOOL 398c449b5b89a171de64ed421f9ffa83d6a5ae745078bb314fe1511aae9815d961c7bf641b34bf548651b56c70857c6dec4eb3a775d0c8d6a3aba9c31f6b2900
-EBUILD seahorse-3.8.2.ebuild 1505 SHA256 edce30328881bd8d02e649434a52915bf5e46f68c942713553978f473a51b37d SHA512 e264d5d49093aa98e0fecd4b2891bb90b37be839cecfdd3fc913b226af36c4e737aa1d3f0cad4d7d3802623e144c49c34717bd801585439b9ea8f13975849507 WHIRLPOOL 99d2633cd125b6caf0d2cdd95be36b815eb7277da641167af15130d049f0c032a4542273a5b022ff08664bd52690861c74ca4796a0c9c0de54b124477f59229d
-MISC ChangeLog 25828 SHA256 e5b8015313eadf6ec06092c1d83488b3432a01ac43f36da951d96db179218f0c SHA512 d19cd03267d92dec28bf448fdef1170b8ef313b3bcf915cef96d13335da9ea8a0e3a62840f13a73dd07d3e9100b16dd7163301628994976fcc573968685bc9bf WHIRLPOOL d9aaaae1efe8399d8b9f3714473acd60bfcaf759304f348bcf8753f96ab7e90a23b2d3f01f2f71e525e1641a40539c1a47ec3e3d6e01ae8ae54753d36658933e
+MISC ChangeLog 25937 SHA256 607e5041e62b316cfd80ebc5312dc92f84b0afbc1df1e0d9cf3aff8847e501bb SHA512 2f6372e33b9af7d2397f89b009bc5b03da0009a7791f15728e26d3a72ec21a5434f5f9e8a7242b0cbf351b93c0b943dd91f9b63c731bf1d2428119ad9208ea1d WHIRLPOOL 48dfd71686374f43c183c2990559eb23be20b9fea94edc60efee54ea734f1257c6f7d1457c6ba67e66f63e7a9d1b9441fa68522ec75f751b38aadb9698fdb593
 MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMk6d0ACgkQCaWpQKGI+9T0UACfYWboQXQpl3CqNUvvWhG7eUwb
-9iEAn0IN1BzEw+k4nlBPA7as/ioL94JJ
-=+hSR
+iEYEAREIAAYFAlNYJjoACgkQCaWpQKGI+9Q45wCfRe0cx+RFOkzZqGrX0JprUtnW
+RcAAn0IVv11xQyapCCtBFovjNmLkAk07
+=DatV
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/seahorse-3.10.2.ebuild b/app-crypt/seahorse/seahorse-3.10.2.ebuild
deleted file mode 100644
index 3f43b7cc920e..000000000000
--- a/app-crypt/seahorse/seahorse-3.10.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.10.2.ebuild,v 1.3 2014/03/09 11:53:24 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="avahi debug ldap"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.9.1:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
-
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--disable-static \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/app-crypt/seahorse/seahorse-3.8.2.ebuild b/app-crypt/seahorse/seahorse-3.8.2.ebuild
deleted file mode 100644
index 79df79ea46cb..000000000000
--- a/app-crypt/seahorse/seahorse-3.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.8.2.ebuild,v 1.3 2013/12/08 17:39:30 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="avahi debug ldap"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.3.4:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.5
-	>=net-libs/libsoup-2.24.0:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
-
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--disable-static \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		ITSTOOL=$(type -P true)
-}