Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 8 insertions, 292 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/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
-}