Dual revbumps; kept 2.3.3-r1 stable and removed 2.3.3. bug 80147.

(Portage version: 2.0.51-r15)

7 files changed, 58 insertions, 36 deletions

diff --git a/app-text/talkfilters/ChangeLog b/app-text/talkfilters/ChangeLog
index 179244d82d86..d1f2b4595db8 100644
--- a/app-text/talkfilters/ChangeLog
+++ b/app-text/talkfilters/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/talkfilters
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/talkfilters/ChangeLog,v 1.10 2005/01/15 20:17:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/talkfilters/ChangeLog,v 1.11 2005/01/31 10:28:03 ka0ttic Exp $
+
+*talkfilters-2.3.4-r1 (31 Jan 2005)
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> talkfilters-2.1.ebuild,
+  +talkfilters-2.3.3-r1.ebuild, -talkfilters-2.3.3.ebuild,
+  +talkfilters-2.3.4-r1.ebuild, -talkfilters-2.3.4.ebuild:
+  Dual revbumps; kept 2.3.3-r1 stable and removed 2.3.3. bug 80147.
 
 *talkfilters-2.3.4 (15 Jan 2005)
 
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
index 9725fc041188..d6a7bbb89a14 100644
--- a/app-text/talkfilters/Manifest
+++ b/app-text/talkfilters/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 72698f968f82f07a3069dc712c83af81 talkfilters-2.3.4.ebuild 916
-MD5 475ab574cf4e252b499dab97d19e3d45 ChangeLog 1131
+MD5 31a22488ceb1ff71a32bd5795d318060 talkfilters-2.3.3-r1.ebuild 1071
+MD5 1a417ed501d48158fb2dcdd9dde7b388 talkfilters-2.3.4-r1.ebuild 1072
+MD5 6191f25d167fa0fad32f4d96319559f5 ChangeLog 1428
 MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
-MD5 a6aee4bd07cd04a13aebe13d64a25d4f talkfilters-2.1.ebuild 609
-MD5 3d001196f0421a24a69ae5647d796d95 talkfilters-2.3.3.ebuild 915
+MD5 3569b0fc428fabd8475be6c7b23824dd talkfilters-2.1.ebuild 1049
+MD5 2bf3bf8d8322640c5c4580ccd2f233c9 files/digest-talkfilters-2.3.3-r1 69
+MD5 533f25dd0383144c11961b639d2588c4 files/digest-talkfilters-2.3.4-r1 69
 MD5 e98c05d941b1703fe449023656b827f0 files/digest-talkfilters-2.1 67
-MD5 2bf3bf8d8322640c5c4580ccd2f233c9 files/digest-talkfilters-2.3.3 69
-MD5 533f25dd0383144c11961b639d2588c4 files/digest-talkfilters-2.3.4 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB6XqjEZCkKN40op4RAqb4AJ9uLFypsWKPahZ2kiKbATr0gFK7tgCgn6v5
-ZnIEIYVWOaUK7CDtrlCwKPM=
-=h7/F
------END PGP SIGNATURE-----
diff --git a/app-text/talkfilters/files/digest-talkfilters-2.3.3 b/app-text/talkfilters/files/digest-talkfilters-2.3.3-r1
index ff4512f6ff21..ff4512f6ff21 100644
--- a/app-text/talkfilters/files/digest-talkfilters-2.3.3
+++ b/app-text/talkfilters/files/digest-talkfilters-2.3.3-r1
diff --git a/app-text/talkfilters/files/digest-talkfilters-2.3.4 b/app-text/talkfilters/files/digest-talkfilters-2.3.4-r1
index 7a9c5f184985..7a9c5f184985 100644
--- a/app-text/talkfilters/files/digest-talkfilters-2.3.4
+++ b/app-text/talkfilters/files/digest-talkfilters-2.3.4-r1
diff --git a/app-text/talkfilters/talkfilters-2.1.ebuild b/app-text/talkfilters/talkfilters-2.1.ebuild
index 6d1bf818e3ac..f35d7787e24b 100644
--- a/app-text/talkfilters/talkfilters-2.1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.1.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/app-text/talkfilters/talkfilters-2.1.ebuild,v 1.10 2005/01/01 16:37:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/talkfilters/talkfilters-2.1.ebuild,v 1.11 2005/01/31 10:28:03 ka0ttic Exp $
 
 DESCRIPTION="convert ordinary English text into text that mimics a stereotyped or otherwise humorous dialect"
 HOMEPAGE="http://www.dystance.net/software/talkfilters/"
@@ -11,10 +11,27 @@ SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-devel/flex"
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# respect DESTDIR
+	sed -i 's:\($(mandir)\):$(DESTDIR)/\1:' Makefile.am \
+		|| die "sed Makefile.am failed"
+	sed -i '/^AC_PROG_RANLIB$/d' configure.in || die "sed configure.in failed"
+}
+
+src_compile() {
+	einfo "Running autoreconf"
+	WANT_AUTOMAKE=1.7 autoreconf -f -i || die "autoreconf failed"
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
 
 src_install () {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/app-text/talkfilters/talkfilters-2.3.3.ebuild b/app-text/talkfilters/talkfilters-2.3.3-r1.ebuild
index ade3ed188ea6..fce54afcd049 100644
--- a/app-text/talkfilters/talkfilters-2.3.3.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.3-r1.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/app-text/talkfilters/talkfilters-2.3.3.ebuild,v 1.3 2005/01/15 20:17:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/talkfilters/talkfilters-2.3.3-r1.ebuild,v 1.1 2005/01/31 10:28:03 ka0ttic Exp $
 
 DESCRIPTION="convert ordinary English text into text that mimics a stereotyped or otherwise humorous dialect"
 HOMEPAGE="http://www.dystance.net/software/talkfilters/"
@@ -11,23 +11,27 @@ SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-devel/flex
-	>=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:\($(mandir)\):$(DESTDIR)/\1:' Makefile.am || die "sed failed"
+	# respect DESTDIR
+	sed -i 's:\($(mandir)\):$(DESTDIR)/\1:' Makefile.am \
+		|| die "sed Makefile.am failed"
+	sed -i '/^AC_PROG_RANLIB$/d' configure.in || die "sed configure.in failed"
 }
 
 src_compile() {
-	automake || die "automake failed"
+	einfo "Running autoreconf"
+	WANT_AUTOMAKE=1.7 autoreconf -f -i || die "autoreconf failed"
+
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install () {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/app-text/talkfilters/talkfilters-2.3.4.ebuild b/app-text/talkfilters/talkfilters-2.3.4-r1.ebuild
index 360c60b9e229..ee20f371c5d3 100644
--- a/app-text/talkfilters/talkfilters-2.3.4.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.4-r1.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/app-text/talkfilters/talkfilters-2.3.4.ebuild,v 1.1 2005/01/15 20:17:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/talkfilters/talkfilters-2.3.4-r1.ebuild,v 1.1 2005/01/31 10:28:03 ka0ttic Exp $
 
 DESCRIPTION="convert ordinary English text into text that mimics a stereotyped or otherwise humorous dialect"
 HOMEPAGE="http://www.dystance.net/software/talkfilters/"
@@ -11,23 +11,27 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-devel/flex
-	>=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:\($(mandir)\):$(DESTDIR)/\1:' Makefile.am || die "sed failed"
+	# respect DESTDIR
+	sed -i 's:\($(mandir)\):$(DESTDIR)/\1:' Makefile.am \
+		|| die "sed Makefile.am failed"
+	sed -i '/^AC_PROG_RANLIB$/d' configure.in || die "sed configure.in failed"
 }
 
 src_compile() {
-	automake || die "automake failed"
+	einfo "Running autoreconf"
+	WANT_AUTOMAKE=1.7 autoreconf -f -i || die "autoreconf failed"
+
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install () {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog README
 }