really exchange it and clean up

Package-Manager: portage-2.1.4.4

5 files changed, 16 insertions, 89 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/Manifest b/app-text/a2ps/Manifest
index 484501a5b592..d3e35459861f 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -20,16 +20,15 @@ DIST a2ps-4.13c-ja_nls.patch.gz 38189 RMD160 932f430064f77d65768d2d1701ea650ae11
 DIST a2ps-4.13c.tar.gz 2395885 RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 SHA1 f32f8476578a97049a5a75216ad6eda9f902dbc2 SHA256 dfdd509ef79040fb300b2709a8fc54d9562f3ce141184958e3c2303cb3cf4890
 DIST a2ps-4.14-ja_nls.patch.gz 27576 RMD160 0e67be153e5bd87cbba2c615bc4ea76e72a800cb SHA1 fc939288580a1fcc1c3596ec4e77b049eab5d357 SHA256 90b2a4caf680f04ac8c325a4bc7434edf038ef7059003179b7fa65a5bafdecdc
 DIST a2ps-4.14.tar.gz 2552507 RMD160 a5105d6256a809483e099519325979aaaff7219e SHA1 365abbbe4b7128bf70dad16d06e23c5701874852 SHA256 f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4
-EBUILD a2ps-4.13c-r2.ebuild 1987 RMD160 548712574431f0023b032fd4ff199a7a83fe7760 SHA1 a0233c322332a7918d4ace0d7dc473839176b5fb SHA256 e69b549d71da7a630607d73ad47c7b669223433b956a419e38b5f3233404252f
-EBUILD a2ps-4.13c-r5.ebuild 3046 RMD160 a509b2619256110c6ab18bc200992605162d4489 SHA1 c6194ed36671a173efb7a6a3509e4043c3a8a2e1 SHA256 dcdff0f3a167e975ea3a67dd5cfc592b74c3f57c6e70d79a74625e52456cdace
-EBUILD a2ps-4.13c-r6.ebuild 3597 RMD160 0a53bc59d48db468fdcfeb99c7d66856919e9dab SHA1 f0b1f50013403f73b32e09db9ea670e4ceea733b SHA256 31804b15c6af964f70205eca93023855c0c8c1e8676ec3fdb26d8631fe5ed20a
+EBUILD a2ps-4.13c-r5.ebuild 3051 RMD160 0a619e7a46374091f2f723f3ad3fb9fdc6e0925a SHA1 a0b5212e5e0bc048a81baa5420fb2846499df413 SHA256 f4cfa204b7c9ad7711d92dd66edc0544524afaf7618dc054a4cb60d1cf6fa293
+EBUILD a2ps-4.13c-r6.ebuild 3602 RMD160 cc15bf6757ee05e2278f065582fcf6a355363aea SHA1 7fb4e32d938c616e1c671c4533ebe99d27c242c9 SHA256 95d4d9490c6036409856a34c3a9859d1929d9cd052b6494a24a622448435c9e0
 EBUILD a2ps-4.14.ebuild 2973 RMD160 cef49d17df08705169acec04ca5337661d00e4f3 SHA1 71a8d395fe1fec7a20f6e99fe781fdfacd6aeb12 SHA256 14c526c6c25f155faa59afb47a7f944838c682fa4dceb8ff907add44a24fcac3
-MISC ChangeLog 12387 RMD160 86c76cd8af929385af8103c939beb729fa2ba7d1 SHA1 093518202334bd46a0c64834e7059d684f7bcb2f SHA256 c070c0254f9b9e4b0b6c68b617522fd0f34e6dd530bbb42116e8c6eee93ff814
+MISC ChangeLog 12546 RMD160 05d7581e2e99801244cb58c8a84a9c2df7a7ab39 SHA1 480c804d3cecc358d2a817b3e15371ed668b8ecf SHA256 72a6a33bf39b536767496e84a7f8e12d843bb54ff6677b62e99ee4a110f5cb4a
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki9ztAACgkQNQqtfCuFnePIiQCcCz+88g0u0cDNRA8cKRLCMECV
-ZPMAnAzdbXW5rdLkg5Vg3IligW3IFYNw
-=GQNu
+iEYEARECAAYFAki9z/wACgkQNQqtfCuFnePAGwCdH++liosaQqfzPgXz//iqYe0o
+t4cAn0akgPZsqJ7Yy+hund5nB//+67iL
+=y7bQ
 -----END PGP SIGNATURE-----
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