forward port the info patch

5 files changed, 45 insertions, 10 deletions

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 0c574789aff6..8e4ae85d35e8 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -5,11 +5,11 @@ MD5 3c5aa3d50912107c076c7ee9aa7fb20c ChangeLog 10131
 MD5 bc40bf3118d7430d738ab036f8e8da69 automake-1.4_p6.ebuild 1623
 MD5 cb5ebd885171d585c8da97105d56d030 automake-1.5.ebuild 1606
 MD5 6343436168700b4723566534827e4ec0 automake-1.6.3.ebuild 1459
-MD5 b8e4486f5c7c325d065511f15f75da18 automake-1.7.9.ebuild 1493
-MD5 36bcaf1535d45725055d402f3364aa52 automake-1.8.5-r2.ebuild 1534
-MD5 ea221c83bef695c9b1ea225a9d0f0f9b automake-1.9.3.ebuild 1407
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0d517dedad54261579a34844cd1eba91 automake-1.7.9.ebuild 1544
 MD5 625357ac5c9b8779fdb449bd08261046 automake-1.8.5-r1.ebuild 12921
+MD5 9310d93727baaffac48c5001e2d8ed69 automake-1.8.5-r2.ebuild 1592
+MD5 66270c06df2cc15bf34f2a3204a9c46b automake-1.9.3.ebuild 1465
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 78e8a0f1cc7ad91267499625df0de314 files/automake-1.5-slot.patch 1161
 MD5 252f1212a83cc74c42cd557bc3f65e32 files/digest-automake-1.4_p6 67
 MD5 41ad4c592f0cb2cbc83ff461fc36eea9 files/automake-1.4_p5-ignore-duplicates.patch 882
@@ -21,13 +21,14 @@ MD5 29dec70b283dffd42358d3643b1754c3 files/digest-automake-1.7.9 67
 MD5 0fe9854b3a6384ef4c7b0bd2bad72c59 files/digest-automake-1.8.5-r2 67
 MD5 f43e95bca19333d9ba3db03015ca47e1 files/digest-automake-1.9.3 67
 MD5 7abe94459d460b0af03ee8720383607b files/digest-automake-1.8.5-r1 332
+MD5 4c0ad89956f0b70972c19a60c65f9275 files/automake-1.9.3-infopage-namechange.patch 1109
 MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
 MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 MD5 d576cbc9cda51d6288db8b8569eb9e2a files/automake-1.8.5-config-guess-uclibc.patch 4693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBsPNHroRuSHgZdywRAlucAKCCZjrohGXLpxNHFzOnHs3MXjb69ACfbCaC
-RvpbA40tSRmsy1LZFCcNKzA=
-=u/El
+iD4DBQFBulczroRuSHgZdywRAgM0AJiipbboArnbFiMHHTtjGr5Dyh9PAJ9rjIeK
+K7jSUZpRXt0jJPWNDATMJg==
+=jcpc
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.7.9.ebuild b/sys-devel/automake/automake-1.7.9.ebuild
index 5a0536a207d8..b6e455322563 100644
--- a/sys-devel/automake/automake-1.7.9.ebuild
+++ b/sys-devel/automake/automake-1.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.5 2004/12/03 23:13:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9.ebuild,v 1.6 2004/12/11 02:10:06 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -26,6 +26,7 @@ src_unpack() {
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
+	epatch ${FILESDIR}/${P}-infopage-namechange.patch
 	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
diff --git a/sys-devel/automake/automake-1.8.5-r2.ebuild b/sys-devel/automake/automake-1.8.5-r2.ebuild
index 454966a2c081..a2b7d596a268 100644
--- a/sys-devel/automake/automake-1.8.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.5 2004/12/03 23:11:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r2.ebuild,v 1.6 2004/12/11 02:10:06 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -26,6 +26,7 @@ src_unpack() {
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
+	epatch ${FILESDIR}/${PN}-1.8.2-infopage-namechange.patch
 	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
diff --git a/sys-devel/automake/automake-1.9.3.ebuild b/sys-devel/automake/automake-1.9.3.ebuild
index 0ffc04618b3c..6f4633364888 100644
--- a/sys-devel/automake/automake-1.9.3.ebuild
+++ b/sys-devel/automake/automake-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.3.ebuild,v 1.3 2004/12/03 23:11:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.3.ebuild,v 1.4 2004/12/11 02:10:06 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -26,6 +26,7 @@ src_unpack() {
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
+	epatch ${FILESDIR}/${PN}-1.9.3-infopage-namechange.patch
 	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
diff --git a/sys-devel/automake/files/automake-1.9.3-infopage-namechange.patch b/sys-devel/automake/files/automake-1.9.3-infopage-namechange.patch
new file mode 100644
index 000000000000..cc828c6de10d
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.9.3-infopage-namechange.patch
@@ -0,0 +1,31 @@
+--- automake-1.9.3/doc/Makefile.in.orig	2004-12-10 21:03:36.061437672 -0500
++++ automake-1.9.3/doc/Makefile.in	2004-12-10 21:04:45.886822600 -0500
+@@ -179,24 +179,10 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ .texi.info:
+-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+-	am__cwd=`pwd` && cd $(srcdir) && \
+-	rm -rf $$backupdir && mkdir $$backupdir && \
+-	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+-	  if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+-	done; \
+-	cd "$$am__cwd"; \
+-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ $<; \
+-	then \
+-	  rc=0; \
+-	  cd $(srcdir); \
+-	else \
+-	  rc=$$?; \
+-	  cd $(srcdir) && \
+-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+-	fi; \
+-	rm -rf $$backupdir; exit $$rc
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
++	cd $(srcdir) \
++		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
++		`echo $< | sed 's,.*/,,'`
+ 
+ .texi.dvi:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \