Add prefix support, bump EAPI to 3, add prefix keywords

Package-Manager: portage-2.2.0_alpha29_p11/cvs/Linux i686

3 files changed, 32 insertions, 15 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 9f48c7dc7026..d52b7188ac5e 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/a2ps
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.99 2011/04/12 21:07:58 abcd Exp $
+
+  12 Apr 2011; Jonathan Callen <abcd@gentoo.org> a2ps-4.14-r2.ebuild:
+  Add prefix support, bump EAPI to 3, add prefix keywords
 
 *a2ps-4.14-r2 (10 Jan 2011)
 
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index a6ff9e7890e1..c99057d8b685 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
 AUX 50a2ps-gentoo.el 218 RMD160 ea6269b3bdc7d8150261e6b1654d97ccb9ad0aab SHA1 19c19b3ac72a483be0f01d28003c3f344f4d8349 SHA256 421f04aba83fc2fdf02230a86d940bae039206473cb070f2cdd78b0d0725d9e3
@@ -26,13 +26,23 @@ 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
-EBUILD a2ps-4.14-r2.ebuild 2981 RMD160 0df2d0f46fadb9c2e6b61bd668d562a4a66b0f35 SHA1 27895e0bd0362798b40612a29d96c48d49c2420f SHA256 3069bd013b27f4d13cb9389d7d62dc40288d29f3382c722c2b6983f78b2b241a
-MISC ChangeLog 14374 RMD160 f9efe0d498b4f49ad3b70a8fbda9bfbe9bf36acd SHA1 d0df47601e1f5c6fcda865f738a56c2070102766 SHA256 be57b5d4cb55f1172e70dae28b75f01e9ed32474a48594cf910a32dbd9332564
+EBUILD a2ps-4.14-r2.ebuild 3064 RMD160 8e43c1e9d43b6c57c7caf7109aeb8bea46dcf3b6 SHA1 a695b8a826e808ed95b368254ed695d93c5c761f SHA256 83d2b649dbc36e21a05c8bc5f8043803d7c7bca48bbd7da05e61b72ea8e936df
+MISC ChangeLog 14504 RMD160 488ba97f4a65c212551845442915943a60b5c9eb SHA1 f74be1fac4e931cefc61a7986f0d030da34a2ea0 SHA256 5ef1ece6b5b070281c73ab458bd72b459bd8a99d2cc1c317256b75718e4a3a84
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0rb7kACgkQOeoy/oIi7uwWFgCg1jFKDDqarxsjzX9D+V6YJUlY
-oNAAoOF9CtUHCNx03yK9Wv4zjAp5pCiT
-=5jfl
+iQIcBAEBCAAGBQJNpL84AAoJELHSF2kinlg42MsP/2o8eexUKiAyRFJRBhM1Bnxh
+9GsfxmyDGpy6i3EMUY5fZH/1nZ9Nk3mv5262Sr1qJLY/pY7PhYczEiQlbC4iyiDT
+Qz2K/CdeE+rDJ+aFA7gBPYHf5t1XkBwbNtIDKoYhW4OfGcHD25Mu7aT4h8sYCBNU
+EMZGzlbkDLW9YRhr2ABw8Nzr9EhJWtjRGa5nlRbrS6yEmCrdUq5Q0r0B1Tt8RMa9
+rKrTlpOWOqmFd7yEESg62f4Je4IrSnsCzSEPTDqYRPehC66qkgVwqjKm9EzOmPrW
+cplf759C+ZXjoGpfsC+QDjfIhw7XmIcKmS0vqN/zZUwdcXI2FWdzqO1MW4O236QW
+6r0yjIx3FvZrxzqtamWztb+LY8q+ZLtSLyhAeDxZWMh9/fhfHvnyPxIPMR/npCvu
+UtKAwnBA45daZVWa/a6/FUyqtC76cbz1+/gtFXEew876fg0S8jU1M79HwOiLFFbx
+C5EU5Mc5839uOdTqvQZKAs5jm5OjFSjWiWxWrRM47Cwp+KYdPi7FmeIBedfK8JeG
+IhLMbYCNoFtsOkErLuhhsfKo+PvKsFTQrFr9mEexMxs2hwWBKNOayA8JR52+5HYP
+gr6ln5Ppv3mBiCUf/nZThUd24QO0t/Fe4Mk5d8pdnYcn+re0MICEb161l6PFYPAH
+/fQvZK3PtWTCIud1+lLw
+=tLQ9
 -----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14-r2.ebuild b/app-text/a2ps/a2ps-4.14-r2.ebuild
index feb9bbf208a3..a5cc92929827 100644
--- a/app-text/a2ps/a2ps-4.14-r2.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r2.ebuild
@@ -1,7 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r2.ebuild,v 1.2 2011/04/12 21:07:58 abcd Exp $
 
+EAPI=3
 inherit eutils autotools elisp-common
 
 DESCRIPTION="Any to PostScript filter"
@@ -11,7 +12,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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs nls latex vanilla userland_BSD userland_GNU linguas_ja"
 
 RESTRICT="test"
@@ -38,8 +39,9 @@ S="${WORKDIR}/${PN}-${PV:0:4}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	cd "${S}"
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.13c-locale-gentoo.diff"
 	# this will break
 	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
@@ -76,7 +78,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf="COM_netscape=no COM_acroread=no"
 
 	if ! use emacs ; then
@@ -90,17 +92,19 @@ src_compile() {
 	export LANG=C LC_ALL=C
 
 	econf \
-		--sysconfdir=/etc/a2ps \
+		--sysconfdir="${EPREFIX}"/etc/a2ps \
 		$(use_enable nls) \
-		${myconf} || die "econf failed"
+		${myconf}
+}
 
+src_compile() {
 	# parallel make b0rked
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" \
-		lispdir="${SITELISP}/${PN}" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
 		install || die "emake install failed"
 
 	if use emacs; then