fix aclocalii and insthook test failures too #79505

Package-Manager: portage-2.0.51-r15

6 files changed, 59 insertions, 52 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 7d6eeb1c7ca7..23675f9843b3 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,23 +1,18 @@
 # ChangeLog for sys-devel/automake
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.68 2005/01/30 13:54:13 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.69 2005/01/30 14:27:30 vapier Exp $
 
   30 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/automake-1.5-ccnoco-test.patch,
-  +files/automake-1.5-dirnames-test.patch, automake-1.5.ebuild:
-  Add patches from fedora to fix ccnoco/dirname tests #79505.
+  +files/automake-1.5-test-fixes.patch, automake-1.5.ebuild:
+  Add patches from fedora to fix ccnoco/dirname tests #79505.  Also touch up 
+  our slot patch to not append /usr/share/aclocal if --acdir is passed since 
+  that's (1) wrong and (2) it breaks the aclocalii test.  Update the tail/head 
+  syntax of the insthook test to fix incorrect failure.
 
   30 Jan 2005; Mike Frysinger <vapier@gentoo.org> automake-1.4_p6.ebuild:
   Add a few patches from fedora and dont run error.test since its known to fail
   and no one really cares to fix it in this old version #79529.
 
-  30 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  -files/automake-1.4_p5-ignore-duplicates.patch,
-  +files/1.4/00_all_ansi2knr-stdlib.patch, +files/1.4/00_all_libtoolize.patch,
-  +files/1.4/00_all_subdirs-89656.patch, automake-1.4_p6.ebuild:
-  Add a few patches from fedora and dont run error.test since its known to fail
-  and no one really cares to fix it in this old version #79529.
-
   30 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
   automake-1.4_p6.ebuild, automake-1.5.ebuild, automake-1.6.3.ebuild,
   automake-1.7.9-r1.ebuild, automake-1.8.5-r3.ebuild, automake-1.9.4.ebuild:
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index b13b737d7a72..e14bc9ffd705 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,13 +1,13 @@
-MD5 f7f3c6ea29b90375cace145e08fd6322 ChangeLog 11584
+MD5 57569955e70cd3aa025a7cd6026fb6e2 ChangeLog 11381
 MD5 8c8daa72ae0dfaa8a8c1a131cf97dd6b automake-1.4_p6.ebuild 1824
-MD5 8092230a8059e6ea3d559c1339c20fcd automake-1.5.ebuild 1686
+MD5 89d61f897adb8bccd9fb4785368bfc41 automake-1.5.ebuild 1647
 MD5 cba76f63eea7c334f808038c27c6392b automake-1.6.3.ebuild 1450
 MD5 32b62d3e5b7ab2d21cf933e9ec40e908 automake-1.8.5-r3.ebuild 1583
 MD5 5eb69c185025d1b2ce1eb295119e04ba automake-1.8.5-r1.ebuild 12921
 MD5 0d90200cd8b8fb9b880e58484e59205e automake-1.7.9-r1.ebuild 1538
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 4ebc43dd529c39eb9698f83c4ee3cde5 automake-1.9.4.ebuild 1481
-MD5 78e8a0f1cc7ad91267499625df0de314 files/automake-1.5-slot.patch 1161
+MD5 a56b2416416ab1f0bdc71cb7ab0454d6 files/automake-1.5-slot.patch 1191
 MD5 252f1212a83cc74c42cd557bc3f65e32 files/digest-automake-1.4_p6 67
 MD5 91bfbe9a39ed2eee6bfa0254bad56d5d files/automake-1.4-libtoolize.patch 542
 MD5 fbf3743bc8590dcb5bd34c675cb9d9f0 files/automake-1.5-target_hook.patch 1132
@@ -24,5 +24,4 @@ MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.pa
 MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 MD5 a4327436d159f9262364994c88489ee6 files/automake-1.4-subdirs-89656.patch 944
 MD5 d576cbc9cda51d6288db8b8569eb9e2a files/automake-1.8.5-config-guess-uclibc.patch 4693
-MD5 7d258158478cdb286638c57333bd49d8 files/automake-1.5-dirnames-test.patch 1219
-MD5 b4366f068f770dcf270bba6610b70b8b files/automake-1.5-ccnoco-test.patch 547
+MD5 5c2fe79f8f664efdb7e2736e88c10f09 files/automake-1.5-test-fixes.patch 2303
diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild
index 14578289b285..412c66723b31 100644
--- a/sys-devel/automake/automake-1.5.ebuild
+++ b/sys-devel/automake/automake-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.16 2005/01/30 13:54:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.17 2005/01/30 14:27:30 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -23,8 +23,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-target_hook.patch
 	epatch ${FILESDIR}/${P}-slot.patch
-	epatch ${FILESDIR}/${P}-ccnoco-test.patch
-	epatch ${FILESDIR}/${P}-dirnames-test.patch
+	epatch ${FILESDIR}/${P}-test-fixes.patch #79505
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
diff --git a/sys-devel/automake/files/automake-1.5-ccnoco-test.patch b/sys-devel/automake/files/automake-1.5-ccnoco-test.patch
deleted file mode 100644
index 086af020fd79..000000000000
--- a/sys-devel/automake/files/automake-1.5-ccnoco-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -u automake-1.5/tests/ccnoco.test automake-1.6.3/tests/ccnoco.test
---- automake-1.5/tests/ccnoco.test	2003-06-07 06:34:18.000000000 +0900
-+++ automake-1.6.3/tests/ccnoco.test	2003-06-07 06:34:18.000000000 +0900
-@@ -39,7 +39,6 @@
- }
- END
- 
--$needs_autoconf
- gcc -v || exit 77
- 
- cat > Mycomp << 'END'
-@@ -51,7 +50,7 @@
-     ;;
- esac
- 
--exec gcc ${1+"$@"}
-+exec gcc "$@"
- END
- 
- chmod +x Mycomp
-@@ -59,6 +58,10 @@
- set -e
- 
- 
-+# Ignore user CFLAGS.
-+CFLAGS=
-+export CFLAGS
-+
- for conf in configure.1 configure.3; do
-    cp $conf configure.in
- 
diff --git a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch
index d1e82983c1aa..348775abe751 100644
--- a/sys-devel/automake/files/automake-1.5-slot.patch
+++ b/sys-devel/automake/files/automake-1.5-slot.patch
@@ -10,7 +10,7 @@
 @@ -116,4 +116,5 @@
  
  local (@dirlist) = &parse_arguments (@ARGV);
-+push (@dirlist, "/usr/share/aclocal");
++push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV));
  &scan_m4_files (@dirlist);
  &scan_configure;
 @@ -203,5 +204,5 @@
diff --git a/sys-devel/automake/files/automake-1.5-dirnames-test.patch b/sys-devel/automake/files/automake-1.5-test-fixes.patch
index 7da9ccaa1444..29e284fa2a60 100644
--- a/sys-devel/automake/files/automake-1.5-dirnames-test.patch
+++ b/sys-devel/automake/files/automake-1.5-test-fixes.patch
@@ -1,3 +1,17 @@
+Fix the tests so they don't fail :)
+http://bugs.gentoo.org/show_bug.cgi?id=79505
+
+insthook:
+update the head/tail syntax since coreutils has deprecated the old style
+
+dirname,ccnoco:
+rip patches from fedora
+
+--- automake-1.5/tests/insthook.test.orig	2005-01-30 09:02:48.622592064 -0500
++++ automake-1.5/tests/insthook.test	2005-01-30 09:03:00.332811840 -0500
+@@ -17 +17 @@
+-test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook
++test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook
 diff -u automake-1.5/tests/dirname.test automake-1.6.3/tests/dirname.test
 --- automake-1.5/tests/dirname.test	2003-04-25 15:44:56.000000000 +0900
 +++ automake-1.6.3/tests/dirname.test	2003-04-25 15:44:56.000000000 +0900
@@ -38,3 +52,34 @@ diff -u automake-1.5/tests/dirname.test automake-1.6.3/tests/dirname.test
  
  exit 0
 -
+diff -u automake-1.5/tests/ccnoco.test automake-1.6.3/tests/ccnoco.test
+--- automake-1.5/tests/ccnoco.test	2003-06-07 06:34:18.000000000 +0900
++++ automake-1.6.3/tests/ccnoco.test	2003-06-07 06:34:18.000000000 +0900
+@@ -39,7 +39,6 @@
+ }
+ END
+ 
+-$needs_autoconf
+ gcc -v || exit 77
+ 
+ cat > Mycomp << 'END'
+@@ -51,7 +50,7 @@
+     ;;
+ esac
+ 
+-exec gcc ${1+"$@"}
++exec gcc "$@"
+ END
+ 
+ chmod +x Mycomp
+@@ -59,6 +58,10 @@
+ set -e
+ 
+ 
++# Ignore user CFLAGS.
++CFLAGS=
++export CFLAGS
++
+ for conf in configure.1 configure.3; do
+    cp $conf configure.in
+