Fix from upstream for tests with newer autotools #222225 by Xake.

5 files changed, 56 insertions, 6 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 9b4f83a026a0..d017cbf5ed6a 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.130 2009/02/08 19:42:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.131 2009/03/21 11:39:45 vapier Exp $
+
+  21 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.9.6-subst-test.patch, automake-1.7.9-r1.ebuild,
+  automake-1.8.5-r3.ebuild, automake-1.9.6-r2.ebuild:
+  Fix from upstream for tests with newer autotools #222225 by Xake.
 
   08 Feb 2009; Mike Frysinger <vapier@gentoo.org> automake-1.9.6-r2.ebuild,
   automake-1.10.2.ebuild, automake-9999.ebuild:
diff --git a/sys-devel/automake/automake-1.7.9-r1.ebuild b/sys-devel/automake/automake-1.7.9-r1.ebuild
index 22dd35cc3360..2b094d20fa3c 100644
--- a/sys-devel/automake/automake-1.7.9-r1.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.16 2008/11/23 14:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.17 2009/03/21 11:39:45 vapier Exp $
 
 inherit eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 		automake.texi || die "sed texi failed"
 	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.8.5-r3.ebuild b/sys-devel/automake/automake-1.8.5-r3.ebuild
index a6b07e943fd1..fd4e494b51d1 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.17 2008/11/23 14:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.18 2009/03/21 11:39:45 vapier Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	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
+	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	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 57fc75e9e53f..2ec9a7eae1fe 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-2009 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.18 2009/02/08 19:42:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.19 2009/03/21 11:39:45 vapier Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
 	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
 	epatch "${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
+	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/files/automake-1.9.6-subst-test.patch b/sys-devel/automake/files/automake-1.9.6-subst-test.patch
new file mode 100644
index 000000000000..6b794b1e1377
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.9.6-subst-test.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/222225
+
+Patch from automake upstream git-repo to fix "make check" with newer versions of autoconf
+
+From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date: Sun, 22 Jul 2007 09:06:23 +0000 (+0000)
+Subject: * tests/subst.test: Move the AC_SUBST into a macro definition.
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff_plain;h=3d85de7baa9edf21c56401db3d25ef8a8e8d7797
+
+* tests/subst.test: Move the AC_SUBST into a macro definition.
+Avoids an error from CVS Autoconf.
+* THANKS: Update.
+Report by Benoit Sigoure.
+---
+diff --git a/tests/subst.test b/tests/subst.test
+index 33e925d..a72af85 100755
+--- a/tests/subst.test
++++ b/tests/subst.test
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
++# Copyright (C) 1996, 2001, 2002, 2007  Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Automake.
+ #
+@@ -24,8 +24,14 @@
+ . ./defs || exit 1
+ 
+ cat >> configure.in << 'END'
+-AC_SUBST($1)
+-AC_SUBST([$]$1)  dnl this is the actual invocation that was used
++dnl This test used to have the following lines, which cannot have
++dnl worked sensibly with Autoconf for years, however:
++dnl AC_SUBST($1)
++dnl AC_SUBST([$]$1)  dnl this is the actual invocation that was used
++dnl
++AC_DEFUN([FOO],
++[AC_SUBST([$1])])
++FOO([BAR])
+ END
+ 
+ : > Makefile.am