changed my mind about patch naming

Package-Manager: portage-2.0.51-r15

7 files changed, 14 insertions, 14 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 4de075da0e58..dbdd92de3c45 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,11 +1,8 @@
 # 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.66 2005/01/30 13:26:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.67 2005/01/30 13:32:26 vapier Exp $
 
-  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:
+  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.
 
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 7a54275d4b67..78e182482261 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,6 +1,6 @@
-MD5 33a8542679044648f898d82d850dc55b ChangeLog 11536
-MD5 e83acb99ab7115fc6e0fe73e664ba06c automake-1.4_p6.ebuild 1712
-MD5 6dfdbe297bcfc01b3b5439c975b70246 automake-1.5.ebuild 1598
+MD5 7d208dd15de376d4732ea29285a4f9a4 ChangeLog 11366
+MD5 8c8daa72ae0dfaa8a8c1a131cf97dd6b automake-1.4_p6.ebuild 1824
+MD5 6051114bcc11a3636a99466c5ed31f83 automake-1.5.ebuild 1649
 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
@@ -9,6 +9,7 @@ MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 4ebc43dd529c39eb9698f83c4ee3cde5 automake-1.9.4.ebuild 1481
 MD5 78e8a0f1cc7ad91267499625df0de314 files/automake-1.5-slot.patch 1161
 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
 MD5 2b5aa34b9c688d919f6b06df0c428cc4 files/am-wrapper.pl 6165
 MD5 61706a6ada025b2f032fb24668457cef files/digest-automake-1.5 64
@@ -18,9 +19,8 @@ MD5 29dec70b283dffd42358d3643b1754c3 files/digest-automake-1.7.9-r1 67
 MD5 dc11390dc4c156e317629428080cbbad files/digest-automake-1.9.4 67
 MD5 7abe94459d460b0af03ee8720383607b files/digest-automake-1.8.5-r1 332
 MD5 4c0ad89956f0b70972c19a60c65f9275 files/automake-1.9.3-infopage-namechange.patch 1109
+MD5 b04899a3860b0623bd45c705258ceabd files/automake-1.4-ansi2knr-stdlib.patch 249
 MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
 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 91bfbe9a39ed2eee6bfa0254bad56d5d files/1.4/00_all_libtoolize.patch 542
-MD5 a4327436d159f9262364994c88489ee6 files/1.4/00_all_subdirs-89656.patch 944
-MD5 b04899a3860b0623bd45c705258ceabd files/1.4/00_all_ansi2knr-stdlib.patch 249
diff --git a/sys-devel/automake/automake-1.4_p6.ebuild b/sys-devel/automake/automake-1.4_p6.ebuild
index 727bf10654da..ebcfad436629 100644
--- a/sys-devel/automake/automake-1.4_p6.ebuild
+++ b/sys-devel/automake/automake-1.4_p6.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.4_p6.ebuild,v 1.11 2005/01/30 13:26:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.12 2005/01/30 13:32:26 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -24,7 +24,9 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	EPATCH_SUFFIX="patch" epatch ${FILESDIR}/1.4
+	epatch ${FILESDIR}/automake-1.4-libtoolize.patch
+	epatch ${FILESDIR}/automake-1.4-subdirs-89656.patch
+	epatch ${FILESDIR}/automake-1.4-ansi2knr-stdlib.patch
 	sed -i 's:error\.test::' tests/Makefile.in #79529
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild
index fc1a0e11f2e5..4c34cb75d7bd 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.13 2005/01/30 11:34:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.14 2005/01/30 13:32:26 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-target_hook.patch
 	epatch ${FILESDIR}/${P}-slot.patch
+	sed -i 's:error\.test::' tests/Makefile.in #79529
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
diff --git a/sys-devel/automake/files/1.4/00_all_ansi2knr-stdlib.patch b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
index 78aa2e3d6a3f..78aa2e3d6a3f 100644
--- a/sys-devel/automake/files/1.4/00_all_ansi2knr-stdlib.patch
+++ b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
diff --git a/sys-devel/automake/files/1.4/00_all_libtoolize.patch b/sys-devel/automake/files/automake-1.4-libtoolize.patch
index d71d66c973c5..d71d66c973c5 100644
--- a/sys-devel/automake/files/1.4/00_all_libtoolize.patch
+++ b/sys-devel/automake/files/automake-1.4-libtoolize.patch
diff --git a/sys-devel/automake/files/1.4/00_all_subdirs-89656.patch b/sys-devel/automake/files/automake-1.4-subdirs-89656.patch
index 7500fc98d9ac..7500fc98d9ac 100644
--- a/sys-devel/automake/files/1.4/00_all_subdirs-89656.patch
+++ b/sys-devel/automake/files/automake-1.4-subdirs-89656.patch