Added a new patch to fix build on AMD64 thanks to Holger Thon <ht_gentoo04@arcor.de>. Clean up the ebuild

Package-Manager: portage-2.0.51.22-r2

5 files changed, 171 insertions, 8 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index ee0d6abd50dd..2732a6109f24 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2005/06/07 18:18:31 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.42 2005/08/30 18:51:45 metalgod Exp $
+
+*a2ps-4.13c-r3 (30 Aug 2005)
+
+  30 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/a2ps-4.13c-stdarg.patch, +a2ps-4.13c-r3.ebuild:
+  Added a new patch to fix build on AMD64 thanks to Holger Thon
+  <ht_gentoo04@arcor.de>. Clean up the ebuild
 
   07 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> :
   Fixed digest. Thanks to swegeners autorepoman.
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 385d694acb30..ef3723be2df8 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 c94b3477dffbaeb507c5e2df9fbf0d4f ChangeLog 6213
 MD5 b6f6a3f75332862ddaedfdc1afae115b a2ps-4.13c-r2.ebuild 2022
-MD5 4700e28f4bad925ffc38ec2156aa6a84 ChangeLog 5966
 MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
+MD5 0042c47a1b902f61c9ae9f79948dc04c a2ps-4.13c-r3.ebuild 2081
+MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
+MD5 b62538dbd828d995bdc3ce36188b0768 files/a2ps-4.13-select-freebsd.patch 1582
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
 MD5 df6bc895cc6fb0fd47f22fd1c36d1ed3 files/a2ps-4.13c-fixps.patch 549
 MD5 43277fd40996b817e369f9851aad66f5 files/a2ps-4.13c-locale-gentoo.diff 981
-MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r2 133
-MD5 b62538dbd828d995bdc3ce36188b0768 files/a2ps-4.13-select-freebsd.patch 1582
 MD5 d68d0bfab547ef1ce70576c7a5570f13 files/a2ps-4.13c-psmandup.diff 569
-MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
+MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r2 133
+MD5 2e24d355a977969b83fce03510ebd7b8 files/a2ps-4.13c-stdarg.patch 1505
+MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r3 133
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCphyrevY57Fted3ERAiJPAJ9+aLIgaO3/O6Tg2MYRK+f9LJN6fQCcC5vq
-VTCcNPyTbNrzywNh29qcfTc=
-=ReFa
+iD8DBQFDFLiCwUpWvClEHQoRAmCjAKCKSY4YiSMLosV+7nmdSLHOhMQ79QCePLtL
+SYV5VzSPsj/Imlza0VyKE/U=
+=QOUa
 -----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.13c-r3.ebuild b/app-text/a2ps/a2ps-4.13c-r3.ebuild
new file mode 100644
index 000000000000..b537cee05fa0
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.13c-r3.ebuild
@@ -0,0 +1,77 @@
+# 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-r3.ebuild,v 1.1 2005/08/30 18:51:45 metalgod 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 sys-devel/bison )
+	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}/${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 sandbox violation, bug #79012
+	sed -i -e 's:$acroread -helpall:acroread4 -helpall:' configure configure.in
+
+	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"
+
+	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/files/a2ps-4.13c-stdarg.patch b/app-text/a2ps/files/a2ps-4.13c-stdarg.patch
new file mode 100644
index 000000000000..4ff12125836a
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-stdarg.patch
@@ -0,0 +1,74 @@
+--- a2ps-4.13-orig/configure.in	2005-08-14 14:13:42.000000000 +0200
++++ a2ps-4.13/configure.in	2005-08-14 14:18:20.000000000 +0200
+@@ -157,6 +157,22 @@
+ 	  [Define to rpl_fnmatch if the replacement function should be used.])
+ fi
+ 
++# Check for C99 va_copy
++AC_CACHE_CHECK([
++  AC_TRY_LINK([#include <stdarg.h>],
++   [
++	va_list va1, va2;
++
++	va_copy(va2, va1);
++	va_end(va2);
++   ],
++   [ac_cv_va_copy="yes"],[ac_cv_va_copy="no"]
++  )
++])
++if test "x$ac_cv_va_copy"="xyes"; then
++	AC_DEFINE(HAVE_VA_COPY,1,[Define to 1 if C99 va_copy function should be used])
++fi
++
+ # Needed checks for tinyterm.[ch]
+ ad_TINYTERM_CHECKS
+ 
+--- a2ps-4.13-orig/lib/printlen.c	2002-03-04 19:46:25.000000000 +0100
++++ a2ps-4.13/lib/printlen.c	2005-08-14 14:29:08.000000000 +0200
+@@ -27,15 +27,24 @@
+ 
+ unsigned long strtoul ();
+ 
++#if !defined(HAVE_VA_COPY)
+ static int
+ int_printflen (const char *format, va_list *args)
++#else
++static int
++int_printflen (const char *format, va_list args)
++#endif
+ {
+   const char *cp;
+   int total_width = 0;
+   int width = 0;
+   va_list ap;
+ 
++#ifndef HAVE_VA_COPY
+   memcpy (&ap, args, sizeof (va_list));
++#else
++  va_copy(ap, args);
++#endif
+ 
+   for (cp = format ; *cp ; cp++)
+     {
+@@ -93,13 +102,21 @@
+ 	    }
+ 	}
+     }
++
++#ifdef HAVE_VA_COPY
++  va_end(ap);
++#endif
+   return total_width;
+ }
+ 
+ int
+ vprintflen (const char *format,  va_list args)
+ {
++#if !defined(HAVE_VA_COPY)
+   return int_printflen (format, &args);
++#else
++  return int_printflen (format, args);
++#endif
+ }
+ 
+ int
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r3 b/app-text/a2ps/files/digest-a2ps-4.13c-r3
new file mode 100644
index 000000000000..4abfd89450cb
--- /dev/null
+++ b/app-text/a2ps/files/digest-a2ps-4.13c-r3
@@ -0,0 +1,2 @@
+MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
+MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189