really exchange it and clean up

(Portage version: 2.1.4.4)

4 files changed, 10 insertions, 82 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index de9cf3bcc6d3..782b679b303c 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.84 2008/09/02 23:39:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.85 2008/09/02 23:44:22 opfer Exp $
+
+  02 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
+  -a2ps-4.13c-r2.ebuild, a2ps-4.13c-r5.ebuild, a2ps-4.13c-r6.ebuild:
+  really exchange it and clean up
 
   02 Sep 2008; Christian Faulhammer <opfer@gentoo.org> a2ps-4.13c-r5.ebuild,
   a2ps-4.13c-r6.ebuild:
diff --git a/app-text/a2ps/a2ps-4.13c-r2.ebuild b/app-text/a2ps/a2ps-4.13c-r2.ebuild
deleted file mode 100644
index c772b9371e41..000000000000
--- a/app-text/a2ps/a2ps-4.13c-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 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.9 2008/04/19 02:47:49 ricmm Exp $
-
-inherit 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 sys-devel/bison )
-	virtual/ghostscript
-	>=app-text/psutils-1.17
-	tetex? ( virtual/tetex )
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/ghostscript
-	>=app-text/psutils-1.17
-	tetex? ( virtual/tetex )
-	nls? ( virtual/libintl )"
-
-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
-
-	# improve tempfile handling
-	epatch ${FILESDIR}/${P}-fixps.patch
-	epatch ${FILESDIR}/${P}-psmandup.diff
-
-	# fix sandbox violation, bug #79012
-	sed -i -e 's:$acroread -helpall:acroread4 -helpall:' configure configure.in
-
-	libtoolize --copy --force || die "libtoolize failed"
-}
-
-src_compile() {
-
-	#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"
-}
-
-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-r5.ebuild b/app-text/a2ps/a2ps-4.13c-r5.ebuild
index d1bf6c0ba86d..ebc6c0a21188 100644
--- a/app-text/a2ps/a2ps-4.13c-r5.ebuild
+++ b/app-text/a2ps/a2ps-4.13c-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r5.ebuild,v 1.21 2008/09/02 23:39:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r5.ebuild,v 1.22 2008/09/02 23:44:22 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls tetex cjk vanilla userland_BSD userland_GNU"
+IUSE="nls latex cjk vanilla userland_BSD userland_GNU"
 
 DEPEND=">=dev-util/gperf-2.7.2
 	|| ( >=dev-util/yacc-1.9.1 sys-devel/bison )
@@ -28,7 +28,7 @@ RDEPEND="virtual/ghostscript
 	userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp ) )
 	userland_BSD? ( sys-freebsd/freebsd-ubin )
 	>=app-text/psutils-1.17
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	nls? ( virtual/libintl )"
 
 src_unpack() {
diff --git a/app-text/a2ps/a2ps-4.13c-r6.ebuild b/app-text/a2ps/a2ps-4.13c-r6.ebuild
index 19abc036153a..af2ea84f6816 100644
--- a/app-text/a2ps/a2ps-4.13c-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.13c-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r6.ebuild,v 1.11 2008/09/02 23:39:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r6.ebuild,v 1.12 2008/09/02 23:44:22 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -30,7 +30,7 @@ RDEPEND="virtual/ghostscript
 	userland_BSD? ( sys-freebsd/freebsd-ubin )
 	>=app-text/psutils-1.17
 	emacs? ( virtual/emacs )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	nls? ( virtual/libintl )"
 
 SITEFILE=50${PN}-gentoo.el