Drop old (#508854)

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

6 files changed, 12 insertions, 301 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index 98e567033ebc..ea91e8bfc6fa 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.65 2014/10/14 07:51:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.66 2014/11/13 11:36:35 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libgnome-keyring-2.32.0-drop-test.patch,
+  -files/libgnome-keyring-2.32.0-hang-tests.patch,
+  -files/libgnome-keyring-2.32.0-run-test.patch,
+  -libgnome-keyring-2.32.0.ebuild:
+  Drop old (#508854)
 
   14 Oct 2014; Pacho Ramos <pacho@gentoo.org> -libgnome-keyring-3.10.1.ebuild,
   libgnome-keyring-3.12.0.ebuild:
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 33aaa15747a5..ab7482590818 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgnome-keyring-2.32.0-drop-test.patch 3415 SHA256 4928c561f46b6dabab93d19a82ff3cb6afa76a62bbba19312c417372b28eba89 SHA512 299ebf991a136483917a7739b3289e02c476e161991d13df7931fb7c2a8e742c1d8dc95540be919b4211a155303c29de00c80618f456fee2c05bf943751fa258 WHIRLPOOL c485ff391aa8d9d99e8f8431fb935d5eeca634e420c4b5c14ad4f36f742d7edf9ac61bc76a702c989d58f49b8b54ae7f58a6ec504eeb69be24bc76db3887cd29
-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.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5
-EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
 EBUILD libgnome-keyring-3.12.0.ebuild 1553 SHA256 b99ba89b2d75c6d1f8cf2bf7e2a9c6a414c6c34584c4cc92b2539fa54fc3abe2 SHA512 e2855a35eaabf76ab972984745ae47f7b84904dd44b5d6bc6df32fedbc53cf96565dcd9587387fc73eea3ffd708ad690530c9ef92c13f563a551c45b316d9314 WHIRLPOOL 73bc222c4a8358c89fb2fa1d89e82fa769a2b86a23ab8d4cccfd16b2237d51027c5b2f97c5f054d87e9fa800f3655e61addf715a8371e8858b40e81693fc3403
-MISC ChangeLog 9935 SHA256 8537c19e388b91bfb723d7421ba0aa11c24f503978a6320daa0aeab71c99f029 SHA512 7b98f858a9da29b76ecbfeda7c43e62bc19157c58856d8d5819bd8921642f78755bb84ce0d321aa505ed5607342d5c07ca7d5976d3c1dcba4eb7d1adee1e39d2 WHIRLPOOL d6b9eb398959542ca9e7829bfb3a817610490207abd87a4a3c97daae061ce2997f69afb48a23bc8b1f24ec59ff1d33195403f28a469827566a9e91f4ec70c8d8
+MISC ChangeLog 10188 SHA256 4da76859eb799942e7b3946304285e3810b21fd5328b8731b7a31af3f42a573c SHA512 ffe92ae55f09acafcd9be9e081e0e2e511c2cb1714c7519876c163364a811216caf6f285a45c15c060d04dc63aa06983d6fbf93215d34b10b20394b678240759 WHIRLPOOL 9727f88ae6a084a11d7bb7f2c5317d077740434acce073378fa9ead3cd7696f9aa49cbee970b2f56e19a9aacfee9c8940c9e161806562c5b84178e781f15d361
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ81f8ACgkQCaWpQKGI+9SG1wCfSyLBOhpF5VScbMs4uTfHjhIc
-iW4AnjEs3b3uWzEzjWqQZ8LmZK26RxKv
-=XFoM
+iEYEAREIAAYFAlRkl8QACgkQCaWpQKGI+9RakwCcC2wh8eb0/40jkgxHx1cBtM04
++HQAn1PKYk4S8QVXgTYRz+7iqsfGZOve
+=ARVV
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch
deleted file mode 100644
index 9cbd156cfb54..000000000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 987f84c13bac6032164616b220289b5824bbd6a2 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stef@memberwebs.com>
-Date: Wed, 19 Jan 2011 19:44:39 +0000
-Subject: Remove unneeded test file.
-
----
-diff --git a/library/tests/Makefile.am b/library/tests/Makefile.am
-index 9514c47..0a54cc7 100644
---- a/library/tests/Makefile.am
-+++ b/library/tests/Makefile.am
-@@ -2,16 +2,12 @@
- TEST_AUTO = \
- 	test-memory.c \
- 	test-keyrings.c \
--	test-other.c \
--	test-daemon-setup.c
-+	test-other.c
- 
- TEST_LIBS = \
- 	$(top_builddir)/egg/libegg.la \
- 	$(top_builddir)/library/libgnome-keyring.la
- 
--TEST_FLAGS = \
--	-DTEST_WITH_DAEMON
--
- include $(top_srcdir)/tests/gtest.make
- 
- # ------------------------------------------------------------------
-diff --git a/library/tests/test-daemon-setup.c b/library/tests/test-daemon-setup.c
-deleted file mode 100644
-index 077656d..0000000
---- a/library/tests/test-daemon-setup.c
-+++ b/dev/null
-@@ -1,86 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--/* unit-test-daemon-setup.c: Start a gnome-keyring-daemon process for testing
--
--   Copyright (C) 2007 Stefan Walter
--
--   The Gnome Keyring Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Library General Public License as
--   published by the Free Software Foundation; either version 2 of the
--   License, or (at your option) any later version.
--
--   The Gnome Keyring Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Library General Public License for more details.
--
--   You should have received a copy of the GNU Library General Public
--   License along with the Gnome Library; see the file COPYING.LIB.  If not,
--   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--   Boston, MA 02111-1307, USA.
--
--   Author: Stef Walter <stef@memberwebs.com>
--*/
--
--#include <stdlib.h>
--#include <stdio.h>
--#include <string.h>
--#include <signal.h>
--#include <unistd.h>
--
--#include "run-auto-test.h"
--
--#include "library/gnome-keyring.h"
--
--#if 0
--static GPid daemon_pid;
--#endif
--
--DEFINE_START(setup_daemon)
--{
--#if 0
--	GError *err = NULL;
--	gchar *args[3];
--	const gchar *outside, *path;
--	gboolean start = FALSE;
--	gchar *socket;
--
--	/* If already setup somewhere else, then don't start daemon here */
--	outside = g_getenv ("GNOME_KEYRING_OUTSIDE_TEST");
--	if (!outside || !outside[0])
--		start = TRUE;
--
--	path = g_getenv ("GNOME_KEYRING_TEST_PATH");
--	g_assert (path && path[0]);
--
--	socket = g_strdup_printf ("%s/socket", path);
--	g_setenv ("GNOME_KEYRING_SOCKET", socket, TRUE);
--
--	if (!start)
--		return;
--
--	g_printerr ("Starting gnome-keyring-daemon...\n");
--
--	args[0] = "../../daemon/gnome-keyring-daemon";
--	args[1] = "-f";
--	args[2] = NULL;
--
--	if (!g_spawn_async (NULL, args, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD,
--	                    NULL, NULL, &daemon_pid, &err)) {
--		g_error ("couldn't start gnome-keyring-daemon for testing: %s",
--		         err && err->message ? err->message : "");
--		g_assert_not_reached ();
--	}
--
--	/* Let it startup properly */
--	sleep (2);
--#endif
--}
--
--DEFINE_STOP(setup_daemon)
--{
--#if 0
--	if (daemon_pid)
--		kill (daemon_pid, SIGTERM);
--	/* We're exiting soon anyway, no need to wait */
--#endif
--}
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch
deleted file mode 100644
index 405838913f85..000000000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libgnome-keyring-2.32.0/egg/tests/test-dh.c
-===================================================================
---- libgnome-keyring-2.32.0.orig/egg/tests/test-dh.c
-+++ libgnome-keyring-2.32.0/egg/tests/test-dh.c
-@@ -27,6 +27,7 @@
- 
- #include "run-auto-test.h"
- 
-+#include "egg-libgcrypt.h"
- #include "egg-dh.h"
- #include "egg-secure-memory.h"
- 
-@@ -39,7 +40,7 @@ DEFINE_TEST(dh_perform)
- 	gcry_mpi_t x2, X2;
- 	gpointer k1, k2;
- 	gboolean ret;
--
-+	egg_libgcrypt_initialize ();
- 	/* Load up the parameters */
- 	if (!egg_dh_default_params ("ietf-ike-grp-modp-768", &p, &g))
- 		g_assert_not_reached ();
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch
deleted file mode 100644
index efc47df7f2e6..000000000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ffbaa40603ed33646de10822983c9445d6c70d3a Mon Sep 17 00:00:00 2001
-From: Stef Walter <stef@memberwebs.com>
-Date: Wed, 19 Jan 2011 19:44:50 +0000
-Subject: Don't run tests if a testing enabled gnome-keyring-daemon is not enabled.
-
-This uses the 'gnome-keyring-daemon --version' output to determine
-whether testing is enabled or not.
----
-diff --git a/tests/gtest-helpers.c b/tests/gtest-helpers.c
-index fbdb5d7..e984f64 100644
---- a/tests/gtest-helpers.c
-+++ b/tests/gtest-helpers.c
-@@ -160,16 +160,17 @@ chdir_base_dir (char* argv0)
- 	g_free (dir);
- }
- 
--#ifdef TEST_WITH_DAEMON
--
- static pid_t daemon_pid = 0;
- 
- static gboolean
--daemon_start ()
-+daemon_start (void)
- {
- 	GError *err = NULL;
- 	gchar *args[5];
- 	const gchar *path, *service, *address;
-+	gchar *output = NULL;
-+	gint exit_status = 1;
-+	GError *error = NULL;
- 
- 	/* Need to have DBUS running */
- 	address = g_getenv ("DBUS_SESSION_BUS_ADDRESS");
-@@ -178,6 +179,23 @@ daemon_start ()
- 		return FALSE;
- 	}
- 
-+	/* Check if gnome-keyring-daemon has testing enabled */
-+	if (!g_spawn_command_line_sync (GNOME_KEYRING_DAEMON_PATH " --version",
-+	                                &output, NULL, &exit_status, &error)) {
-+		g_printerr ("Couldn't launch '%s': %s", GNOME_KEYRING_DAEMON_PATH,
-+		            error->message);
-+		return FALSE;
-+	}
-+
-+	/* For some reason --version failed */
-+	if (exit_status != 0 || strstr (output, "testing: enabled") == NULL) {
-+		g_printerr ("Skipping tests since no testing enabled gnome-keyring-daemin is available\n");
-+		g_free (output);
-+		return FALSE;
-+	}
-+
-+	g_free (output);
-+
- 	path = g_getenv ("GNOME_KEYRING_TEST_PATH");
- 	if (path && !path[0])
- 		path = NULL;
-@@ -221,8 +239,6 @@ daemon_stop (void)
- 	daemon_pid = 0;
- }
- 
--#endif /* TEST_WITH_DAEMON */
--
- int
- main (int argc, char* argv[])
- {
-@@ -239,18 +255,12 @@ main (int argc, char* argv[])
- 
- 	initialize_tests ();
- 
--#ifdef TEST_WITH_DAEMON
- 	if (daemon_start ()) {
--#endif
--
- 		start_tests ();
- 		ret = g_test_run ();
- 		stop_tests();
--
--#ifdef TEST_WITH_DAEMON
- 		daemon_stop();
- 	}
--#endif
- 
- 	return ret;
- }
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
deleted file mode 100644
index 99350bd31168..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
+++ /dev/null
@@ -1,61 +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-2.32.0.ebuild,v 1.17 2012/12/17 04:46:05 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug test"
-
-RDEPEND=">=sys-apps/dbus-1.0
-	>=gnome-base/gnome-keyring-2.29[test?]
-	!<gnome-base/gnome-keyring-2.29"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	# Remove unneeded test file.
-	epatch "${FILESDIR}/${P}-drop-test.patch"
-
-	# Don't run tests if a testing enabled gnome-keyring-daemon is not enabled.
-	epatch "${FILESDIR}/${P}-run-test.patch"
-
-	# Don't let tests to hang, bug #356141
-	epatch "${FILESDIR}/${PN}-2.32.0-hang-tests.patch"
-
-	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}