Added vanilla USE flag. This keeps you from applying stdout patch, which changes default a2ps behaviour. See bug #47764 and #47691.

5 files changed, 12 insertions, 56 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index a1a9f6ff371d..5a289b821427 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.31 2004/07/23 12:12:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.32 2004/08/04 19:16:33 usata Exp $
+
+  05 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> -a2ps-4.13b-r4.ebuild,
+  a2ps-4.13b-r5.ebuild, a2ps-4.13c.ebuild:
+  Added vanilla USE flag. This keeps you from applying stdout patch, which
+  changes default a2ps behaviour. See bug #47764 and #47691.
 
   23 Jul 2004; Aron Griffis <agriffis@gentoo.org> a2ps-4.13c.ebuild:
   Run gnuconfig_update regardless of arch
diff --git a/app-text/a2ps/a2ps-4.13b-r4.ebuild b/app-text/a2ps/a2ps-4.13b-r4.ebuild
deleted file mode 100644
index 75468a3d30da..000000000000
--- a/app-text/a2ps/a2ps-4.13b-r4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r4.ebuild,v 1.16 2004/06/24 22:26:44 agriffis Exp $
-
-inherit gnuconfig
-
-S=${WORKDIR}/${P/b/}
-DESCRIPTION="Any to PostScript filter"
-SRC_URI="ftp://ftp.enst.fr/pub/unix/a2ps/${P}.tar.gz"
-HOMEPAGE="http://www-inf.enst.fr/~demaille/a2ps/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE="nls tetex"
-
-DEPEND=">=dev-util/gperf-2.7.2
-	virtual/ghostscript
-	>=app-text/psutils-1.17
-	tetex? ( virtual/tetex )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	if use alpha; then
-		gnuconfig_update || die "gnuconfig_update failed"
-	fi
-}
-
-src_compile() {
-	econf --sysconfdir=/etc/a2ps \
-		--includedir=/usr/include \
-		`use_enable nls` || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/share/emacs/site-lisp
-
-	einstall \
-		sysconfdir=${D}/etc/a2ps \
-		includedir=${D}/usr/include \
-		lispdir=${D}/usr/share/emacs/site-lisp \
-		|| die "einstall failed"
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README THANKS TODO
-}
diff --git a/app-text/a2ps/a2ps-4.13b-r5.ebuild b/app-text/a2ps/a2ps-4.13b-r5.ebuild
index 7befe53d30df..03b9458fcd29 100644
--- a/app-text/a2ps/a2ps-4.13b-r5.ebuild
+++ b/app-text/a2ps/a2ps-4.13b-r5.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/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.17 2004/06/24 22:26:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.18 2004/08/04 19:16:33 usata Exp $
 
 inherit gnuconfig eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.enst.fr/pub/unix/a2ps/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ia64 x86 ppc sparc alpha hppa"
-IUSE="nls tetex cjk"
+IUSE="nls tetex cjk vanilla"
 
 RDEPEND="virtual/ghostscript
 	>=app-text/psutils-1.17
@@ -33,7 +33,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/a2ps-4.13-autoconf-gentoo.diff
-	epatch ${FILESDIR}/a2ps-4.13-stdout.diff
+	use vanilla || epatch ${FILESDIR}/a2ps-4.13-stdout.diff
 	use cjk && epatch ${DISTDIR}/a2ps-4.13-ja_nls.patch
 
 	#stop running autoconf (bug #24264)
diff --git a/app-text/a2ps/a2ps-4.13c.ebuild b/app-text/a2ps/a2ps-4.13c.ebuild
index 714cebbcc917..d86ddde1f84d 100644
--- a/app-text/a2ps/a2ps-4.13c.ebuild
+++ b/app-text/a2ps/a2ps-4.13c.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/app-text/a2ps/a2ps-4.13c.ebuild,v 1.17 2004/07/23 12:12:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c.ebuild,v 1.18 2004/08/04 19:16:33 usata Exp $
 
 inherit gnuconfig eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ~ia64 ppc64"
-IUSE="nls tetex cjk"
+IUSE="nls tetex cjk vanilla"
 
 DEPEND=">=sys-devel/automake-1.6
 	>=sys-devel/autoconf-2.57
@@ -31,7 +31,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${P}-locale-gentoo.diff
-	epatch ${FILESDIR}/a2ps-4.13-stdout.diff
+	use vanilla || epatch ${FILESDIR}/a2ps-4.13-stdout.diff
 	epatch ${FILESDIR}/${PV}-gcc34.patch
 	use cjk && epatch ${DISTDIR}/${P}-ja_nls.patch.gz
 	gnuconfig_update || die "gnuconfig_update failed"
diff --git a/app-text/a2ps/files/digest-a2ps-4.13b-r4 b/app-text/a2ps/files/digest-a2ps-4.13b-r4
deleted file mode 100644
index 20ee66113d3d..000000000000
--- a/app-text/a2ps/files/digest-a2ps-4.13b-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c8e0c31b08c14f7a7198ce967eb3281 a2ps-4.13b.tar.gz 1944289