changed my mind about patch naming

(Portage version: 2.0.51-r15)

6 files changed, 8 insertions, 8 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/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