also builds with bison; fix compilation on non posix locale

(Portage version: 2.0.51-r15)

4 files changed, 10 insertions, 71 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index eaee7e0f187a..489f9873e226 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.37 2005/01/04 13:09:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.38 2005/02/21 18:20:20 lanius Exp $
+
+  21 Feb 2005; Heinrich Wendel <lanius@gentoo.org> -a2ps-4.13c-r1.ebuild,
+  a2ps-4.13c-r2.ebuild:
+  also builds with bison; fix compilation on non posix locale
 
   04 Jan 2005; Sven Wegener <swegener@gentoo.org> :
   Added missing digest entries.
diff --git a/app-text/a2ps/a2ps-4.13c-r1.ebuild b/app-text/a2ps/a2ps-4.13c-r1.ebuild
deleted file mode 100644
index 425c9bcb05a3..000000000000
--- a/app-text/a2ps/a2ps-4.13c-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r1.ebuild,v 1.4 2005/01/01 16:01:45 eradicator Exp $
-
-inherit gnuconfig eutils
-
-S=${WORKDIR}/${PN}-${PV:0:4}
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="http://www-inf.enst.fr/~demaille/a2ps/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	cjk? ( http://dev.gentoo.org/~usata/distfiles/${P}-ja_nls.patch.gz ) "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="nls tetex cjk vanilla"
-
-DEPEND=">=sys-devel/automake-1.6
-	>=sys-devel/autoconf-2.57
-	>=dev-util/gperf-2.7.2
-	>=dev-util/yacc-1.9.1
-	virtual/ghostscript
-	>=app-text/psutils-1.17
-	tetex? ( virtual/tetex )"
-RDEPEND="virtual/ghostscript
-	>=app-text/psutils-1.17
-	tetex? ( virtual/tetex )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/a2ps-4.13-select-freebsd.patch
-	epatch ${FILESDIR}/${P}-locale-gentoo.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"
-	libtoolize --copy --force || die "libtoolize failed"
-}
-
-src_compile() {
-
-	export YACC=yacc
-	econf --sysconfdir=/etc/a2ps \
-		--includedir=/usr/include \
-		`use_enable nls` || die "econf failed"
-
-	# sometimes emake doesn't work
-	make || die "make 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"
-
-	dosed /etc/a2ps/a2ps.cfg
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
diff --git a/app-text/a2ps/a2ps-4.13c-r2.ebuild b/app-text/a2ps/a2ps-4.13c-r2.ebuild
index 60c8c431a538..f22349d6e392 100644
--- a/app-text/a2ps/a2ps-4.13c-r2.ebuild
+++ b/app-text/a2ps/a2ps-4.13c-r2.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/a2ps/a2ps-4.13c-r2.ebuild,v 1.1 2005/01/03 16:46:37 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r2.ebuild,v 1.2 2005/02/21 18:20:20 lanius Exp $
 
 inherit gnuconfig eutils
 
@@ -18,7 +18,7 @@ IUSE="nls tetex cjk vanilla"
 DEPEND=">=sys-devel/automake-1.6
 	>=sys-devel/autoconf-2.57
 	>=dev-util/gperf-2.7.2
-	>=dev-util/yacc-1.9.1
+	|| ( >=dev-util/yacc-1.9.1 sys-dev/bison )
 	virtual/ghostscript
 	>=app-text/psutils-1.17
 	tetex? ( virtual/tetex )"
@@ -47,11 +47,13 @@ src_unpack() {
 
 src_compile() {
 
-	export YACC=yacc
+	#export YACC=yacc
 	econf --sysconfdir=/etc/a2ps \
 		--includedir=/usr/include \
 		`use_enable nls` || die "econf failed"
 
+	export LANG=C
+
 	# sometimes emake doesn't work
 	make || die "make failed"
 }
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r1 b/app-text/a2ps/files/digest-a2ps-4.13c-r1
deleted file mode 100644
index 4abfd89450cb..000000000000
--- a/app-text/a2ps/files/digest-a2ps-4.13c-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
-MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189