Version bump. Restrict operations on symmetric encryption in gpg-agent, initialization fix, fix linking against gio and invalid memory access in rpc-layer. Drop la file for pam module, bug #342551.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

5 files changed, 109 insertions, 12 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 65cb216a52e9..52484492bda4 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.189 2010/10/22 22:29:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.190 2010/11/01 16:18:00 eva Exp $
+
+*gnome-keyring-2.32.1 (01 Nov 2010)
+
+  01 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-keyring-2.30.3.ebuild, gnome-keyring-2.32.0.ebuild,
+  +gnome-keyring-2.32.1.ebuild:
+  Version bump. Restrict operations on symmetric encryption in gpg-agent,
+  initialization fix, fix linking against gio and invalid memory access in
+  rpc-layer. Drop la file for pam module, bug #342551.
 
   22 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-keyring-2.26.3.ebuild, -files/gnome-keyring-2.26.3-assert.patch,
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 48f4eea6b660..fdf123028a4b 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,15 +4,17 @@ 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 1580 RMD160 3d431c0a260fa9b375dc176874dd4f88bfead101 SHA1 c367e38b9139b5fe38a0e5873fcaa5da6b7cb6e8 SHA256 d696de58d3b1f6ae1837510abb499a5328eb1e783076678dcb04ed4269ade8ba
-EBUILD gnome-keyring-2.32.0.ebuild 1673 RMD160 b12d414adf28cae0d7b58b57e3313ffd133c706e SHA1 c465ba2f574c24752d3bcba1e7211ee079c68f48 SHA256 3efe8a315a01c25cfbb99b573e5547e1528fad63492605bc177bd192f9320dd9
-MISC ChangeLog 25851 RMD160 ce91d8cd0fdfa87a29af0d2c4a31054bfc54316b SHA1 9d2a88643103e00ae0d22a0221853c84ff7e48b6 SHA256 27b67764932e21f73d27ba4b0319f4815a878faa0942a567a27a38bf776dade2
+EBUILD gnome-keyring-2.30.3.ebuild 1718 RMD160 d5f6a56b99899f4703192e5f71c98f036a739adc SHA1 469b13620d29946efea701f27b6bf00403971848 SHA256 ab3ce4a858bcdc6034029953e94413c61c0e537781ac628d8b0f6f2766ea100f
+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 26239 RMD160 f9568be24a83703350e2b8af5e92a8a51121dc0b SHA1 f83a5cc90a42c33c5cbb42414a98f9c57b95e835 SHA256 46db400ff32673febddeca386c75335de21ef4c1d055d5470dfd7701418bd062
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzCEEsACgkQ1fmVwcYIWAZ5+ACfS+0x4N62LSqg34LvdlH/NlGK
-sR0AoIOABsG3GOOINYaH9d7zvsrwHI2E
-=lX4Q
+iEYEARECAAYFAkzO6EQACgkQ1fmVwcYIWAaW6QCgvPMWIC1mOFff1FBezkAc/Zkt
+VdwAnj12YpRc2k0YAooUXhSnHWZO57oY
+=9WtY
 -----END PGP SIGNATURE-----
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 52daccd52837..5a7a2b260b02 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.13 2010/10/17 14:56:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild,v 1.14 2010/11/01 16:18:00 eva Exp $
 
 EAPI="2"
 
-inherit autotools eutils gnome2 pam virtualx
+inherit autotools eutils gnome2 multilib pam virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -56,6 +56,12 @@ src_prepare() {
 	eautoreconf
 }
 
+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.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.0.ebuild
index c94abc50e961..654d3e8b2d17 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.32.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.32.0.ebuild
@@ -1,11 +1,11 @@
 # 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.2 2010/10/22 22:29:17 eva Exp $
+# $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 pam virtualx
+inherit gnome2 multilib pam virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -28,9 +28,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.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"
 
@@ -60,6 +61,12 @@ src_prepare() {
 		-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
new file mode 100644
index 000000000000..86f7c6e42b1c
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild
@@ -0,0 +1,73 @@
+# 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 $
+
+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!"
+}