Add patch to fix gtk-doc build failure, bug #267957.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 38 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 23c5a5bba1d2..e59ceab47689 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.151 2009/09/13 21:33:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.152 2009/09/13 21:42:01 eva Exp $
+
+  13 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-keyring-2.26.3.ebuild, +files/gnome-keyring-2.26.3-assert.patch:
+  Add patch to fix gtk-doc build failure, bug #267957.
 
   13 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   gnome-keyring-2.26.3.ebuild,
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.26.3-assert.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.3-assert.patch
new file mode 100644
index 000000000000..48204492e6b3
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.3-assert.patch
@@ -0,0 +1,25 @@
+From 8970f08b52c847e591ae1b0ea791bbbf52b7194b Mon Sep 17 00:00:00 2001
+From: Stef Walter <stef@memberwebs.com>
+Date: Sun, 13 Sep 2009 16:18:24 +0000
+Subject: [PATCH 1/2] [rpc-layer] Fix erroneous assertion. Let error messages handle this case.
+
+Fixes bug #533164
+---
+ pkcs11/rpc-layer/gck-rpc-module.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/pkcs11/rpc-layer/gck-rpc-module.c b/pkcs11/rpc-layer/gck-rpc-module.c
+index 99e283e..8094d57 100644
+--- a/pkcs11/rpc-layer/gck-rpc-module.c
++++ b/pkcs11/rpc-layer/gck-rpc-module.c
+@@ -225,7 +225,6 @@ call_connect (CallState *cs)
+ 	assert (cs);
+ 	assert (cs->socket == -1);
+ 	assert (cs->call_status == CALL_INVALID);
+-	assert (pkcs11_socket_path[0]);
+ 	
+ 	debug (("connecting to: %s", pkcs11_socket_path));
+ 		
+-- 
+1.6.4.2
+
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild
index 46469ed23bb1..7c9c5c8e6417 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.26.3.ebuild,v 1.2 2009/09/13 21:33:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild,v 1.3 2009/09/13 21:42:01 eva Exp $
 
 EAPI="2"
 
@@ -28,6 +28,7 @@ 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-1.9 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO keyring-intro.txt"
@@ -48,15 +49,18 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# remove extra assert to let doc build and tests pass, bug #267957
+	# taken from upstream bug #553164.
+	epatch "${FILESDIR}/${P}-assert.patch"
+
 	# Remove silly CFLAGS
 	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
 		-i configure.in || die "sed failed"
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
+	# Fix parallel make test failure, bug #272450
 	epatch "${FILESDIR}"/${P}-parallel-tests.patch
 
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }