From a4b6566d989a2778310c449bb59db02280146c9a Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 21 Mar 2009 11:40:59 +0000
Subject: Fix by Ryan Hill for tests w/libtool-2 #257544.

---
 sys-devel/automake/ChangeLog                       |  6 ++-
 sys-devel/automake/automake-1.7.9-r1.ebuild        |  3 +-
 .../automake/files/automake-1.7.9-libtool-2.patch  | 43 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 sys-devel/automake/files/automake-1.7.9-libtool-2.patch

(limited to 'sys-devel/automake')

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index d017cbf5ed6a..fd882a1535a8 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,10 @@
 # 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.131 2009/03/21 11:39:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.132 2009/03/21 11:40:59 vapier Exp $
+
+  21 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.7.9-libtool-2.patch, automake-1.7.9-r1.ebuild:
+  Fix by Ryan Hill for tests w/libtool-2 #257544.
 
   21 Mar 2009; Mike Frysinger <vapier@gentoo.org>
   +files/automake-1.9.6-subst-test.patch, automake-1.7.9-r1.ebuild,
diff --git a/sys-devel/automake/automake-1.7.9-r1.ebuild b/sys-devel/automake/automake-1.7.9-r1.ebuild
index 2b094d20fa3c..11420f6bb4f3 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-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.17 2009/03/21 11:39:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.18 2009/03/21 11:40:59 vapier Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	epatch "${FILESDIR}"/${P}-libtool-2.patch #257544
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch b/sys-devel/automake/files/automake-1.7.9-libtool-2.patch
new file mode 100644
index 000000000000..ad1d75d8caa9
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.7.9-libtool-2.patch
@@ -0,0 +1,43 @@
+fixup tests w/libtool-2
+
+https://bugs.gentoo.org/257544
+
+--- automake-1.7.9/tests/libtool5.test
++++ automake-1.7.9/tests/libtool5.test
+@@ -45,5 +45,6 @@
+ END
+ 
+ libtoolize
++[ -e config.guess ] || libtoolize --install
+ $ACLOCAL
+ $AUTOMAKE
+--- automake-1.7.9/tests/ltcond2.test
++++ automake-1.7.9/tests/ltcond2.test
+@@ -73,6 +73,7 @@
+ echo 'int main() { print(); return 0; }' >main.c
+ 
+ libtoolize
++[ -e config.guess ] || libtoolize --install
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE
+--- automake-1.7.9/tests/ltcond.test
++++ automake-1.7.9/tests/ltcond.test
+@@ -62,6 +62,7 @@
+ mkdir empty
+ 
+ libtoolize
++[ -e config.guess ] || libtoolize --install
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE
+--- automake-1.7.9/tests/ltconv.test
++++ automake-1.7.9/tests/ltconv.test
+@@ -111,6 +111,7 @@
+ EOF
+ 
+ libtoolize
++[ -e config.guess ] || libtoolize --install
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE
-- 
cgit v1.2.3-65-gdbad