EAPI=3, keyworded for {amd64,x86}-linux, made it EPREFIX aware

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 32 insertions, 19 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index de779bafa61a..773de2dd5839 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/apbs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.23 2009/12/04 04:09:15 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.24 2010/02/18 22:12:17 jlec Exp $
+
+  18 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> apbs-1.2.1b.ebuild:
+  EAPI=3, keyworded for {amd64,x86}-linux, made it EPREFIX aware
 
 *apbs-1.2.1b (04 Dec 2009)
 
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index e61e615adc75..18aa04ddda57 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apbs-1.0.0-LDFLAGS.patch 1423 RMD160 d802bbcfda969f86a799847ec323f786b25e9d75 SHA1 c4d4ce34fe72e9b54f553abf0fdec2ed979cdf8f SHA256 2dae2123d325b0bee45544fe681afb0b82616983d82fa1e9a16b4f9fbb4f2e33
 AUX apbs-1.0.0-install-fix.patch 890 RMD160 64e4d2247e23fd4d67b43ae91e1470d4cd2b8b02 SHA1 a5d618d37601bdafce0f7c3a58c399454955fdb0 SHA256 e30f2396261d7320aa0bbcc873689cc3368fe3bcc670806c6f2e399e66439b14
 AUX apbs-1.0.0-libmaloc-noinstall.patch 2230 RMD160 983d431fbe8af9aab163f3160521339fa0fc68d9 SHA1 9d5f2685d78c73f404899eca24cee4d1e5cb140d SHA256 729b836d5539a3c6328905c5e69403fd9386eb85199eb5702c90b5ec88bc5ef0
@@ -11,6 +14,13 @@ DIST apbs-1.2-source.tar.gz 10593537 RMD160 62cb82da9ca5276c3d7127a4d1f9737747da
 DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be
 EBUILD apbs-1.0.0-r1.ebuild 1995 RMD160 0efbe531fe27749a65a23d17958c411bcd15ad74 SHA1 9ff5761e0d8d01cdb49518cdf5d3372977c0f9ad SHA256 34b2bd026da29cec1224c91d9b4c86bdac3bec95747e167b2127aa329de2f4b2
 EBUILD apbs-1.2.0.ebuild 2514 RMD160 860994d50bc8a5d1657a5f3f6fa0dfef3c1e76e4 SHA1 d917e489ecc0e245e02796097a6aef07617e73ff SHA256 4f4229963c163b60012c091e84cf456a1215680358e3852174f2a972554546bf
-EBUILD apbs-1.2.1b.ebuild 2587 RMD160 0f1159c48ea537f1aa8393c2bca3fbe04de36a90 SHA1 bc852c472d96fc12d90babed8aede32139a8acd5 SHA256 19df7bc7c36fa57273cac61b8d5670c297f7675082b44231f4535f4c539e06fa
-MISC ChangeLog 4094 RMD160 fee4a6502780fbeb6a982f7233a842051ea7e2ed SHA1 21f3fe13cb25abb266c83cd883e0733407ab2978 SHA256 2729c3f259121b36b28c772cd0d01a4c86572784d511a38cb9a0fc09673f4a75
+EBUILD apbs-1.2.1b.ebuild 2663 RMD160 cf6dae22e4cffc008c726accede7bb141113bf8a SHA1 f299fbb8d9af112f8c74ad8e103454211d090938 SHA256 f0b02665ddb8257cebb17ab907e015533869c7e35e0ee844b062144fa5bf0411
+MISC ChangeLog 4230 RMD160 e257ee5f9aff96234e321ba8d7eba9a1d8b69ebb SHA1 e46876cac02c887acba4c8f4622496937b530d88 SHA256 c57d7356b0e43c3ba0725a880ba63a755abb11cc03f94dde39478c7f8d32d326
 MISC metadata.xml 358 RMD160 b98e2ce84589bbc6b62f9fb91007bae907f019bc SHA1 c15f33b50d731bda2c2f58a1fe601e0b23f7288c SHA256 9f33e69a8a217ad31fcad567e0d0889693c680631d9245c7bd9774caac95a74e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt9u0cACgkQgAnW8HDreRa7UQCdFp2v1bAXOU+3cXOa0hVAxSQz
+scAAoJ4QXbtJ/IhOx+SbkVQgL1PjWTXi
+=1F+I
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/apbs/apbs-1.2.1b.ebuild b/sci-chemistry/apbs/apbs-1.2.1b.ebuild
index 09247ced7d14..a0cf6d93c17f 100644
--- a/sci-chemistry/apbs/apbs-1.2.1b.ebuild
+++ b/sci-chemistry/apbs/apbs-1.2.1b.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b.ebuild,v 1.1 2009/12/04 04:09:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b.ebuild,v 1.2 2010/02/18 22:12:17 jlec Exp $
 
-EAPI="2"
+EAPI="3"
+
+PYTHON_DEPEND="2"
 
 inherit eutils fortran autotools python versionator flag-o-matic
 
@@ -17,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 
 SLOT="0"
 IUSE="arpack blas doc mpi python openmp"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc ~amd64-linux ~x86-linux"
 
 DEPEND="dev-libs/maloc[mpi=]
 	blas? ( virtual/blas )
@@ -30,8 +32,6 @@ RDEPEND="${DEPEND}"
 FORTRAN="g77 gfortran ifc"
 
 src_prepare() {
-	python_version
-
 	epatch "${FILESDIR}"/${PN}-1.2.0-install-fix.patch
 	epatch "${FILESDIR}"/${PN}-1.2.0-contrib.patch
 	epatch "${FILESDIR}"/${PN}-1.2.0-link.patch
@@ -42,23 +42,23 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--docdir=/usr/share/doc/${PF}"
+	local myconf="--docdir=${EPREFIX}/usr/share/doc/${PF}"
 	use blas && myconf="${myconf} --with-blas=-lblas"
-	use arpack && myconf="${myconf} --with-arpack=/usr/$(get_libdir)"
+	use arpack && myconf="${myconf} --with-arpack=${EPREFIX}/usr/$(get_libdir)"
 
 	# check which mpi version is installed and tell configure
 	if use mpi; then
-		export CC="/usr/bin/mpicc"
-		export F77="/usr/bin/mpif77"
+		export CC="${EPREFIX}/usr/bin/mpicc"
+		export F77="${EPREFIX}/usr/bin/mpif77"
 
 		if has_version sys-cluster/mpich; then
-	 		myconf="${myconf} --with-mpich=/usr"
+	 		myconf="${myconf} --with-mpich=${EPREFIX}/usr"
 		elif has_version sys-cluster/mpich2; then
-			myconf="${myconf} --with-mpich2=/usr"
+			myconf="${myconf} --with-mpich2=${EPREFIX}/usr"
 		elif has_version sys-cluster/lam-mpi; then
-			myconf="${myconf} --with-lam=/usr"
+			myconf="${myconf} --with-lam=${EPREFIX}/usr"
 		elif has_version sys-cluster/openmpi; then
-			myconf="${myconf} --with-openmpi=/usr"
+			myconf="${myconf} --with-openmpi=${EPREFIX}/usr"
 		fi
 	fi || die "Failed to select proper mpi implementation"
 
@@ -72,7 +72,7 @@ src_configure() {
 
 	econf $(use_enable python) \
 		--disable-maloc-rebuild \
-		${myconf} || die "configure failed"
+		${myconf}
 }
 
 src_compile() {