Fix regression wrt Emacs support, bug 350451.

Package-Manager: portage-2.1.9.30/cvs/Linux x86_64

4 files changed, 132 insertions, 10 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 459617301585..9f48c7dc7026 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,11 @@
 # 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.97 2010/12/02 01:15:47 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.98 2011/01/10 20:39:43 ulm Exp $
+
+*a2ps-4.14-r2 (10 Jan 2011)
+
+  10 Jan 2011; Ulrich Mueller <ulm@gentoo.org> +a2ps-4.14-r2.ebuild:
+  Fix regression wrt Emacs support, bug 350451.
 
   02 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> a2ps-4.13c-r6.ebuild:
   Drop WANT_AUTOMAKE=latest.
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 315cc6076301..a6ff9e7890e1 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
-AUX 50a2ps-gentoo.el 253 RMD160 4e98bec1dd60efb072e7cf7b6e6e3f58d53a4ead SHA1 210038d9f7e39a14fa8639aa02cb7c81945883b1 SHA256 3d114d11eca3eb4f96e656d188e90082432a1206f39fd471d72c0d4e392d7615
+AUX 50a2ps-gentoo.el 218 RMD160 ea6269b3bdc7d8150261e6b1654d97ccb9ad0aab SHA1 19c19b3ac72a483be0f01d28003c3f344f4d8349 SHA256 421f04aba83fc2fdf02230a86d940bae039206473cb070f2cdd78b0d0725d9e3
 AUX a2ps-4.13-fixcachecheck.patch 444 RMD160 6a26c535b9af9be96d5a2ac32689b19daacc83f9 SHA1 64dadd08f018a65e380fd798157ce04af3a8f6b2 SHA256 d7f37d72ed46d73e26261c3473c738174ef8156f8a1dd9355850fcaa9befd622
 AUX a2ps-4.13-manpage-chmod.patch 461 RMD160 248e2a40119eb50558093a725e89644ac4730291 SHA1 2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce SHA256 032c4698c1dabb1a72978b9aefef7a8895098fb5a7e46e81d861fedfef3b11ab
 AUX a2ps-4.13-select-freebsd.patch 1582 RMD160 3046e537c2447788ada3ce69ae51dac7b3ef0376 SHA1 390bb987b19dba341dbdd05635b917379881d862 SHA256 1ef965e835524b4d45dbe98038817d48ebb0c152d7c2c62c1e3d29f85bb0e2ae
@@ -26,12 +26,13 @@ DIST a2ps-4.14-ja_nls.patch.gz 27576 RMD160 0e67be153e5bd87cbba2c615bc4ea76e72a8
 DIST a2ps-4.14.tar.gz 2552507 RMD160 a5105d6256a809483e099519325979aaaff7219e SHA1 365abbbe4b7128bf70dad16d06e23c5701874852 SHA256 f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4
 EBUILD a2ps-4.13c-r6.ebuild 3566 RMD160 2b661a7f5f5e1a8d7c23a9ce3d60923cab5099f4 SHA1 814fe92375342b6d2715174bb6cf16f3c73f65ac SHA256 eb8441b1b31b3be81b0c1a2e9f6817f8d7b033c6ba023ff06cd15aeb3c2883f6
 EBUILD a2ps-4.14-r1.ebuild 2976 RMD160 f3ad05fc8e1ea224728ccaad06fd3c78cba9f6c7 SHA1 eb16fa9a553fd29d073f270f9a93dcde4c6e1a00 SHA256 a6fea45fc75883bf5aac61f561a67c8fbd37fee681fe45e87010a652e30d54e8
-MISC ChangeLog 14233 RMD160 dae11e26d22950b846ea285f8c61cbcd3b575d8d SHA1 b6acd57a1c272e5f5c87bc28c33bab1bd25806c8 SHA256 862a245b44962331f898a0ab57270e41ea253fd0d46634861d741416bae23e8d
+EBUILD a2ps-4.14-r2.ebuild 2981 RMD160 0df2d0f46fadb9c2e6b61bd668d562a4a66b0f35 SHA1 27895e0bd0362798b40612a29d96c48d49c2420f SHA256 3069bd013b27f4d13cb9389d7d62dc40288d29f3382c722c2b6983f78b2b241a
+MISC ChangeLog 14374 RMD160 f9efe0d498b4f49ad3b70a8fbda9bfbe9bf36acd SHA1 d0df47601e1f5c6fcda865f738a56c2070102766 SHA256 be57b5d4cb55f1172e70dae28b75f01e9ed32474a48594cf910a32dbd9332564
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz280IACgkQAiZjviIA2XivGgCfUZMuUmUdC6+dWiyd9dTddym4
-02oAoOcO2AHBF/Y6IXQQ/qII8fn7cydW
-=idmS
+iEYEARECAAYFAk0rb7kACgkQOeoy/oIi7uwWFgCg1jFKDDqarxsjzX9D+V6YJUlY
+oNAAoOF9CtUHCNx03yK9Wv4zjAp5pCiT
+=5jfl
 -----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14-r2.ebuild b/app-text/a2ps/a2ps-4.14-r2.ebuild
new file mode 100644
index 000000000000..feb9bbf208a3
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r2.ebuild,v 1.1 2011/01/10 20:39:43 ulm Exp $
+
+inherit eutils autotools elisp-common
+
+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"
+IUSE="emacs nls latex vanilla userland_BSD userland_GNU linguas_ja"
+
+RESTRICT="test"
+
+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"
+
+S="${WORKDIR}/${PN}-${PV:0:4}"
+
+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"
+	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"
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf="COM_netscape=no COM_acroread=no"
+
+	if ! use emacs ; then
+		myconf="${myconf} EMACS=no"
+	fi
+
+	if ! use latex ; then
+		myconf="${myconf} COM_latex=no"
+	fi
+
+	export LANG=C LC_ALL=C
+
+	econf \
+		--sysconfdir=/etc/a2ps \
+		$(use_enable nls) \
+		${myconf} || die "econf failed"
+
+	# parallel make b0rked
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		lispdir="${SITELISP}/${PN}" \
+		install || die "emake install failed"
+
+	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
+}
diff --git a/app-text/a2ps/files/50a2ps-gentoo.el b/app-text/a2ps/files/50a2ps-gentoo.el
index 8c7344bbfc62..3e12daaf9a4b 100644
--- a/app-text/a2ps/files/50a2ps-gentoo.el
+++ b/app-text/a2ps/files/50a2ps-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; a2ps site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'a2ps-mode "a2ps" nil t)
 (autoload 'a2ps-buffer "a2ps-print" nil t)