amd64 stable wrt #322867

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 8 insertions, 222 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 245679aa35fc..89501089903c 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/a2ps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.90 2010/06/20 17:47:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.91 2010/06/20 18:01:38 ssuominen Exp $
+
+  20 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> a2ps-4.14-r1.ebuild:
+  amd64 stable wrt #322867
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> a2ps-4.14-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #322867
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 954871716ab9..24f5cbe28cba 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -19,9 +19,7 @@ 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-r5.ebuild 3059 RMD160 6e962b520ae39c2322033bf0a884464bb1f8c805 SHA1 b9faa501cecf5d87569ae17790e04ffb8d45a50f SHA256 14351c0da715f293d1ac2e94c65df6cc51d633b43eac839fe3dd300a77233b27
 EBUILD a2ps-4.13c-r6.ebuild 3607 RMD160 73a39cf0ca753f9b8f1617d6019d275e5eeed6c4 SHA1 36f5fe7ef5ae605451e1819410aa5ead8f3213eb SHA256 a950bcd0453b54ece00dfbeea5c028fd36f82ac5c482edcfaf41590f9ef1faae
-EBUILD a2ps-4.14-r1.ebuild 2858 RMD160 12e0e8a32e546b6d8f12465e5b8c1eb33d8d6d26 SHA1 c5a889840805e1ca2edb91c756144bf3317b7fda SHA256 88e63b66a6e9d11a1c429a857316e70af64c2702c0e8e1b0e7e306f7bb7f8825
-EBUILD a2ps-4.14.ebuild 2998 RMD160 5ab695b28aaece3231ad80709a503fb9f7af43eb SHA1 794206fea8b87d194b3d707fc6b1557c5c2ada47 SHA256 6800a18efa171d5351dcb8f681da78048c32e3d2b3ee3a72346607edaa77ab17
-MISC ChangeLog 13403 RMD160 ca9300c161fb959b241d3e920777ed8c1f9ba676 SHA1 43519819e62faf9193ad32e0665277a5cf7e3079 SHA256 420cc8ae39a506bba016fc12138dc66c890db9ca2d48e04ebb67addcda9808c0
+EBUILD a2ps-4.14-r1.ebuild 2859 RMD160 44717290fff255994b94aad6387c61ca82143fa1 SHA1 08a1e68c2393433175b4297b8aaa308b4c34e742 SHA256 5cd3a4580dbe2e5ecd3e2538fe9ba16688052f22ce64d096c9e882c6730fc2a7
+MISC ChangeLog 13508 RMD160 8a3baca4f776d2f89686af328d3642a1135a4567 SHA1 0c94ebd38be125ebe2f84b106b49d9525973ec7a SHA256 cd2183a7061b3f46abb969046a3b3e16c10ee5717ce8c5325343b2769f6373ac
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
diff --git a/app-text/a2ps/a2ps-4.13c-r5.ebuild b/app-text/a2ps/a2ps-4.13c-r5.ebuild
deleted file mode 100644
index 2c25d809512e..000000000000
--- a/app-text/a2ps/a2ps-4.13c-r5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 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.23 2009/12/26 17:26:35 pva Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-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 s390 sh sparc x86 ~x86-fbsd"
-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 )
-	app-text/ghostscript-gpl
-	>=app-text/psutils-1.17
-	latex? ( virtual/latex-base )
-	nls? ( sys-devel/gettext )"
-RDEPEND="app-text/ghostscript-gpl
-	userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp ) )
-	userland_BSD? ( sys-freebsd/freebsd-ubin )
-	>=app-text/psutils-1.17
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-4.13-select-freebsd.patch
-	epatch ${FILESDIR}/${P}-locale-gentoo.diff
-	epatch ${FILESDIR}/${PN}-4.13c-stdarg.patch
-	use vanilla || epatch ${FILESDIR}/${PN}-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 fnmatch replacement, bug #134546
-	epatch ${FILESDIR}/${P}-fnmatch-replacement.patch
-
-	# fix sandbox violation, bug #79012
-	sed -i -e 's:$acroread -helpall:acroread4 -helpall:' configure configure.in
-
-	# fix emacs printing, bug #114627
-	epatch ${FILESDIR}/a2ps-4.13c-emacs.patch
-
-	# fix psset with sed-4.1, bug #126403
-	epatch ${FILESDIR}/a2ps-4.13c-psset.patch
-
-	# fix >=autoconf-2.60, bug 138161
-	epatch ${FILESDIR}/a2ps-4.13-fixcachecheck.patch
-
-	# fix chmod error, #167670
-	epatch ${FILESDIR}/a2ps-4.13-manpage-chmod.patch
-
-	AT_M4DIR="m4" eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-
-	#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
-
-	# bug #122026
-	sed -i "s:^countdictstack: \0:" ${D}/usr/bin/psset || die "sed failed"
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
diff --git a/app-text/a2ps/a2ps-4.14-r1.ebuild b/app-text/a2ps/a2ps-4.14-r1.ebuild
index 52a9c05be054..74101f157b9c 100644
--- a/app-text/a2ps/a2ps-4.14-r1.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r1.ebuild,v 1.4 2010/06/20 17:47:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r1.ebuild,v 1.5 2010/06/20 18:01:38 ssuominen Exp $
 
 inherit eutils autotools elisp-common
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="emacs nls latex vanilla userland_BSD userland_GNU linguas_ja"
 
 RESTRICT="test"
diff --git a/app-text/a2ps/a2ps-4.14.ebuild b/app-text/a2ps/a2ps-4.14.ebuild
deleted file mode 100644
index 79e426528d55..000000000000
--- a/app-text/a2ps/a2ps-4.14.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14.ebuild,v 1.9 2009/12/26 17:26:35 pva Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools elisp-common
-
-S=${WORKDIR}/${PN}-${PV:0:4}
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk emacs nls latex vanilla userland_BSD userland_GNU"
-
-DEPEND=">=dev-util/gperf-2.7.2
-	|| ( >=dev-util/yacc-1.9.1 sys-devel/bison )
-	app-text/ghostscript-gpl
-	>=app-text/psutils-1.17
-	emacs? ( virtual/emacs )
-	latex? ( virtual/latex-base )
-	nls? ( sys-devel/gettext )"
-RDEPEND="app-text/ghostscript-gpl
-	app-text/wdiff
-	userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp ) )
-	userland_BSD? ( sys-freebsd/freebsd-ubin )
-	>=app-text/psutils-1.17
-	emacs? ( virtual/emacs )
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-4.13c-locale-gentoo.diff"
-	# this will break
-	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
-	use vanilla || epatch "${FILESDIR}/${PN}-4.13-stdout.diff"
-	use cjk && epatch "${DISTDIR}/${P}-ja_nls.patch.gz"
-
-	# fix fnmatch replacement, bug #134546
-	epatch "${FILESDIR}/${PN}-4.13c-fnmatch-replacement.patch"
-
-	# fix sandbox violation, bug #79012
-	sed -i -e 's:$acroread -helpall:acroread4 -helpall:' configure configure.in
-
-	# fix emacs printing, bug #114627
-	epatch "${FILESDIR}/a2ps-4.13c-emacs.patch"
-
-	# fix chmod error, #167670
-	epatch "${FILESDIR}/a2ps-4.13-manpage-chmod.patch"
-
-	# add configure check for mempcpy, bug 216588
-	epatch "${FILESDIR}/${P}-check-mempcpy.patch"
-
-	# fix compilation error due to invalid stpcpy() prototype, bug 216588
-	epatch "${FILESDIR}/${P}-fix-stpcpy-proto.patch"
-
-	AT_M4DIR="m4" eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	#export YACC=yacc
-	export COM_netscape=no
-	use latex || COM_latex=no
-	econf --sysconfdir=/etc/a2ps \
-		--includedir=/usr/include \
-		$(useq emacs || echo EMACS=no) \
-		$(use_enable nls) || die "econf failed"
-
-	export LANG=C
-
-	# sometimes emake doesn't work
-	make || die "make failed"
-}
-
-src_install() {
-	einstall \
-		sysconfdir="${D}"/etc/a2ps \
-		includedir="${D}"/usr/include \
-		lispdir="${D}${SITELISP}/${PN}" \
-		|| die "einstall failed"
-
-	dosed /etc/a2ps/a2ps.cfg
-
-	# bug #122026
-	sed -i "s:^countdictstack: \0:" "${D}"/usr/bin/psset || die "sed failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}