Fix the test.make fragment to properly build in parallel, closes bug #272450.

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

3 files changed, 57 insertions, 4 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index b65a5c8d4724..23c5a5bba1d2 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # 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.150 2009/07/20 20:19:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.151 2009/09/13 21:33:35 flameeyes Exp $
+
+  13 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  gnome-keyring-2.26.3.ebuild,
+  +files/gnome-keyring-2.26.3-parallel-tests.patch:
+  Fix the test.make fragment to properly build in parallel, closes bug
+  #272450.
 
   20 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-keyring-2.22.3-r1.ebuild:
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.26.3-parallel-tests.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.3-parallel-tests.patch
new file mode 100644
index 000000000000..abd57bfa4f4e
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.3-parallel-tests.patch
@@ -0,0 +1,43 @@
+Index: gnome-keyring-2.26.3/tests/test.make
+===================================================================
+--- gnome-keyring-2.26.3.orig/tests/test.make
++++ gnome-keyring-2.26.3/tests/test.make
+@@ -22,9 +22,11 @@ noinst_PROGRAMS= \
+ 	run-auto-test \
+ 	run-prompt-test
+ 	
+-run-auto-test.c: $(UNIT_AUTO) Makefile.am
++run-auto-test.h: $(UNIT_AUTO) Makefile.am
+ 	sh $(top_srcdir)/tests/prep-tests.sh -b run-auto-test $(UNIT_AUTO)
+ 
++run-auto-test.c: run-auto-test.h
++
+ run_auto_test_SOURCES = \
+ 	run-auto-test.c \
+ 	run-auto-test.h \
+@@ -37,9 +39,11 @@ run_auto_test_LDADD = \
+ run_auto_test_CFLAGS = \
+ 	$(UNIT_FLAGS)
+ 
+-run-prompt-test.c: $(UNIT_PROMPT) Makefile.am
++run-prompt-test.h: $(UNIT_PROMPT) Makefile.am
+ 	sh $(top_srcdir)/tests/prep-tests.sh -b run-prompt-test $(UNIT_PROMPT)
+ 
++run-prompt-test.c: run-prompt-test.h
++
+ run_prompt_test_SOURCES = \
+ 	run-prompt-test.c \
+ 	run-prompt-test.h \
+@@ -52,6 +56,12 @@ run_prompt_test_LDADD = \
+ run_prompt_test_CFLAGS = \
+ 	$(UNIT_FLAGS)
+ 
++BUILT_SOURCES = \
++        run-auto-test.c \
++        run-auto-test.h \
++        run-prompt-test.c \
++        run-prompt-test.h
++
+ # ------------------------------------------------------------------------------
+ # Run the tests
+ 
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 ff5ea2d90b30..46469ed23bb1 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.3.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2009/07/19 18:34:02 eva Exp $
+# $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 $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx eutils
+inherit gnome2 pam virtualx eutils autotools
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -50,10 +50,14 @@ src_prepare() {
 
 	# Remove silly CFLAGS
 	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
+		-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"
+
+	epatch "${FILESDIR}"/${P}-parallel-tests.patch
+
+	eautoreconf
 }
 
 src_test() {