Build shared a2ps library with upstream version of 1:0:0. USE="static-libs" and remove useless liba2ps.la. Fix building with sys-devel/automake >= 1.12 wrt #420503. Fix 3 stray README files to /usr/share/doc/${PF}.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 150 insertions, 5 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 262a8eca0ed3..1429a88cde1b 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.105 2012/06/02 07:21:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.106 2012/06/23 05:54:39 ssuominen Exp $
+
+*a2ps-4.14-r3 (23 Jun 2012)
+
+  23 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +a2ps-4.14-r3.ebuild:
+  Build shared a2ps library with upstream version of 1:0:0. USE="static-libs"
+  and remove useless liba2ps.la. Fix building with sys-devel/automake >= 1.12
+  wrt #420503. Fix 3 stray README files to /usr/share/doc/${PF}.
 
   02 Jun 2012; Zac Medico <zmedico@gentoo.org> a2ps-4.13c-r6.ebuild:
   inherit multilib for get_libdir
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 6ba4c0df05e9..29efc520055f 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -27,12 +27,17 @@ DIST a2ps-4.14.tar.gz 2552507 RMD160 a5105d6256a809483e099519325979aaaff7219e SH
 EBUILD a2ps-4.13c-r6.ebuild 3522 RMD160 3ece592e7335f5093aaf5c53992da6ffd1f45a79 SHA1 203728bc93f8a0b2a9de187459ecf2bbe2c03bac SHA256 d3d5b1379d67a78aa002bee4eceb2cb791c006692e4ee2adfea4247cd2117a56
 EBUILD a2ps-4.14-r1.ebuild 2952 RMD160 a7845f14715ddc3981195a7105b3f0dd1ae76f55 SHA1 0e14fcc1d4c96d436b0a21fa1c4cf3eee6100f5e SHA256 8b1e22c9f8ff09966c620997bcd0cff5af8749c8bed5dc80c9e79f1a8a3e88ca
 EBUILD a2ps-4.14-r2.ebuild 3097 RMD160 659594b121e78761854088f8f50300c24c4cc2e1 SHA1 18f746214df573bff834a2c73b33b083ff1444c5 SHA256 5e62f8c985a4ec3d52868565019d10b0d39402f130247f5d1858f1aa1d28b782
-MISC ChangeLog 15195 RMD160 5352799b40828164be0efbe29d64c02c6245f775 SHA1 ff0cb4595f6f6bb3614d555a65c1efb87e470384 SHA256 45536032c79def28a25e0a3fdfb1fd318183afb8c006fd0a23c3304301d71979
+EBUILD a2ps-4.14-r3.ebuild 3454 RMD160 6ce171d17fd8a700f751a0dbe4c9b63abfb957aa SHA1 62a9703abec278ba4c410508d1dc4347669e60d5 SHA256 9c697e96b89b46e9752d09183ef6cdd72071d4ae63bac9bb28d0a73e4ac087c8
+MISC ChangeLog 15524 RMD160 b3b72af1518b559f9fcac188af0f9bda480e8e24 SHA1 4fe7fc258a6ee1a8cfd36809ad157f61e993eb9c SHA256 631940fa237965f12ceacf1f0e4a6800b94094092b7a8fefaca403f30f06c9ab
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/JvxsACgkQ/ejvha5XGaNgtwCgwmtafMgBN36UBBsEiXQzDsDB
-9hAAnjEc2I+AUS1R2F7o63CphS6HmeSM
-=BEkD
+iQEcBAEBAgAGBQJP5Vj9AAoJEEdUh39IaPFNWIcH/1/lC1NH5Jmw4Jyt+/GHaqBU
+VTJPXRoHzij0fl1ABxk5BjCjb9t5G5cDfdR+rJtkx6S3l5pziFrJxWLvwO2Gtgc+
+oZd+PLEKxSCAu5JgSHNKfRe+F71bEXw+V6Mu+XnK2HlECt/hpR1AwW1ZLSiLRlDO
+dmGZB4nHhgub3ZAYa7gZkoNAy08/MQtmxQoBMJvdBTlOs75VouM9ja0WsX3sLBTd
+HZdqxBWJd/ITZqeblQ4ZxgF7wSZgTAopLdnmyqUAC5z1Q+QdRw2NsZoWh6EskUIP
+YH6C1OviF2F5xakNLziRKe4fywLfj5sRdT54W2BPSWIW6KzFL44Nn0S1udxOmwo=
+=oM3m
 -----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14-r3.ebuild b/app-text/a2ps/a2ps-4.14-r3.ebuild
new file mode 100644
index 000000000000..f6fa6018b5b8
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r3.ebuild
@@ -0,0 +1,133 @@
+# 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.14-r3.ebuild,v 1.1 2012/06/23 05:54:39 ssuominen Exp $
+
+EAPI=4
+inherit autotools elisp-common eutils flag-o-matic
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	linguas_ja? ( 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"
+
+RESTRICT=test
+
+RDEPEND="app-text/ghostscript-gpl
+	app-text/libpaper
+	>=app-text/psutils-1.17
+	app-text/wdiff
+	emacs? ( virtual/emacs )
+	latex? ( virtual/latex-base )
+	nls? ( virtual/libintl )
+	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
+	userland_BSD? ( sys-freebsd/freebsd-ubin )"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-2.7.2
+	virtual/yacc
+	nls? ( sys-devel/gettext )"
+
+SITEFILE=50${PN}-gentoo.el
+
+S=${WORKDIR}/${PN}-${PV:0:4}
+
+src_prepare() {
+	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
+	if use linguas_ja; then
+		epatch "${DISTDIR}"/${P}-ja_nls.patch.gz
+		# bug #335803
+		epatch "${FILESDIR}"/${P}-ja-cleanup.patch
+	else
+		epatch "${FILESDIR}"/${P}-cleanup.patch
+	fi
+
+	# fix fnmatch replacement, bug #134546
+	epatch "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+
+	# bug #122026
+	epatch "${FILESDIR}"/${P}-psset.patch
+
+	# 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
+
+	# fix compilation error due to obstack.h issue, bug 269638
+	epatch "${FILESDIR}"/${P}-ptrdiff_t.patch
+
+	# fix building with sys-devel/automake >= 1.12, bug 420503
+	rm -f {.,ogonkify}/aclocal.m4
+	sed -i \
+		-e '/^AM_C_PROTOTYPES/d' \
+		-e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+		-e '/PROG_MKDIR_P/s:AM:AC:' \
+		configure.in {contrib/sample,lib,src}/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #420503
+
+	local myconf="COM_netscape=no COM_acroread=no"
+
+	use emacs || myconf="${myconf} EMACS=no"
+	use latex || myconf="${myconf} COM_latex=no"
+
+	export LANG=C LC_ALL=C
+
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		--sysconfdir="${EPREFIX}"/etc/a2ps \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_compile() {
+	# parallel make b0rked
+	emake -j1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		lispdir="${EPREFIX}${SITELISP}"/${PN} \
+		install
+
+	newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+	newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+	newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README
+
+	prune_libtool_files
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}