Clean up old revisions. Add missing preserve_old_lib.

Package-Manager: portage-2.2_rc68/cvs/Linux x86_64

10 files changed, 29 insertions, 305 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 9893298aef1d..8fdab50d3eca 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.181 2010/08/18 22:06:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.182 2010/08/27 18:30:15 eva Exp $
+
+  27 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-keyring-2.22.3-r1.ebuild, -gnome-keyring-2.22.3-r2.ebuild,
+  -files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch,
+  -files/gnome-keyring-2.22.3-pkg-libtasn1.patch,
+  -files/gnome-keyring-2.22.3-warnings.patch,
+  -files/gnome-keyring-2.26.1-dlopen.patch,
+  -files/gnome-keyring-2.27.92-as-needed.patch, gnome-keyring-2.30.3.ebuild:
+  Clean up old revisions. Add missing preserve_old_lib.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gnome-keyring-2.28.2.ebuild:
   arm stable, bug #314899
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 7d8dc5977b68..6ca0796b325c 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gnome-keyring-2.22.3-headers-fix-for-cxx.patch 1290 RMD160 69d63503e30007ba8d98020d0caa20247765eea3 SHA1 d7073ddd68226bcde23e58955f5b2a2f768156be SHA256 ccd1870ffc38e3c6ced1006d0e04444a2aac3ea46368704c1d786ab551d5a21a
-AUX gnome-keyring-2.22.3-pkg-libtasn1.patch 1079 RMD160 8ddeb815ef69fd3a32b256fc144883c5ab9ca6f8 SHA1 84d93848fac4141aea4ddd5f221b5a3431a6774f SHA256 14332fdb39ab870bab747e148d2098f339758af5105504b9fc83c0582394303c
-AUX gnome-keyring-2.22.3-warnings.patch 780 RMD160 3f3e04754189b67720f2f1e7eebb5e24b9612cd2 SHA1 95077ed5efcc493e35b64b943548c569eef1cfff SHA256 03206a46f86675ed1d2773740a23b02eaa1221c8dbbd3caea0a30a42c82a7d82
-AUX gnome-keyring-2.26.1-dlopen.patch 1273 RMD160 a0e181e8d2ccfd9c32a163dfb0c18863f1858081 SHA1 5aebfbdc2d558092c97a396e56ede6a4766af3de SHA256 161bae39b70239383e26481cbb563fae3f30367cbe64ef48ad02b518855a2c2e
 AUX gnome-keyring-2.26.3-assert.patch 799 RMD160 0874e630288c95e0153ddaf95c57180d0e120bd9 SHA1 4aee0e3ea8ce2d5f32210756ebe050e4b784dc49 SHA256 9ad0a97aaff9587f01aee89192e0f75934ceb1da270a6ed2970d4a392c87dee8
 AUX gnome-keyring-2.26.3-parallel-tests.patch 1228 RMD160 11fd8c3ec61406d441490cc57da22767792ae483 SHA1 29f314bbf1d96d7c778d60ee134349d287bfecc4 SHA256 97462b84dffa6f117cfe7aea55345a60dc48fc25bcf985ada96d8314b4811e73
-AUX gnome-keyring-2.27.92-as-needed.patch 489 RMD160 372c2dad351e66d313ed7d0b93fef81e1f0aa9d0 SHA1 b1b42381834cf90a144988611cacdf70a94b206c SHA256 e504fb546d02c1b1c23709a8768b3dc500f57dc4e42fd650f7c288582a2da5b4
-DIST gnome-keyring-2.22.3.tar.bz2 894308 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
 DIST gnome-keyring-2.26.3.tar.bz2 2692915 RMD160 323cf0fe5f11260573e0d20998c879380f4c2122 SHA1 c07136f0757937a7fe6989cbdf3bf8103da55364 SHA256 319eef68f9c82225dcce06d2f6cfda9196da66a799459b8a00da9bb490529539
 DIST gnome-keyring-2.28.2.tar.bz2 3009480 RMD160 0e09c7274c4c4ea037bc7eb4ff8edaaca53f04f0 SHA1 099146a0cb3c03683cfc3fe3caaddf5dff00acf8 SHA256 d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6
 DIST gnome-keyring-2.30.3.tar.bz2 1592573 RMD160 9bd3cea25e10e1dcd93cfbc75a6a448e8ab338ca SHA1 0e0a2a1f4127dc6a01583fb3e81386370d9335f0 SHA256 b24e5c6db621897f2a0045f0083e1f878d617f5c801d389c2ce028a2c67e290b
-EBUILD gnome-keyring-2.22.3-r1.ebuild 1419 RMD160 6ae69eb2cc57eb9a5087a6974c4145be49605e18 SHA1 ae39799aad0c7c720c9cb3f5b035e34ba48fd7e0 SHA256 ee3e84a078089003287a77f8512c4ea735423d1b4f9579779e52f24e0a358de5
-EBUILD gnome-keyring-2.22.3-r2.ebuild 1559 RMD160 6576cf837ec3ced0c54f5f1d292fb779aec3d2a2 SHA1 e6d3c84241638ee9c2463bab7c9df577d141dd95 SHA256 41855be9ff3817af3d6d42d4722e9838677c0fc2752cf3b5126d4d3d59f8acd8
 EBUILD gnome-keyring-2.26.3.ebuild 2025 RMD160 b42d969a0c534ffd59a522ab733b1e00ae5b4c0a SHA1 67e1fe9982e26624e0238188cea87067ebff3765 SHA256 52d4ee7a4fbd05263c34424b556a4dca9c1d2baf65281aa64caa475f281c1f47
 EBUILD gnome-keyring-2.28.2.ebuild 1453 RMD160 8ffee544bb625ad1c1a40743a1ec8ba2d516bf83 SHA1 fe4dfe26307ed7d3859efb2958abae5f2317ea01 SHA256 18b48f044c88c97203e2401459c75a28334b0e03c9e1032d835a97c61044ab7d
-EBUILD gnome-keyring-2.30.3.ebuild 1625 RMD160 61a5ae56cd625ba134163fc2d207f1542e21acd1 SHA1 a062d106e8168fb75fdd656e4ef628f5f28ec9a9 SHA256 c4c5e3cf72b809256b419244a02076af54e2cab72c4fbe196b59826a0c14a41d
-MISC ChangeLog 24188 RMD160 3c3781202944c9cef543c864c9c413c83b4b6af6 SHA1 0f8270cb88ca7cf9f0f2ff42893ca546a330273c SHA256 443518ef56b8b5c4752c6405e85f9f3b62574fa5e280f5e5fd7e56a222892312
+EBUILD gnome-keyring-2.30.3.ebuild 1760 RMD160 d55127dca9773aca3f4085efed6f3ba22aa34e0f SHA1 6cf0c10df0e87d4fb21ed241fda5978bd2c43561 SHA256 3ad99150d08faf3dbae0fee7fdf4739e3b5be53659929bdf53af88993966d02c
+MISC ChangeLog 24638 RMD160 f9402490e9ce1086c5ae760e0fc72ee2101ce5f3 SHA1 e37cdf8ffafc0e735eb8a763d8fffe13007b1a70 SHA256 fd11b8f726946017ff81f78ca2937a1ec891419e37f49d765d7d32f003256204
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxsWRUACgkQkKaRLQcq0GLJZwCeJhg4tTlK8WU8zo0Ic15EywcG
-SWgAn3VxlJdPXtr3kk64LLyprTyBGsnO
-=25IK
+iEYEARECAAYFAkx4BEIACgkQ1fmVwcYIWAaY0ACg0h+jv7Jk7gy+jf9BPaYLaFEz
+s8YAoKATSa4r79TAvOaBke4Njk7Dfgfn
+=4Z7K
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch
deleted file mode 100644
index 58b382a26157..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 1fe0f7817e3eaa19103b70a09c4fb9d9837fbb93
-Author: Stefan Walter <stefw@src.gnome.org>
-Date:   Wed Feb 11 15:00:38 2009 +0000
-
-    Add G_BEGIN_DECLS/G_END_DECLS so the library can be used with a C++
-    compiler.
-    
-    svn path=/trunk/; revision=1554
-
-diff --git a/library/gnome-keyring-memory.h b/library/gnome-keyring-memory.h
-index babf958..64f988b 100644
---- a/library/gnome-keyring-memory.h
-+++ b/library/gnome-keyring-memory.h
-@@ -26,6 +26,8 @@
- 
- #include <glib.h>
- 
-+G_BEGIN_DECLS
-+
- /**
-  * gnome-keyring-memory:Short_Description:
-  * 
-@@ -59,4 +61,6 @@ gboolean  gnome_keyring_memory_is_secure      (gpointer p);
- 
- gchar*    gnome_keyring_memory_strdup         (const gchar* str);
- 
-+G_END_DECLS
-+
- #endif /* GNOME_KEYRING_MEMORY_H */
-diff --git a/library/gnome-keyring.h b/library/gnome-keyring.h
-index 628bf8e..dc19a4c 100644
---- a/library/gnome-keyring.h
-+++ b/library/gnome-keyring.h
-@@ -29,6 +29,8 @@
- 
- #include "gnome-keyring-result.h"
- 
-+G_BEGIN_DECLS
-+
- #define GNOME_KEYRING_SESSION   "session"
- #define GNOME_KEYRING_DEFAULT   NULL
- 
-@@ -516,4 +518,6 @@ GnomeKeyringResult    gnome_keyring_daemon_set_display_sync         (const char
- 
- GnomeKeyringResult    gnome_keyring_daemon_prepare_environment_sync (void);
- 
-+G_END_DECLS
-+
- #endif /* GNOME_KEYRING_H */
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-pkg-libtasn1.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-pkg-libtasn1.patch
deleted file mode 100644
index 5da4e9201dfd..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-pkg-libtasn1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# Allow configure to succeed with recent versions of libtasn1
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=266554
-# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=560869
---- a/configure.in	2008-06-30 17:29:13.000000000 +0200
-+++ b/configure.in	2009-04-18 12:16:56.000000000 +0200
-@@ -381,17 +381,19 @@
- 
- GKR_LIBTASN1_VERSION=0.3.4
- 
--AM_PATH_LIBTASN1($GKR_LIBTASN1_VERSION,,
--	AC_MSG_ERROR([[
--*** 
--*** LibtASN1 ${GKR_LIBTASN1_VERSION} was not found. 
--]]))
--libtasn=yes
--AC_DEFINE_UNQUOTED(GKR_LIBGCRYPT_VERSION, "$GKR_LIBTASN1_VERSION", [Version of libtasn1 we expect])
-+PKG_CHECK_MODULES(LIBTASN1,libtasn1 >= 1.0)
-+AC_SUBST([LIBTASN1_LIBS])
-+AC_SUBST([LIBTASN1_CFLAGS])
- 
- DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBTASN1_CFLAGS"
- DAEMON_LIBS="$DAEMON_LIBS $LIBTASN1_LIBS"
- 
-+AC_PATH_PROG(ASN1PARSER, asn1Parser, no)
-+if test "$ASN1PARSER" = "no" ; then
-+	AC_MSG_ERROR(asn1Parser tool is not installed)
-+fi
-+
-+
- dnl ==========================================================================
- 
- dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-warnings.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-warnings.patch
deleted file mode 100644
index 97b2b7ff4555..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-warnings.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- trunk/common/gkr-unix-credentials.c	2008/06/29 13:24:49	1155
-+++ trunk/common/gkr-unix-credentials.c	2008/07/02 16:08:26	1166
-@@ -90,6 +90,10 @@
- 		if (errno == EINTR)
- 			goto again;
- 		return -1;
-+		
-+	} else if (ret == 0) {
-+		/* Disconnected */
-+		return -1;
- 	}
- 	
- 	if (buf != '\0') {
---- trunk/library/tests/unit-test-other.c	2008/02/14 17:22:27	1058
-+++ trunk/library/tests/unit-test-other.c	2008/07/02 16:08:26	1166
-@@ -86,3 +86,11 @@
- 	msg = gnome_keyring_result_to_message (GNOME_KEYRING_RESULT_KEYRING_ALREADY_EXISTS); 	
- 	CuAssert (cu, "should return a valid message", msg && msg[0]);
- }
-+
-+void unit_test_is_available (CuTest* cu)
-+{
-+	gboolean ret;
-+	
-+	ret = gnome_keyring_is_available ();
-+	CuAssert (cu, "gnome_is_available returned false", ret == TRUE);
-+}
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch
deleted file mode 100644
index 8fd0aa0d6203..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 6ddb14eef4368d63ce7055ee52718010a8f8190a
-Author: Stef Walter <stef@memberwebs.com>
-Date:   Fri Jun 26 15:13:04 2009 +0000
-
-    Fix linking problem on FreeBSD.
-    
-    The dlopen function is in libc rather than libdl, so add a check for
-    that in configure.in. Fixes bug #584307
-
-diff --git a/configure.in b/configure.in
-index a0e1e9a..287a391 100644
---- a/configure.in
-+++ b/configure.in
-@@ -278,6 +278,17 @@ if test "$enable_pam" != "no"; then
- fi
- 
- # --------------------------------------------------------------------
-+# Find DL functionality
-+
-+AC_CHECK_LIB(c, dlopen, DL_LIBS="",
-+	AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl",
-+		AC_MSG_ERROR([Could not find a library with the dlopen function])
-+	)
-+)
-+
-+AC_SUBST(DL_LIBS)
-+
-+# --------------------------------------------------------------------
- # Disable ACL Prompts
- 
- AC_ARG_ENABLE(acl-prompts, 
-diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
-index 0f085f3..45da903 100644
---- a/pkcs11/rpc-layer/Makefile.am
-+++ b/pkcs11/rpc-layer/Makefile.am
-@@ -58,6 +58,6 @@ gck_rpc_daemon_standalone_SOURCES = \
- 	gck-rpc-daemon-standalone.c
- 	
- gck_rpc_daemon_standalone_LDADD = \
--	-ldl libgck-rpc-layer.la \
-+	$(DL_LIBS) libgck-rpc-layer.la \
- 	$(top_builddir)/common/libgkr-common.la
- 	
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.27.92-as-needed.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.27.92-as-needed.patch
deleted file mode 100644
index f56635c45f18..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.27.92-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix linking with --as-needed -- "undefined reference to `g_thread_init'"
-
-GNOME Bug 595767
-
----
---- tool/gkr-tool.c
-+++ tool/gkr-tool.c
-@@ -25,6 +25,7 @@
- 
- #include "gkr-tool.h"
- 
-+#include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
---- tool/Makefile.am
-+++ tool/Makefile.am
-@@ -20,6 +20,7 @@
- 	$(top_builddir)/gp11/libgp11.la \
- 	$(top_builddir)/gcr/libgcr.la \
- 	$(top_builddir)/egg/libegg.la \
-+	$(GTHREAD_LIBS) \
- 	$(GTK_LIBS) \
- 	$(GCRYPT_LIBS) \
- 	$(LIBTASN1_LIBS) \
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild
deleted file mode 100644
index f03735d8214c..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild,v 1.14 2010/07/20 01:50:46 jer Exp $
-
-inherit gnome2 eutils pam autotools
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc hal pam test"
-
-RDEPEND=">=dev-libs/glib-2.8
-	 >=x11-libs/gtk+-2.6
-	 gnome-base/gconf
-	 >=sys-apps/dbus-1.0
-	 hal? ( >=sys-apps/hal-0.5.7 )
-	 pam? ( virtual/pam )
-	 >=dev-libs/libgcrypt-1.2.2
-	 >=dev-libs/libtasn1-1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable hal)
-		$(use_enable test tests)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=/usr/share/ca-certificates/"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Backport from trunk for fixing upstream bug #511285, bug #238098
-	epatch "${FILESDIR}/${P}-warnings.patch"
-
-	# Fix configure with recent libtasn1, bug #266554
-	epatch "${FILESDIR}/${P}-pkg-libtasn1.patch"
-
-	intltoolize --force --copy --automake || die "inltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild
deleted file mode 100644
index 9885d9d409dc..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild,v 1.6 2010/07/20 01:50:46 jer Exp $
-
-inherit gnome2 eutils pam autotools
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="debug doc hal pam test"
-
-RDEPEND=">=dev-libs/glib-2.8
-	 >=x11-libs/gtk+-2.6
-	 gnome-base/gconf
-	 >=sys-apps/dbus-1.0
-	 hal? ( >=sys-apps/hal-0.5.7 )
-	 pam? ( virtual/pam )
-	 >=dev-libs/libgcrypt-1.2.2
-	 >=dev-libs/libtasn1-1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable hal)
-		$(use_enable test tests)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=/usr/share/ca-certificates/"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Backport from trunk for fixing upstream bug #511285, bug #238098
-	epatch "${FILESDIR}/${P}-warnings.patch"
-
-	# Fix configure with recent libtasn1, bug #266554
-	epatch "${FILESDIR}/${P}-pkg-libtasn1.patch"
-
-	# Makes the installed public headers includeable in C++ code, such as webkit-gtk
-	epatch "${FILESDIR}/${P}-headers-fix-for-cxx.patch"
-
-	intltoolize --force --copy --automake || die "inltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild
index 714133696c0b..a8f177233e5c 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild,v 1.7 2010/08/11 16:27:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild,v 1.8 2010/08/27 18:30:15 eva Exp $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx autotools
+inherit autotools eutils gnome2 pam virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -51,9 +51,7 @@ src_prepare() {
 	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
 		-i configure.in configure || die "sed failed"
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
@@ -61,3 +59,13 @@ src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
 }
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgnome-keyring.so.0
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-keyring.so.0
+}