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

(Portage version: 2.1.1_rc1)

5 files changed, 39 insertions, 3 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/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