Bump to EAPI-3, add prefix support & keywords

Package-Manager: portage-v2.2_rc67-82-g87d689d/cvs/Linux i686

3 files changed, 27 insertions, 39 deletions

diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 7aea26e1fdbc..bb20ea639015 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/lam-mpi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.82 2009/12/06 03:50:14 jsbronder Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.83 2010/05/02 23:14:10 abcd Exp $
+
+  02 May 2010; Jonathan Callen <abcd@gentoo.org> lam-mpi-7.1.4-r1.ebuild:
+  Bump to EAPI-3, add prefix support & keywords
 
   06 Dec 2009; Justin Bronder <jsbronder@gentoo.org>
   lam-mpi-7.1.4-r1.ebuild:
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index d92d7b741338..7a289a903e3d 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 7.1.2-lam_prog_f77.m4.patch 529 RMD160 1693107a9e2fa7fbef0e6b59f082ab8082a61522 SHA1 263b63c1ca7a32621338e54bcf98cee8e4345eb6 SHA256 5164b1f5d6abffc93f1ec113ca1711e34938246d9d3f43318375ecc90201bf9b
 AUX 7.1.2-liblam-use-extra-libs.patch 490 RMD160 f52c0c3490a5d7dd9fa3993032c64c5fd7ef4295 SHA1 dad163d483a8a35cf4cb3a5cb7c572e7f21fabf8 SHA256 580a84ef0364d9ea9bf204024906d18b7b00338e48cfafdc04f2d82d9c4b6870
 AUX 7.1.4-as-needed.patch 3713 RMD160 eec6deda8b43b6033d4b8487cfbe43b05f2924c6 SHA1 da07f00b60aa20ceb9d3629cc6e5ee1fed9c135d SHA256 3eb3e1a6ca0f657c0676cd16ee883e27c65093cd19a48ba675f41c8f8ecf03d8
 AUX lam-mpi-7.1.4-libtool.patch 757 RMD160 9cf13e2e3b2a11a1e2027c88b6f75302ca0d3651 SHA1 0a4404ce2648d99a6b3a007722881d0995734a07 SHA256 edbff0e9524b0549339aa645cceaf89f5d7fe696e34670d84eb27873ee516fac
 DIST lam-7.1.4.tar.bz2 7865813 RMD160 6c9c6338391472d4cd2572c409cb92360e7fd799 SHA1 ce8a983004f31d5960d34efe3ed9ac489e9dfc9d SHA256 d66c205f57d9ffc38dbfb81faef8b586ef2b9e08853034c0472ef4ae45803d2e
-EBUILD lam-mpi-7.1.4-r1.ebuild 4931 RMD160 af2f31511f3b792677e2d4fe3c1632a229aa3e32 SHA1 1b80c8663eeabb0d6e298adc9b2b750e052a8e53 SHA256 dd0832541674e8865f605da6f8aaf87ff554bf3dec60d2ec1ccbd0265fd64ef6
-MISC ChangeLog 13324 RMD160 1d6004fbac92ad0a9661b374dd3a809d2f1af8c0 SHA1 ee6c6ff11006b428c0b13a79caf1cefb7032984c SHA256 a80e0f43f1ee41d92eb226903cfb7e55d813ddecb9ce61d46bdf437b61f21b02
+EBUILD lam-mpi-7.1.4-r1.ebuild 4889 RMD160 dc4d1573d30c0d5ea059d30c19436776d5e819f6 SHA1 8e7d35f68e545e71030b3a092540a401569b567e SHA256 9f6395d8e73f6e355dae2769c76c28510d54d9a17850a78c3acd49153bfe2ef6
+MISC ChangeLog 13442 RMD160 fdcf9894c5ace58766f44b11d9f3160a91872009 SHA1 ab59871a03d48d07d458a4f49a7b60e2df5b87ff SHA256 1a3c6eba760d5c81c321160a8158131193e27481358a1011794760331f7a2f45
 MISC metadata.xml 506 RMD160 b07d8e3f5f1b8a9b4c9ab9106e0219382256ef59 SHA1 7f2fa66c0847b74f32827241201d30a0d9050759 SHA256 98f3e810fe814223972ecdf54cbb519ce2d687cc5bbac4ef739d44d0efe451b0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksbKgIACgkQ4MrvBE1wQ8nu3wCePy3t9RqHjoC1KDwWegbPKTA+
-2A4An0N14vd2TCnMEz5BSDdkFAdYew0T
-=KA1x
------END PGP SIGNATURE-----
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
index 20ae02cf0cd8..625080c7441b 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.11 2009/12/06 03:50:14 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.12 2010/05/02 23:14:10 abcd Exp $
+
+EAPI="3"
 
 inherit autotools eutils fortran flag-o-matic multilib portability
 
@@ -23,20 +25,16 @@ RDEPEND="${DEPEND}
 	!crypt? ( net-misc/netkit-rsh )"
 
 SLOT="6"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="lam-mpi"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/romio/util/
-	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
+src_prepare() {
+	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${ED}/usr/share/doc/${PF}\"|" romio/util/romioinstall.in
 
-	for i in "${S}"/share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do
-	  sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'/usr/share/doc/${PF}'@' ${i}
+	for i in share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do
+	  sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'"${EPREFIX}"/usr/share/doc/${PF}'@' ${i}
 	done
 
-	cd "${S}"
 	epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
 	epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
 	epatch "${FILESDIR}"/7.1.4-as-needed.patch
@@ -77,7 +75,7 @@ pkg_setup() {
 	# fortran_pkg_setup should -not- be run here.
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	if use crypt; then
@@ -104,24 +102,21 @@ src_compile() {
 		fortran_pkg_setup
 		# this is NOT in pkg_setup as it is NOT needed for RDEPEND right away it
 		# can be installed after merging from binary, and still have things fine
-		myconf="${myconf} --with-fc=${FORTRANC}"
-	else
-		myconf="${myconf} --without-fc"
 	fi
 
 	# Disable totalview, see #245439 and #276194
 	econf \
-		--with-ltdl-include=/usr/include \
-		--with-ltdl-lib=/usr/$(get_libdir) \
+		--with-ltdl-include="${EPREFIX}"/usr/include \
+		--with-ltdl-lib="${EPREFIX}"/usr/$(get_libdir) \
 		--disable-ltdl-install \
 		$(use_with xmpi trillium) \
-		--sysconfdir=/etc/lam-mpi \
+		--sysconfdir="${EPREFIX}"/etc/lam-mpi \
 		--enable-shared \
 		--with-threads=posix \
 		--disable-tv \
 		$(use_with romio) \
-		${myconf} || die "econf failed."
-	emake || die "emake failed."
+		$(use_with fortran fc "${FORTRANC}") \
+		${myconf}
 }
 
 src_install () {
@@ -130,8 +125,8 @@ src_install () {
 	# With USE=xmpi /usr/bin/sweep is installed.  However it's just
 	# a bash script to call bfctl -R and it causes file collisions
 	# with media-sound/sweep.  Hence, we remove it, see man bfcfl.
-	if [ -f "${D}"/usr/bin/sweep ]; then
-		rm -f "${D}"/usr/bin/sweep || die
+	if [ -f "${ED}"/usr/bin/sweep ]; then
+		rm -f "${ED}"/usr/bin/sweep || die
 	fi
 
 	# There are a bunch more tex docs we could make and install too,
@@ -142,8 +137,8 @@ src_install () {
 	# With USE=xmpi /usr/bin/sweep is installed.  However it's just
 	# a bash script to call bfctl -R and it causes file collisions
 	# with media-sound/sweep.  Hence, we remove it, see man bfcfl.
-	if [ -f "${D}"/usr/bin/sweep ]; then
-		rm -f "${D}"/usr/bin/sweep || die
+	if [ -f "${ED}"/usr/bin/sweep ]; then
+		rm -f "${ED}"/usr/bin/sweep || die
 	fi
 
 	if use examples; then
@@ -151,7 +146,7 @@ src_install () {
 		dodir /usr/share/${P}/examples
 		find -name README -or -iregex '.*\.[chf][c]?$' >"${T}"/testlist
 		while read p; do
-			treecopy $p "${D}"/usr/share/${P}/examples ;
+			treecopy $p "${ED}"/usr/share/${P}/examples ;
 		done < "${T}"/testlist
 	fi
 }