New revision including fixes from bug 126403, bug 114627 and RESTRICT=test for bug 118655

Package-Manager: portage-2.1_rc3-r4

6 files changed, 147 insertions, 15 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 18edf3d680a5..4c277a601515 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.46 2006/05/30 20:50:04 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.47 2006/06/01 23:31:14 genstef Exp $
+
+*a2ps-4.13c-r5 (01 Jun 2006)
+
+  01 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/a2ps-4.13c-emacs.patch, +files/a2ps-4.13c-psset.patch,
+  +a2ps-4.13c-r5.ebuild:
+  New revision including fixes from bug 126403, bug 114627 and RESTRICT=test
+  for bug 118655
 
   30 May 2006; <yvasilev@gentoo.org>
   +files/a2ps-4.13c-fnmatch-replacement.patch, a2ps-4.13c-r4.ebuild:
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index be9d3fcf539f..902a5f4b4b85 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
 MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf files/4.13c-gcc34.patch 348
@@ -13,6 +10,10 @@ AUX a2ps-4.13-stdout.diff 462 RMD160 88b8723f90f4993495f084a3ce475f575fca99c5 SH
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
 RMD160 88b8723f90f4993495f084a3ce475f575fca99c5 files/a2ps-4.13-stdout.diff 462
 SHA256 bde80a714f5de1221ec828cf0f33859561510190e97b08f4ba62ab41ad26fc74 files/a2ps-4.13-stdout.diff 462
+AUX a2ps-4.13c-emacs.patch 442 RMD160 fbc853f8e0adb1637f0556e5ff4cb94b16f9a899 SHA1 94e35a6ad9268161bec22a56d4cfb696d635994a SHA256 943739a788db47f10942477754f42c8c9b22cdaad4463bea4103c31a330de76a
+MD5 2e493d0bc00d71eb3e8a9b6febc52b69 files/a2ps-4.13c-emacs.patch 442
+RMD160 fbc853f8e0adb1637f0556e5ff4cb94b16f9a899 files/a2ps-4.13c-emacs.patch 442
+SHA256 943739a788db47f10942477754f42c8c9b22cdaad4463bea4103c31a330de76a files/a2ps-4.13c-emacs.patch 442
 AUX a2ps-4.13c-fixps.patch 549 RMD160 b97b413747ddcb415e3de2a75e1e723bc817b076 SHA1 dd66cf062839d68966a6b719714d78d8702c5462 SHA256 ac32464a1a9bb2f4f557a3567a94928e4d8cbdd20ebaee0e1811f076d7e7456e
 MD5 df6bc895cc6fb0fd47f22fd1c36d1ed3 files/a2ps-4.13c-fixps.patch 549
 RMD160 b97b413747ddcb415e3de2a75e1e723bc817b076 files/a2ps-4.13c-fixps.patch 549
@@ -29,6 +30,10 @@ AUX a2ps-4.13c-psmandup.diff 569 RMD160 8c9436d9b72a1a2e78f8325c53e1e36bc29e2fbe
 MD5 d68d0bfab547ef1ce70576c7a5570f13 files/a2ps-4.13c-psmandup.diff 569
 RMD160 8c9436d9b72a1a2e78f8325c53e1e36bc29e2fbe files/a2ps-4.13c-psmandup.diff 569
 SHA256 2e64be23e030ed0f08b243f0513800336d06739fc7e347a09c130958531b85cd files/a2ps-4.13c-psmandup.diff 569
+AUX a2ps-4.13c-psset.patch 469 RMD160 f7b62d2408bacf0e8715b81445269749f95bef6a SHA1 d3e2c1cdb7c46fc42203344776ed9f6a2e7cfff5 SHA256 0ddb899c48c897fc333e73702f9dc666be4cbd6215da6db860784fb503500b68
+MD5 b8ef4708f4a65e9b373f9f42df11b92d files/a2ps-4.13c-psset.patch 469
+RMD160 f7b62d2408bacf0e8715b81445269749f95bef6a files/a2ps-4.13c-psset.patch 469
+SHA256 0ddb899c48c897fc333e73702f9dc666be4cbd6215da6db860784fb503500b68 files/a2ps-4.13c-psset.patch 469
 AUX a2ps-4.13c-stdarg.patch 1505 RMD160 5e46f07ec9d37ab53262f9611397f19bf3bd0b6e SHA1 c215dae65c8e14fceaa31917e4a596800211c3e7 SHA256 9e7e630386b694b90b0bc6454bedc7c102d46b8bb6a6246eabd37e8b6d639c68
 MD5 2e24d355a977969b83fce03510ebd7b8 files/a2ps-4.13c-stdarg.patch 1505
 RMD160 5e46f07ec9d37ab53262f9611397f19bf3bd0b6e files/a2ps-4.13c-stdarg.patch 1505
@@ -47,10 +52,14 @@ EBUILD a2ps-4.13c-r4.ebuild 2298 RMD160 a8fd568623a8b46ea0599dea23e09da145805e9a
 MD5 acbfb7af08033b94a8c5577dfc0f7649 a2ps-4.13c-r4.ebuild 2298
 RMD160 a8fd568623a8b46ea0599dea23e09da145805e9a a2ps-4.13c-r4.ebuild 2298
 SHA256 074cd970c12781553f739d7e77a919dfc9e4c5e76ceabbff726ecca7b2b814b6 a2ps-4.13c-r4.ebuild 2298
-MISC ChangeLog 6972 RMD160 ba0259b5fc15d6cc4f583b68c414f39e86923f5a SHA1 25ea496686463844b2e283c402ac80e0a12fba64 SHA256 73aeaae21af1848836cf055de88951dd675fd46caaa9610f22eae9261b4c19c9
-MD5 f08eff4a0018be41880591b34dbb594b ChangeLog 6972
-RMD160 ba0259b5fc15d6cc4f583b68c414f39e86923f5a ChangeLog 6972
-SHA256 73aeaae21af1848836cf055de88951dd675fd46caaa9610f22eae9261b4c19c9 ChangeLog 6972
+EBUILD a2ps-4.13c-r5.ebuild 2537 RMD160 b81d74773a7dd4cd922404dc3a7dd8605365f12a SHA1 47e2fcecdd36d7c7c7a2b6cacf5b5c293c36526b SHA256 acb9b74e2f6ad85e024050b4de61285175a33003ec33ea531af996a6170986db
+MD5 d940850d2f5c3decbc297c14fd29574b a2ps-4.13c-r5.ebuild 2537
+RMD160 b81d74773a7dd4cd922404dc3a7dd8605365f12a a2ps-4.13c-r5.ebuild 2537
+SHA256 acb9b74e2f6ad85e024050b4de61285175a33003ec33ea531af996a6170986db a2ps-4.13c-r5.ebuild 2537
+MISC ChangeLog 7238 RMD160 4bc8a808ffa77d7e960172113ddde60ccf7d14ae SHA1 e82b773e5a8c68b86cbccc1e517b3a53b433518d SHA256 e496ce51bfef4c26f018e70d6833c3422aba0773481b2f0d92af7737503d6e8e
+MD5 79afbff2032ef733468ed577ce50e8bf ChangeLog 7238
+RMD160 4bc8a808ffa77d7e960172113ddde60ccf7d14ae ChangeLog 7238
+SHA256 e496ce51bfef4c26f018e70d6833c3422aba0773481b2f0d92af7737503d6e8e ChangeLog 7238
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
 RMD160 1823829273be97b95b286540a3439d152281baf1 metadata.xml 178
@@ -64,10 +73,6 @@ SHA256 6a13642030ff00965e9055a33ca0b4169dc93d99d73a357b553031b076a16fc0 files/di
 MD5 5cb08b483ff3e6161e5bb5a385bcc259 files/digest-a2ps-4.13c-r4 491
 RMD160 c634cd7453cd6fda7c36b840d67f7b65bdd63565 files/digest-a2ps-4.13c-r4 491
 SHA256 6a13642030ff00965e9055a33ca0b4169dc93d99d73a357b553031b076a16fc0 files/digest-a2ps-4.13c-r4 491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEfK/zyZl4piiTjjYRAqs/AKDKDZYB/eXUPrpxCwVwCFIEwC8ZFQCeKmsd
-ru5foe9sbb/+ypxusUSc7Uk=
-=a4Ek
------END PGP SIGNATURE-----
+MD5 5cb08b483ff3e6161e5bb5a385bcc259 files/digest-a2ps-4.13c-r5 491
+RMD160 c634cd7453cd6fda7c36b840d67f7b65bdd63565 files/digest-a2ps-4.13c-r5 491
+SHA256 6a13642030ff00965e9055a33ca0b4169dc93d99d73a357b553031b076a16fc0 files/digest-a2ps-4.13c-r5 491
diff --git a/app-text/a2ps/a2ps-4.13c-r5.ebuild b/app-text/a2ps/a2ps-4.13c-r5.ebuild
new file mode 100644
index 000000000000..519a14714485
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.13c-r5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2006 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.1 2006/06/01 23:31:14 genstef Exp $
+
+inherit gnuconfig 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 ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="nls tetex cjk vanilla"
+# bug 118655, restrict until a proper fix is found
+RESTRICT="test"
+
+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}/${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
+
+	gnuconfig_update || die "gnuconfig_update failed"
+	AT_M4DIR="m4" eautoreconf || die "eautoreconf 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
+
+	# 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/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
new file mode 100644
index 000000000000..f1cd5d9ebdfc
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
@@ -0,0 +1,10 @@
+--- a2ps-4.13/contrib/emacs/a2ps-print.el.orig	2005-12-05 08:03:48.000000000 +0100
++++ a2ps-4.13/contrib/emacs/a2ps-print.el	2005-12-06 16:38:14.000000000 +0100
+@@ -93,6 +93,7 @@
+ 			  (concat "--center-title=" name)
+ 			  (concat "--footer=" (concat name " Emacs buffer"))
+ 			  (concat "--pretty-print=" filetype)
++			  (concat "-d")
+ ;Uncommenting the following gives a print preview (only):
+ ;			  (concat "--output=/tmp/foo.ps")
+ 			  )
diff --git a/app-text/a2ps/files/a2ps-4.13c-psset.patch b/app-text/a2ps/files/a2ps-4.13c-psset.patch
new file mode 100644
index 000000000000..f8fd4497f281
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-psset.patch
@@ -0,0 +1,11 @@
+--- a2ps-4.13/contrib/psset.in.orig	2006-03-16 12:30:48.000000000 +0100
++++ a2ps-4.13/contrib/psset.in		2006-03-16 12:28:14.000000000 +0100
+@@ -241,7 +241,7 @@
+ # spaces with a `\' too...
+ pspagedevicelen=`echo "$pspagedevice" | wc -l`
+ pspagedevice=`echo "$pspagedevice" | \
+- sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^/\\\\\\/"`
++ sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^ /\\\\\\/"`
+
+ case $at in
+   0) # Insert last in the Setup, so that we win over other requests.
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r5 b/app-text/a2ps/files/digest-a2ps-4.13c-r5
new file mode 100644
index 000000000000..0cf5230e7350
--- /dev/null
+++ b/app-text/a2ps/files/digest-a2ps-4.13c-r5
@@ -0,0 +1,6 @@
+MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189
+RMD160 932f430064f77d65768d2d1701ea650ae1103bb0 a2ps-4.13c-ja_nls.patch.gz 38189
+SHA256 8bc15ae152205b184a609777ac29430780eadacba2fd90bfa1fe318e43bd781f a2ps-4.13c-ja_nls.patch.gz 38189
+MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
+RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 a2ps-4.13c.tar.gz 2395885
+SHA256 dfdd509ef79040fb300b2709a8fc54d9562f3ce141184958e3c2303cb3cf4890 a2ps-4.13c.tar.gz 2395885