Grab fix from upstream for tests with newer m4 #145279 by Josef Reidinger.

Package-Manager: portage-2.1.1_rc1

6 files changed, 63 insertions, 23 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index a30da93879d0..e38381bc7157 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.77 2006/06/27 00:41:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.78 2006/08/28 07:10:36 vapier Exp $
+
+  28 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/autoconf-2.60-tests.patch, autoconf-2.60.ebuild:
+  Grab fix from upstream for tests with newer m4 #145279 by Josef Reidinger.
 
 *autoconf-2.60 (27 Jun 2006)
 
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 20a10cef0a03..61318793a987 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -13,8 +13,12 @@ AUX autoconf-2.59-more-quotes.patch 1223 RMD160 f704db2caacdb3c7eedbe39ec1745503
 MD5 616563340fe214518ae208b42550d851 files/autoconf-2.59-more-quotes.patch 1223
 RMD160 f704db2caacdb3c7eedbe39ec1745503b336391c files/autoconf-2.59-more-quotes.patch 1223
 SHA256 0bd6d00b2f77e89684ed7305c3821090950fcc6407ab045fd3ace91ac0b19abd files/autoconf-2.59-more-quotes.patch 1223
-DIST autoconf-2.13.tar.gz 443844
-DIST autoconf-2.59.tar.bz2 925073
+AUX autoconf-2.60-tests.patch 720 RMD160 cbae84eb08b71dc034b38d8ad2d915e06180235d SHA1 94f0852872395db32ad25854ea202e8c68254a31 SHA256 96a54f7623bd889f3f8a12c802305a8e07a0dc781796ab78c8f9b61c4644c9fa
+MD5 d21d9ebffb28303a365f043cc1b600b6 files/autoconf-2.60-tests.patch 720
+RMD160 cbae84eb08b71dc034b38d8ad2d915e06180235d files/autoconf-2.60-tests.patch 720
+SHA256 96a54f7623bd889f3f8a12c802305a8e07a0dc781796ab78c8f9b61c4644c9fa files/autoconf-2.60-tests.patch 720
+DIST autoconf-2.13.tar.gz 443844 RMD160 0d1fa0992280ed71c0d72487a5a4c246d1c1b18a SHA1 e4826c8bd85325067818f19b2b2ad2b625da66fc SHA256 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
+DIST autoconf-2.59.tar.bz2 925073 RMD160 792c45aade68e2ed19a0e4c6ebc0e20cb8298e1a SHA1 d366a07b2d99c95b7f24395aa8a8e023d8b93b69 SHA256 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7
 DIST autoconf-2.60.tar.gz 1366620 RMD160 0245d3a347b6be4f87f9f820f2dc43664327ec43 SHA1 4286f873d04ba0d06fd9439fee9a1a8bd7bda91d SHA256 0bef75d70afff289d0e1fe378d6aa1d79b3032cb4caf484578ac2a8a0530a3af
 EBUILD autoconf-2.13.ebuild 1563 RMD160 8b34c900a378855716c2aa69fd7b2f988a330b8d SHA1 e8913490488372910b039f8b8d00fa27ba20f595 SHA256 da9f7ce98fbad81fc350cf905d2d608ce93fe3ada71a1782d03f8493b6aeab2e
 MD5 f623f768f63ae6e89c7e79705e2ec9e1 autoconf-2.13.ebuild 1563
@@ -24,31 +28,31 @@ EBUILD autoconf-2.59-r7.ebuild 1259 RMD160 f945b0b518bd4901d4098fd80dd11aea6f9a2
 MD5 04344657c201dfb0ccaa446992d8723b autoconf-2.59-r7.ebuild 1259
 RMD160 f945b0b518bd4901d4098fd80dd11aea6f9a20cf autoconf-2.59-r7.ebuild 1259
 SHA256 156a0029457763308f8aa0ff6898d798048f4c0891c7ee4054437bc16cb778e5 autoconf-2.59-r7.ebuild 1259
-EBUILD autoconf-2.60.ebuild 1152 RMD160 1b7d68fe426b33788b56b7653d081c132d8b48ad SHA1 c20fe6b4d10b253c5dfa9ece2b53e08a6f7c45e1 SHA256 dbc18aedaf733183502eedcbb26b96eb568e693d53ff842e3d186f25849f620c
-MD5 8c79390722c9cc5411b625d9e9f22f38 autoconf-2.60.ebuild 1152
-RMD160 1b7d68fe426b33788b56b7653d081c132d8b48ad autoconf-2.60.ebuild 1152
-SHA256 dbc18aedaf733183502eedcbb26b96eb568e693d53ff842e3d186f25849f620c autoconf-2.60.ebuild 1152
-MISC ChangeLog 11525 RMD160 cf2307ecfea0ed0591926dfd2486af98c3ada770 SHA1 3491199f37053f4b39d8a8a4cee12acc7f7d41d4 SHA256 7affe8f1cca06dbff970d2f2590a0e4fbd0e1d8fc3f3b2ea608ec391648572aa
-MD5 cf52f6de472c1605bfa0502acf467ea1 ChangeLog 11525
-RMD160 cf2307ecfea0ed0591926dfd2486af98c3ada770 ChangeLog 11525
-SHA256 7affe8f1cca06dbff970d2f2590a0e4fbd0e1d8fc3f3b2ea608ec391648572aa ChangeLog 11525
+EBUILD autoconf-2.60.ebuild 1235 RMD160 2f8761f7f38959cf4ba958068345ff34e9fedbb0 SHA1 59e9abcd612bc4b7249f1fb0b07b0ec48b671b97 SHA256 82de2709f7295ef4ad3630871ed416c64a93de477c07c54bbca53fae1f5745af
+MD5 0bde474a44dbc6ac2dfab086f106dcd1 autoconf-2.60.ebuild 1235
+RMD160 2f8761f7f38959cf4ba958068345ff34e9fedbb0 autoconf-2.60.ebuild 1235
+SHA256 82de2709f7295ef4ad3630871ed416c64a93de477c07c54bbca53fae1f5745af autoconf-2.60.ebuild 1235
+MISC ChangeLog 11711 RMD160 9bf19d5bca335ca4817f4ee631f142891d299676 SHA1 d6b26b49b5c1b8945752b16f076dfba4d032af15 SHA256 0f1cfb784e6684c0127a979e335256d04c6bb6a96443281831d05e332eb26fbc
+MD5 35845726094b561a52293f30b93e379f ChangeLog 11711
+RMD160 9bf19d5bca335ca4817f4ee631f142891d299676 ChangeLog 11711
+SHA256 0f1cfb784e6684c0127a979e335256d04c6bb6a96443281831d05e332eb26fbc ChangeLog 11711
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 02c192b9ea3e4945d007a8cfde221c73 files/digest-autoconf-2.13 65
-RMD160 832840b58fb801e51ef0f590614a61eb565e5330 files/digest-autoconf-2.13 65
-SHA256 867ffd3f8499014b6bd437350f14c4d3fe42cb0b8c8daa3c00c2d6d2e87893b6 files/digest-autoconf-2.13 65
-MD5 ed1c29020cbdfc79d6a1ece183afd936 files/digest-autoconf-2.59-r7 66
-RMD160 468925a5fd7ec734b45e394f5b51c1d2c5a0c577 files/digest-autoconf-2.59-r7 66
-SHA256 610a706c7ac9eba8caadccba589863ff920a33dab17af4075675a5ea6ff14537 files/digest-autoconf-2.59-r7 66
+MD5 a89abcc4d9e5c007b80e450c1689ee34 files/digest-autoconf-2.13 241
+RMD160 a848c53b51743fd791d51d89270a121ff9164b63 files/digest-autoconf-2.13 241
+SHA256 26ad44620584cc253db8880190e1d291f37bbdd27ffbe55b1549845a34b93ce0 files/digest-autoconf-2.13 241
+MD5 9f48666bb21f75dbb6af9a15d0ef3bf6 files/digest-autoconf-2.59-r7 244
+RMD160 f23b567c168ececc933cb3f7df8017454b06fdaf files/digest-autoconf-2.59-r7 244
+SHA256 620698f88383fd4e8ff74c7ab3bf90bf2b8781febbdd443005285fdfdfd5fe0f files/digest-autoconf-2.59-r7 244
 MD5 020c405f06573dc9d4a75f886b70808f files/digest-autoconf-2.60 244
 RMD160 d7cf76ddd2867dc0bae4ad3fc70986bbdf64a468 files/digest-autoconf-2.60 244
 SHA256 c25aef093f7f5a69ff230c02f88c47efa6c4c5d05d31f836b70589b043d67f5e files/digest-autoconf-2.60 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFEoIpQamhnQswr0vIRAhtGAJdw5RJMZ09xXhUxCiZAIiOig9njAKC/J9KR
-ukzT77eYkEqk2C546KooiQ==
-=2BhH
+iD8DBQFE8pb3amhnQswr0vIRAg4nAJ9A2q2JGr48+VZUiSAYoKr1j0KsyQCbBAH4
+Rmvaq1gTud2fjOWFWj2ge58=
+=Wd57
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.60.ebuild b/sys-devel/autoconf/autoconf-2.60.ebuild
index 4200e50b20ee..ecfff1e67006 100644
--- a/sys-devel/autoconf/autoconf-2.60.ebuild
+++ b/sys-devel/autoconf/autoconf-2.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.60.ebuild,v 1.2 2006/06/27 01:25:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.60.ebuild,v 1.3 2006/08/28 07:10:36 vapier Exp $
 
 inherit eutils
 
@@ -14,10 +14,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s39
 IUSE="emacs"
 
 DEPEND=">=sys-apps/texinfo-4.3
-	=sys-devel/m4-1.4*
+	>=sys-devel/m4-1.4.6
 	dev-lang/perl"
 PDEPEND=">=sys-devel/autoconf-wrapper-3.2-r1"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-tests.patch
+}
+
 src_compile() {
 	(use emacs && type -p emacs) \
 		&& export EMACS=emacs \
diff --git a/sys-devel/autoconf/files/autoconf-2.60-tests.patch b/sys-devel/autoconf/files/autoconf-2.60-tests.patch
new file mode 100644
index 000000000000..09e4536baf08
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.60-tests.patch
@@ -0,0 +1,22 @@
+2006-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* tests/tools.at (autom4te cache): Update wording of diagnostic
+	to match M4 1.4.5.
+
+Index: tests/tools.at
+===================================================================
+RCS file: /cvsroot/autoconf/autoconf/tests/tools.at,v
+retrieving revision 1.89
+retrieving revision 1.90
+diff -u -p -r1.89 -r1.90
+--- tests/tools.at	20 Jun 2006 05:37:43 -0000	1.89
++++ tests/tools.at	17 Jul 2006 17:30:44 -0000	1.90
+@@ -101,7 +101,7 @@ AT_CHECK_M4SUGAR
+ mkdir sub
+ mv foo sub
+ AT_CHECK_M4SUGAR([], [1], [],
+-[m4: script.4s: 1: Cannot open foo: No such file or directory
++[m4: script.4s: 1: cannot open `foo': No such file or directory
+ autom4te: m4 failed with exit status: 1
+ ])
+ 
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.13 b/sys-devel/autoconf/files/digest-autoconf-2.13
index d0d2998d7bd3..b04a0ebd7434 100644
--- a/sys-devel/autoconf/files/digest-autoconf-2.13
+++ b/sys-devel/autoconf/files/digest-autoconf-2.13
@@ -1 +1,3 @@
 MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844
+RMD160 0d1fa0992280ed71c0d72487a5a4c246d1c1b18a autoconf-2.13.tar.gz 443844
+SHA256 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e autoconf-2.13.tar.gz 443844
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.59-r7 b/sys-devel/autoconf/files/digest-autoconf-2.59-r7
index 2c410cdcd9fa..4dafdf0cd231 100644
--- a/sys-devel/autoconf/files/digest-autoconf-2.59-r7
+++ b/sys-devel/autoconf/files/digest-autoconf-2.59-r7
@@ -1 +1,3 @@
 MD5 1ee40f7a676b3cfdc0e3f7cd81551b5f autoconf-2.59.tar.bz2 925073
+RMD160 792c45aade68e2ed19a0e4c6ebc0e20cb8298e1a autoconf-2.59.tar.bz2 925073
+SHA256 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7 autoconf-2.59.tar.bz2 925073