summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-20 18:01:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-20 18:01:38 +0000
commit51d89aff34f084a9793f964b55cdeb20e241f8f5 (patch)
tree42e5ed3b13558d0b7a11b200da7e6779477163c7 /app-text/a2ps
parentalpha/arm/ia64/m68k/s390/sh/sparc stable wrt #322575 (diff)
downloadgentoo-2-51d89aff34f084a9793f964b55cdeb20e241f8f5.tar.gz
gentoo-2-51d89aff34f084a9793f964b55cdeb20e241f8f5.tar.bz2
gentoo-2-51d89aff34f084a9793f964b55cdeb20e241f8f5.zip
amd64 stable wrt #322867
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-text/a2ps')
-rw-r--r--app-text/a2ps/ChangeLog5
-rw-r--r--app-text/a2ps/a2ps-4.13c-r5.ebuild104
-rw-r--r--app-text/a2ps/a2ps-4.14-r1.ebuild4
-rw-r--r--app-text/a2ps/a2ps-4.14.ebuild111
4 files changed, 6 insertions, 218 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/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
-}