Add fix from upstream for random aclocal7 test failure #197366 by Joe Millenbach.

Package-Manager: portage-2.1.4_rc11

5 files changed, 70 insertions, 19 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 29031c7a0fd5..13646107b85c 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.107 2007/11/02 06:17:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.108 2007/12/24 12:55:54 vapier Exp $
+
+  24 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.9.6-aclocal7-test-sleep.patch, automake-1.8.5-r3.ebuild,
+  automake-1.9.6-r2.ebuild:
+  Add fix from upstream for random aclocal7 test failure #197366 by Joe
+  Millenbach.
 
 *automake-9999 (02 Nov 2007)
 
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 323c6c68e0bc..51765fcf3c13 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -49,6 +49,10 @@ AUX automake-1.8.5-test-fixes.patch 1068 RMD160 517f75255fa9d29e459b56079e2e27ff
 MD5 55580e93282f69d20f530d549d3f85e7 files/automake-1.8.5-test-fixes.patch 1068
 RMD160 517f75255fa9d29e459b56079e2e27fff073d41c files/automake-1.8.5-test-fixes.patch 1068
 SHA256 1a94bcc5a8e33b4c187e6291ad672daf3dca7b2e2995586d6af39f653678cebd files/automake-1.8.5-test-fixes.patch 1068
+AUX automake-1.9.6-aclocal7-test-sleep.patch 1102 RMD160 8e32341de00eb09af25a820340832f9286128118 SHA1 f0b90bf9f161530c7bef8bdb57e6e6e32fe7b3d5 SHA256 9bc281d49a753a6135c65b80642b03a6056538a6e944aeb344f1ed460be2904e
+MD5 7c3755a846d4a5cc4c3230f3895f537a files/automake-1.9.6-aclocal7-test-sleep.patch 1102
+RMD160 8e32341de00eb09af25a820340832f9286128118 files/automake-1.9.6-aclocal7-test-sleep.patch 1102
+SHA256 9bc281d49a753a6135c65b80642b03a6056538a6e944aeb344f1ed460be2904e files/automake-1.9.6-aclocal7-test-sleep.patch 1102
 AUX automake-1.9.6-ignore-comments.patch 614 RMD160 2d9ca9b4de82171370edd6843b4a3c2b9c073b4c SHA1 c10645bafd86fe2dfa15a4e62f96b55032c66c1b SHA256 28b80f088b53a72935f15c7d845919f474224ece83847d7b3bae5f2236fe30fe
 MD5 3099ade0063f414271664a3909abac9e files/automake-1.9.6-ignore-comments.patch 614
 RMD160 2d9ca9b4de82171370edd6843b4a3c2b9c073b4c files/automake-1.9.6-ignore-comments.patch 614
@@ -88,22 +92,22 @@ EBUILD automake-1.7.9-r1.ebuild 1438 RMD160 0aff05abe999126377695aff1c379b0afcbb
 MD5 4a6a72e37b6dc25de8e753754f224214 automake-1.7.9-r1.ebuild 1438
 RMD160 0aff05abe999126377695aff1c379b0afcbb8d0b automake-1.7.9-r1.ebuild 1438
 SHA256 a53eae9aeb52efba0b308f9d274970a6e27b78af89782d791aded767f16a66ac automake-1.7.9-r1.ebuild 1438
-EBUILD automake-1.8.5-r3.ebuild 1443 RMD160 20d1c41e8f4504931105b3127e381d3d9a416044 SHA1 f22c69f8f5c3e1e9ad6b10ef3851716f99c743a8 SHA256 2442a30e5eb978e962698319d911e337f775265046f1cd067d4bbf5ac65200c3
-MD5 d1e98fb78afce58ea9a2c39ed8896287 automake-1.8.5-r3.ebuild 1443
-RMD160 20d1c41e8f4504931105b3127e381d3d9a416044 automake-1.8.5-r3.ebuild 1443
-SHA256 2442a30e5eb978e962698319d911e337f775265046f1cd067d4bbf5ac65200c3 automake-1.8.5-r3.ebuild 1443
-EBUILD automake-1.9.6-r2.ebuild 1655 RMD160 f383a2f4bc73cf7fdbaba5a2d414d268f22b8cfe SHA1 b2d69f71844fff9a498c3221b22ebfbe8aa54949 SHA256 80a427ed75a3167cb15d088aea809dee84bdd7a4d3ab89a793dfdd2dae0e00ce
-MD5 11f0ffb1ca9199da513a7763183e8590 automake-1.9.6-r2.ebuild 1655
-RMD160 f383a2f4bc73cf7fdbaba5a2d414d268f22b8cfe automake-1.9.6-r2.ebuild 1655
-SHA256 80a427ed75a3167cb15d088aea809dee84bdd7a4d3ab89a793dfdd2dae0e00ce automake-1.9.6-r2.ebuild 1655
+EBUILD automake-1.8.5-r3.ebuild 1511 RMD160 bff287e118d242bfe4d4a3b1a4774e204281623e SHA1 ec6f1f90e20d2801253937c7720ae9819cad6b23 SHA256 a52bf7c4514dc355813241e292a9958c2dab604e12c499bd7293b2640c929180
+MD5 ffb74a9317483e652dad0e91f1075a23 automake-1.8.5-r3.ebuild 1511
+RMD160 bff287e118d242bfe4d4a3b1a4774e204281623e automake-1.8.5-r3.ebuild 1511
+SHA256 a52bf7c4514dc355813241e292a9958c2dab604e12c499bd7293b2640c929180 automake-1.8.5-r3.ebuild 1511
+EBUILD automake-1.9.6-r2.ebuild 1716 RMD160 c2139291e2d5f06e25fcc356fe00e1ce9a37fa1d SHA1 e68d7984c26978483e74b022bc38c3709e2a6b4e SHA256 85cd0d34ada8b5c6ba56211b72b26447780cc10c2ecfffa0b94d6896ec058a9b
+MD5 5dd9f27d4d48c335e1f2c2e64787557c automake-1.9.6-r2.ebuild 1716
+RMD160 c2139291e2d5f06e25fcc356fe00e1ce9a37fa1d automake-1.9.6-r2.ebuild 1716
+SHA256 85cd0d34ada8b5c6ba56211b72b26447780cc10c2ecfffa0b94d6896ec058a9b automake-1.9.6-r2.ebuild 1716
 EBUILD automake-9999.ebuild 1475 RMD160 c1b6a4f4527ab348324b06055d851af125e11e85 SHA1 3c7d132a0d4a80874ffae83a26d365d6063a7e74 SHA256 c96d059f5027e32d34b5243c96209237835d543823b03f8c7a80feed808de784
 MD5 37c423dc61e76a3e63bed88e3fa020c7 automake-9999.ebuild 1475
 RMD160 c1b6a4f4527ab348324b06055d851af125e11e85 automake-9999.ebuild 1475
 SHA256 c96d059f5027e32d34b5243c96209237835d543823b03f8c7a80feed808de784 automake-9999.ebuild 1475
-MISC ChangeLog 17072 RMD160 dd8af49ca90dd8bc9aa6c1576825712586f821df SHA1 cc9fc5402c491fb1c339893c78b24b91d1cda05a SHA256 5b0cfef8c4b64baea208b5370bcdaebb1b5f18f8d7c2247f87ca00ee1493733f
-MD5 66c7c3a96fee5bcb7bf8ce7e3540f282 ChangeLog 17072
-RMD160 dd8af49ca90dd8bc9aa6c1576825712586f821df ChangeLog 17072
-SHA256 5b0cfef8c4b64baea208b5370bcdaebb1b5f18f8d7c2247f87ca00ee1493733f ChangeLog 17072
+MISC ChangeLog 17314 RMD160 b60fc2b0673cfc687850e8fe93768ffdb50ab541 SHA1 31abc989c7281febd48a8fd33213a54ea069835b SHA256 c57281c07f188ce41ee97219e3bcbb817b6a0f1a41cbfe8114831b442383f9d1
+MD5 dcb5e289bd6c5889c161f1a849282378 ChangeLog 17314
+RMD160 b60fc2b0673cfc687850e8fe93768ffdb50ab541 ChangeLog 17314
+SHA256 c57281c07f188ce41ee97219e3bcbb817b6a0f1a41cbfe8114831b442383f9d1 ChangeLog 17314
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -133,9 +137,9 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-automake-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-automake-9999 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHKsEWp/wUKkr7RBoRAsvyAKDVRGtVdljA8cfJr7TU+Dd2fTyWggCg1tFr
-JZi1wtkP+eg1r21ozn7TxN0=
-=AeT2
+iEYEARECAAYFAkdvrAQACgkQj9hvisErhMKQcgCg121oifFy0x1Rq2MgSJXiKvwe
+tcMAoJaqYroQrtVFMkrowjNp+M+4roee
+=Oue2
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.8.5-r3.ebuild b/sys-devel/automake/automake-1.8.5-r3.ebuild
index 39bb78d23ec8..c3d135814658 100644
--- a/sys-devel/automake/automake-1.8.5-r3.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.15 2007/09/08 06:46:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.16 2007/12/24 12:55:54 vapier Exp $
 
 inherit eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 		doc/automake.texi || die "sed failed"
 	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
+	epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.9.6-r2.ebuild b/sys-devel/automake/automake-1.9.6-r2.ebuild
index a4203b998d65..61b5f7d120a7 100644
--- a/sys-devel/automake/automake-1.9.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.15 2007/09/08 06:46:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.16 2007/12/24 12:55:54 vapier Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
 	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
+	epatch "${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch b/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch
new file mode 100644
index 000000000000..ea2b227b8d40
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/197366
+
+commit 8952f7248c2637426bcf83d38f07a8b02124a06e
+Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date:   Wed May 10 20:50:53 2006 +0000
+
+    * tests/aclocal7.test: Add `$sleep's between file touching
+    and automake resp aclocal+automake invocations, to ensure
+    they complete with a time stamp strictly later than the touched
+    file.
+
+diff --git a/tests/aclocal7.test b/tests/aclocal7.test
+index 787565c..f6d5e31 100755
+--- a/tests/aclocal7.test
++++ b/tests/aclocal7.test
+@@ -89,6 +89,7 @@ test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
+ touch fragment.inc
+ $sleep
+ touch foo
++$sleep
+ $ACLOCAL -I m4
+ $AUTOMAKE --no-force
+ # Only ./Makefile.in should change.
+@@ -101,6 +102,7 @@ grep README Makefile.in && exit 1
+ : > README
+ $sleep
+ touch foo
++$sleep
+ $AUTOMAKE --no-force
+ # Even if no dependency change, the content changed.
+ test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
+@@ -111,6 +113,7 @@ grep README Makefile.in
+ : > sub/Makefile.in
+ $sleep
+ touch foo
++$sleep
+ $ACLOCAL -I m4
+ $AUTOMAKE --no-force
+ # Only sub/Makefile.in should change.