Fix la removal to work with -pam; bug #348043. Remove old.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 22 insertions, 81 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index c90735863011..a9d579c02e0c 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # 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.192 2010/11/03 00:34:29 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.193 2010/12/07 16:24:57 pacho Exp $
+
+  07 Dec 2010; Pacho Ramos <pacho@gentoo.org> -gnome-keyring-2.32.0.ebuild,
+  gnome-keyring-2.32.1.ebuild:
+  Fix la removal to work with -pam; bug #348043. Remove old.
 
   03 Nov 2010; Daniel Gryniewicz <dang@gentoo.org>
   gnome-keyring-2.30.3.ebuild:
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index f455dad26bad..e6fee35fe734 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-DIST gnome-keyring-2.32.0.tar.bz2 1616590 RMD160 792729c4b4e60931ea3ae5b316d324dc30018da5 SHA1 84a6efab078ea696f06c042563ffde3bfc3618cc SHA256 d40f83667ac179ae5b8102d07ed71e4d39fc87e271845c3992a4cd7a326864aa
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 RMD160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec SHA1 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
 EBUILD gnome-keyring-2.28.2.ebuild 1453 RMD160 8ffee544bb625ad1c1a40743a1ec8ba2d516bf83 SHA1 fe4dfe26307ed7d3859efb2958abae5f2317ea01 SHA256 18b48f044c88c97203e2401459c75a28334b0e03c9e1032d835a97c61044ab7d
 EBUILD gnome-keyring-2.30.3.ebuild 1742 RMD160 97a868ebd170fb5af32a2776179c057165682499 SHA1 7a5c02c1fd659781566a61bdafc3e55505720628 SHA256 3c204c1c95ec4a3c708965716ab5ab0c89a4ab8eeb03e76a0dac2ba95a9848a4
-EBUILD gnome-keyring-2.32.0.ebuild 1837 RMD160 f51e109f49d85cf6ab36f4e4329e14c741cfc09c SHA1 71c96ee3c57c93a3cbbdc149c0e5c607ff92664d SHA256 4b1820743dd68f47e1624a339f3e740c15ce0bbdaae4cf340ba3ec3e680e8fb9
-EBUILD gnome-keyring-2.32.1.ebuild 1837 RMD160 113893087d82377217f19394ec83d4dfc15dd05e SHA1 14565810dd7d5d4e0e05c0cc48f69ed6ab9c2be5 SHA256 f919861d7258ba86af761f74745cd84783ca5a613d9eec5f6670f4386bfcc421
-MISC ChangeLog 26503 RMD160 ad99a6545c965bd757595cd22dfe09159287fbc3 SHA1 823e3f0ddf25aca65966e86c4345d5251ece2043 SHA256 c61a3e89686594d1d4911b38d120885307b04c92b7cc2bf6fb0833466a88b2fb
+EBUILD gnome-keyring-2.32.1.ebuild 1863 RMD160 15424a86e896ccbac883f4db830e618dcc8606a8 SHA1 f778d55153277561bffe70d12cf75db0403d7904 SHA256 fe29b0119dbc327005515e85f8b98564a3f8a9d60119041ce98e3da9497666ac
+MISC ChangeLog 26673 RMD160 77923e049c2e6380c5d6306f2a3f7c6163dec8b2 SHA1 2ab3bf1b504e5b22bd877d321465360e5ce95df9 SHA256 4f632fa059b919074856ce630cf367ba0b42764dc38db7303013745e70b42732
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz+X94ACgkQCaWpQKGI+9TISQCbB3Kj4ofDMiTc8WuCmpQ/XWwo
+0skAn1qkteAQvKKzkdHgbNzDRYuuA9ri
+=+rO/
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.0.ebuild
deleted file mode 100644
index 654d3e8b2d17..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.32.0.ebuild
+++ /dev/null
@@ -1,73 +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.32.0.ebuild,v 1.3 2010/11/01 16:18:00 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug doc pam test"
-# USE=valgrind is probably not a good idea for the tree
-
-RDEPEND=">=dev-libs/glib-2.25:2
-	>=x11-libs/gtk+-2.20:2
-	gnome-base/gconf
-	>=sys-apps/dbus-1.0
-	pam? ( virtual/pam )
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libtasn1-1"
-#	valgrind? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=/usr/share/ca-certificates/
-		--enable-acl-prompts
-		--enable-ssh-agent
-		--enable-gpg-agent
-		--with-gtk=2.0"
-#		$(use_enable valgrind)
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}"/$(get_libdir)/security -name "*.la" -delete \
-		|| die "la file removal failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild
index 86f7c6e42b1c..7c8cd5ea888d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # 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.32.1.ebuild,v 1.1 2010/11/01 16:18:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.2 2010/12/07 16:24:57 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -63,8 +63,10 @@ src_prepare() {
 
 src_install() {
 	gnome2_src_install
-	find "${ED}"/$(get_libdir)/security -name "*.la" -delete \
-		|| die "la file removal failed"
+	if use pam; then
+		find "${ED}"/$(get_libdir)/security -name "*.la" -delete \
+			|| die "la file removal failed"
+	fi
 }
 
 src_test() {