summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-08-07 00:01:49 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-08-07 00:01:49 +0000
commitbde54b611d63ac72f9d90c608140b4c4c71b2fb5 (patch)
tree8e6b734ce2c51ecd33cb0183d6c14cf35d04d006 /app-text/a2ps
parentVersion bump (diff)
downloadgentoo-2-bde54b611d63ac72f9d90c608140b4c4c71b2fb5.tar.gz
gentoo-2-bde54b611d63ac72f9d90c608140b4c4c71b2fb5.tar.bz2
gentoo-2-bde54b611d63ac72f9d90c608140b4c4c71b2fb5.zip
Drop old
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'app-text/a2ps')
-rw-r--r--app-text/a2ps/ChangeLog9
-rw-r--r--app-text/a2ps/a2ps-4.13c-r6.ebuild123
-rw-r--r--app-text/a2ps/files/4.13c-gcc34.patch12
-rw-r--r--app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch16
-rw-r--r--app-text/a2ps/files/a2ps-4.13-select-freebsd.patch57
-rw-r--r--app-text/a2ps/files/a2ps-4.13c-fixps.patch19
-rw-r--r--app-text/a2ps/files/a2ps-4.13c-psmandup.diff19
-rw-r--r--app-text/a2ps/files/a2ps-4.13c-stdarg.patch74
8 files changed, 8 insertions, 321 deletions
diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 1429a88cde1b..868fabfdde97 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-text/a2ps
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.106 2012/06/23 05:54:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.107 2012/08/07 00:01:47 dilfridge Exp $
+
+ 07 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -files/4.13c-gcc34.patch, -files/a2ps-4.13-fixcachecheck.patch,
+ -files/a2ps-4.13-select-freebsd.patch, -a2ps-4.13c-r6.ebuild,
+ -files/a2ps-4.13c-fixps.patch, -files/a2ps-4.13c-psmandup.diff,
+ -files/a2ps-4.13c-stdarg.patch:
+ Drop old
*a2ps-4.14-r3 (23 Jun 2012)
diff --git a/app-text/a2ps/a2ps-4.13c-r6.ebuild b/app-text/a2ps/a2ps-4.13c-r6.ebuild
deleted file mode 100644
index 41803f275906..000000000000
--- a/app-text/a2ps/a2ps-4.13c-r6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 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.18 2012/06/02 07:21:57 zmedico Exp $
-
-inherit eutils autotools elisp-common multilib
-
-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? ( mirror://gentoo/${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="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
- 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.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"
-
- # add configure check for mempcpy, bug 216588
- epatch "${FILESDIR}/a2ps-4.14-check-mempcpy.patch"
-
- # fix compilation error due to invalid stpcpy() prototype, bug 216588
- epatch "${FILESDIR}/a2ps-4.14-fix-stpcpy-proto.patch"
-
- AT_M4DIR="m4" eautoreconf
-}
-
-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 emacs || echo EMACS=no) \
- $(use_enable nls)
-
- 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
-}
diff --git a/app-text/a2ps/files/4.13c-gcc34.patch b/app-text/a2ps/files/4.13c-gcc34.patch
deleted file mode 100644
index 926e28f62005..000000000000
--- a/app-text/a2ps/files/4.13c-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a2ps-4.13/lib/path-concat.c 2002-03-04 13:46:25.000000000 -0500
-+++ a2ps-4.13/lib/path-concat_.c 2004-04-13 01:47:03.596895984 -0400
-@@ -31,7 +31,8 @@
- #endif
- #include <sys/types.h>
-
--char *malloc ();
-+/* Commented out by Tamran to work with gcc 3.4 */
-+/* char *malloc (); */
-
- #ifndef DIRECTORY_SEPARATOR
- # define DIRECTORY_SEPARATOR '/'
diff --git a/app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch b/app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch
deleted file mode 100644
index 0ecfec53f4ac..000000000000
--- a/app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: a2ps-4.13/configure.in
-===================================================================
---- a2ps-4.13.orig/configure.in
-+++ a2ps-4.13/configure.in
-@@ -158,8 +158,9 @@ if test $ac_cv_func_fnmatch_works = no;
- fi
-
- # Check for C99 va_copy
--AC_CACHE_CHECK([
-- AC_TRY_LINK([#include <stdarg.h>],
-+AC_CACHE_CHECK([if compiler supports C99 va_copy],
-+ [ac_cv_va_copy],
-+ [AC_TRY_LINK([#include <stdarg.h>],
- [
- va_list va1, va2;
-
diff --git a/app-text/a2ps/files/a2ps-4.13-select-freebsd.patch b/app-text/a2ps/files/a2ps-4.13-select-freebsd.patch
deleted file mode 100644
index a2c38898fdc6..000000000000
--- a/app-text/a2ps/files/a2ps-4.13-select-freebsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/select.c.orig Thu Dec 16 02:04:56 1999
-+++ src/select.c Sat Aug 21 12:05:31 2004
-@@ -131,6 +131,36 @@
- return 1;
- }
-
-+/* escapes the name of a file so that the shell groks it in 'single' q.marks.
-+ The resulting pointer has to be free()ed when not longer used. */
-+char *
-+shell_escape(const char *fn)
-+{
-+ size_t len = 0;
-+ const char *inp;
-+ char *retval, *outp;
-+
-+ for(inp = fn; *inp; ++inp)
-+ switch(*inp)
-+ {
-+ case '\'': len += 4; break;
-+ default: len += 1; break;
-+ }
-+
-+ outp = retval = malloc(len + 1);
-+ if(!outp)
-+ return NULL; /* perhaps one should do better error handling here */
-+ for(inp = fn; *inp; ++inp)
-+ switch(*inp)
-+ {
-+ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break;
-+ default: *outp++ = *inp; break;
-+ }
-+ *outp = 0;
-+
-+ return retval;
-+}
-+
- /* What says file about the type of a file (result is malloc'd). NULL
- if could not be run. */
-
-@@ -144,11 +174,15 @@
- if (IS_EMPTY (job->file_command))
- return NULL;
-
-+ filename = shell_escape(filename);
-+ if(filename == NULL)
-+ return NULL;
- /* Call file(1) with the correct option */
-- command = ALLOCA (char, (2
-+ command = ALLOCA (char, (4
- + strlen (job->file_command)
- + ustrlen (filename)));
-- sprintf (command, "%s %s", job->file_command, (const char *) filename);
-+ sprintf (command, "%s '%s'", job->file_command, (const char *) filename);
-+ free(filename);
- message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
- file_out = popen (command, "r");
-
diff --git a/app-text/a2ps/files/a2ps-4.13c-fixps.patch b/app-text/a2ps/files/a2ps-4.13c-fixps.patch
deleted file mode 100644
index 13b196f03e7e..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-fixps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- contrib/fixps.in.orig 2004-12-20 00:11:40.000000000 +0100
-+++ contrib/fixps.in 2004-12-20 00:14:12.000000000 +0100
-@@ -38,7 +38,7 @@
- run_gs=0
- # What action to perform: fixps, cat, check, and gs
- task=fixps
--tmpdir=/tmp/$program.$$
-+tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
- verbose=echo
-
- # The version/usage strings
-@@ -191,7 +191,6 @@
- trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- fi
-
--mkdir $tmpdir
- fixps_sed=$tmpdir/fixps.sed
-
- # If printing from stdin, save into a tmp file
diff --git a/app-text/a2ps/files/a2ps-4.13c-psmandup.diff b/app-text/a2ps/files/a2ps-4.13c-psmandup.diff
deleted file mode 100644
index 67f2fab826b3..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-psmandup.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- contrib/psmandup.in.orig 2004-12-20 00:16:07.000000000 +0100
-+++ contrib/psmandup.in 2004-12-20 00:16:39.000000000 +0100
-@@ -36,7 +36,7 @@
- message=
- psselect=${PSSELECT:-psselect}
- psset=${PSSET:-psset}
--tmpdir=/tmp/$program.$$
-+tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
-
- # These two must be kept in synch. They are opposed.
- verbose=echo
-@@ -185,7 +185,6 @@
- trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- fi
-
--mkdir $tmpdir
-
- # If printing from stdin, save into a tmp file
- if test $file = '-'; then
diff --git a/app-text/a2ps/files/a2ps-4.13c-stdarg.patch b/app-text/a2ps/files/a2ps-4.13c-stdarg.patch
deleted file mode 100644
index 4ff12125836a..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-stdarg.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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