Fix for Prefix, use EAPI=3

Package-Manager: portage-2.2.01.18252-prefix/cvs/SunOS i386

3 files changed, 16 insertions, 23 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 623d6c504523..588347ae0991 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.80 2011/03/20 19:58:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.81 2011/04/24 14:28:26 grobian Exp $
+
+  24 Apr 2011; Fabian Groffen <grobian@gentoo.org> pari-2.3.5.ebuild:
+  Fix for Prefix, use EAPI=3
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> pari-2.3.4-r1.ebuild,
   pari-2.3.5.ebuild:
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index bc4ccceb7e1d..458615e81c22 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50pari-gentoo.el 271 RMD160 e71ae40ba7bc2179bdb963d4300020d6a5f8bf76 SHA1 6956b8771d0bcf632ab59a6cca0a2282368bd03f SHA256 787e2c797c42645de8429cd449040b81563e07681c557bc9433cc4ef287ffe12
 AUX pari-2.3.2-ppc-powerpc-arch-fix.patch 453 RMD160 2522cab3f5a862d6fcf13d6b30b00a420b62d809 SHA1 2861b205fa4b7d7a0adc5fe9f4ec7dd4c728c331 SHA256 3796b8e994f6dda107dd3733ec0769dbe020debc8f24db89f4f740cd3939f64f
 AUX pari-2.3.2-strip.patch 293 RMD160 49660a3edcfd8f73ce5fe78f832262f98348a804 SHA1 85012664fd4c1f092ca08c4a1e174cc05ff09b72 SHA256 e4a63e53734295dbbdcf9ade59c12d49a36317be3b25a223c684221086fce21b
@@ -12,13 +9,6 @@ DIST pari-2.3.4.tar.gz 2024690 RMD160 d3bf1f24c0f321ccee309bc2b4c15c8a263fb73f S
 DIST pari-2.3.5.tar.gz 2018097 RMD160 488adf3af5398d0ab5390eb86b65cd79bd1044c5 SHA1 f211ccfe42a4b18dbcde832dfd1ece6f477f4966 SHA256 47ddae1af73b4476660d2a89338483949067a97ffb8758c82e8189dfa4c89d88
 DIST seadata.tgz 19214199 RMD160 e88637426f74c5223068fc2d916741c10d8279e4 SHA1 fa3deb36df0ce71a466eb0ff0d4a18d48d44e8b9 SHA256 c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833
 EBUILD pari-2.3.4-r1.ebuild 4223 RMD160 86b57d4c795fa2eea90363da83828aec98cd96fd SHA1 94eac2f9c2d3c6f20c1a1b0c5ba2e51da813250d SHA256 9e4257bd9ddb0a0a564f234cf36246ec115b63d61279a26d6fe329fbd23fd2be
-EBUILD pari-2.3.5.ebuild 4399 RMD160 488febe9558845ad13b1c394d34aca28be235d36 SHA1 93ee10fd781b9ae70b6b17d8b530bd2d3d95171e SHA256 0213ba23563406bca52e55f2d24fad7cad4d82977a73db9f26b3a800e0289c8e
-MISC ChangeLog 14815 RMD160 8028a5de66498c3bb2d2cd8d7443399e124e516b SHA1 759c6ce78b36f6b0712b3f4be67948f3492c63d0 SHA256 d62b266a6891150df9ca3b7acdc89e9bdcbd62dab8b8f3e9bfa2355ef9a5b191
+EBUILD pari-2.3.5.ebuild 4474 RMD160 28b34bf49f9f7b018963c5e71e6fd93398c5cdcc SHA1 8ef83776d21a6a1d13ca73a885042638d8c61d80 SHA256 fcc3f672ebde8acd2453ec8b23fed8b79381bf0fb03e15a066de57abf462adf3
+MISC ChangeLog 14918 RMD160 365662a4c4e102f230c71df1a5e1963ef47442f2 SHA1 1c1ed97227b6019366f1134d0e7bacdbe0562de6 SHA256 c9dcbc6117971db0d7121852e3db5a5e43c8027f85c2f92bd70439a55d0200ad
 MISC metadata.xml 1110 RMD160 9f77b92fc473dc18364cda6049ae65c01656d14d SHA1 643003b3881bb599e57c8346073b2c4dc185ee15 SHA256 6efe59c37d2ff1b960324b5f0736e25ce2a8b3e9dc67d9b5482a9d808ba44d0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2GXFYACgkQgAnW8HDreRYLfACfaSpjLiUeUeLjC/Pc03E55Qeb
-z7kAoIQVdqkexjd2oKZGeQlOYMdrNPka
-=f9RO
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/pari/pari-2.3.5.ebuild b/sci-mathematics/pari/pari-2.3.5.ebuild
index 6e5edbfb6358..9af0afc8002a 100644
--- a/sci-mathematics/pari/pari-2.3.5.ebuild
+++ b/sci-mathematics/pari/pari-2.3.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.5.ebuild,v 1.4 2011/03/20 19:58:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.5.ebuild,v 1.5 2011/04/24 14:28:26 grobian Exp $
 
-EAPI=2
+EAPI=3
 inherit elisp-common eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A software package for computer-aided number theory"
@@ -58,7 +58,7 @@ src_prepare() {
 		config/get_dlld || die "Failed to fix LDFLAGS"
 	# move doc dir to a gentoo doc dir and replace hardcoded xdvi by xdg-open
 	sed -i \
-		-e "s:\$d = \$0:\$d = '/usr/share/doc/${PF}':" \
+		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
 		-e 's:"xdvi":"xdg-open":' \
 		-e 's:xdvi -paper 29.7x21cm:xdg-open:' \
 		doc/gphelp.in || die "Failed to fix doc dir"
@@ -81,11 +81,11 @@ src_configure() {
 	fi
 	# sysdatadir installs a pari.cfg stuff which is informative only
 	./Configure \
-		--prefix=/usr \
-		--datadir=/usr/share/${PN} \
-		--libdir=/usr/$(get_libdir) \
-		--sysdatadir=/usr/share/doc/${PF} \
-		--mandir=/usr/share/man/man1 \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
 		--with-readline \
 		$(use_with gmp) \
 		|| die "./Configure failed"
@@ -139,8 +139,8 @@ src_install() {
 	if use doc; then
 		emake \
 			DESTDIR="${D}" \
-			EXDIR="${D}/usr/share/doc/${PF}/examples" \
-			DOCDIR="${D}/usr/share/doc/${PF}" \
+			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+			DOCDIR="${ED}/usr/share/doc/${PF}" \
 			install-doc || die "Failed to install docs"
 		insinto /usr/share/doc/${PF}
 		doins doc/*.pdf || die "Failed to install pdf docs"