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

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 63 insertions, 9 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/Manifest b/gnome-base/gnome-keyring/Manifest
index 94a15929f46b..e23f2ee061f6 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX gnome-keyring-2.22.3-pkg-libtasn1.patch 1079 RMD160 8ddeb815ef69fd3a32b256fc144883c5ab9ca6f8 SHA1 84d93848fac4141aea4ddd5f221b5a3431a6774f SHA256 14332fdb39ab870bab747e148d2098f339758af5105504b9fc83c0582394303c
 AUX gnome-keyring-2.22.3-warnings.patch 780 RMD160 3f3e04754189b67720f2f1e7eebb5e24b9612cd2 SHA1 95077ed5efcc493e35b64b943548c569eef1cfff SHA256 03206a46f86675ed1d2773740a23b02eaa1221c8dbbd3caea0a30a42c82a7d82
 AUX gnome-keyring-2.26.1-dlopen.patch 1273 RMD160 a0e181e8d2ccfd9c32a163dfb0c18863f1858081 SHA1 5aebfbdc2d558092c97a396e56ede6a4766af3de SHA256 161bae39b70239383e26481cbb563fae3f30367cbe64ef48ad02b518855a2c2e
+AUX gnome-keyring-2.26.3-parallel-tests.patch 1228 RMD160 11fd8c3ec61406d441490cc57da22767792ae483 SHA1 29f314bbf1d96d7c778d60ee134349d287bfecc4 SHA256 97462b84dffa6f117cfe7aea55345a60dc48fc25bcf985ada96d8314b4811e73
 DIST gnome-keyring-2.22.3.tar.bz2 894308 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
 DIST gnome-keyring-2.24.1.tar.bz2 1125993 RMD160 17c6701ef7b35902780b6c72b79a3f0eaafe2378 SHA1 93e92e01daecd85b1c0ae9dda09d5cc808989642 SHA256 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
 DIST gnome-keyring-2.26.1.tar.bz2 2738687 RMD160 0975197ae8e58a8d98a2ff11c062ec6c9cf74a79 SHA1 3ff24987392b3f51109709b2c020af3557155ef8 SHA256 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
@@ -11,13 +12,13 @@ DIST gnome-keyring-2.26.3.tar.bz2 2692915 RMD160 323cf0fe5f11260573e0d20998c8793
 EBUILD gnome-keyring-2.22.3-r1.ebuild 1424 RMD160 7d90a3169597875d794be8ca88c6484f77937563 SHA1 c974e49b6acc76feb73488ecf85483a229c75620 SHA256 be8918229399ac8783576131b19a922dcf206b934bc879dcd0540e755b92ec2a
 EBUILD gnome-keyring-2.24.1.ebuild 1470 RMD160 631eb138f3f1e46b4e5e23c4711061d020c530f4 SHA1 adc78bfc15dfc76829e49a7a4ae543c95a2c65aa SHA256 bcdc993a032b069f0221621f2bb95c032b63b7cb248bd33cab5d439b19daba3c
 EBUILD gnome-keyring-2.26.1-r1.ebuild 1894 RMD160 e48b041f0ab0c017e949802c33c7b9c901ea0e1a SHA1 ea0a4d81390f512d95c8505cddc09216c27cb9e0 SHA256 168527a046c095a6314ce510971ce193150cbdc7fd0e803a727a4555a8ff1508
-EBUILD gnome-keyring-2.26.3.ebuild 1834 RMD160 0c059f7fbccc17616a1a71488f8db828827f2e45 SHA1 e5fc408a5dadaf3679e8ca4d9fba86d28d6a1916 SHA256 7157429d3ee00356f3b9bbeab894ca2ebadfce1249662f95fe74d5c04448aaa4
-MISC ChangeLog 19414 RMD160 3ffe2d60ed892595e0a61371f5f22714cd7165f1 SHA1 7126f924f59ebcedc63149879b0b2c60a891bb81 SHA256 094df5501efd7f04371624c87c865b74afff01304d8e5f264b5b63344b3826eb
+EBUILD gnome-keyring-2.26.3.ebuild 1903 RMD160 4643b1f4c3aba90d5354e439e062fff7612fb949 SHA1 af8a1dcb11460cf9bac49641ae372ca67a154522 SHA256 0b7b5e7b0f78c6c9331393ea15e3491febd6d4e730d7a260eb2d5848a62b65e1
+MISC ChangeLog 19642 RMD160 05f4607f893e718e55414b3ec872b3ea6cbffad0 SHA1 b4540625c9365c6f347926614927270dbc236f19 SHA256 aa21a77f795bb58d56f1336a4caca62322c3f4c4672640705a1f5a784daab1ff
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpk0XcACgkQ1fmVwcYIWAbNcwCeKB99bNjbJ1y9WJdmjdeQEBT2
-yvAAniKpMbTjH2EwQCfr4xuqndvvIfYv
-=tVjq
+iEYEARECAAYFAkqtZTQACgkQAiZjviIA2XiMegCZAcyQunZHg3RSKcHsx+7oYedr
+DRIAoOffi7x7t0wrUuzuVlO817oHG1k0
+=6WPD
 -----END PGP SIGNATURE-----
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() {