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.

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

4 files changed, 101 insertions, 6 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/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!"
+}