Fixes for broken move to EAPI=3 second try

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

diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index f91b91d317750e3dcb00dee92f41ec430ae68880..016e605e76ac9f9ad4cc08886cd59cc957bf4220 100644 (file)
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX atlas-3.9.0-disable-ilaenv.patch 2863 RMD160 1de71ab88d23a347dca59a461db5d3b2603c91a0 SHA1 129274241892b114fa7eede02db3a7f6c098b1b1 SHA256 24befbc40439af6ac095058b21677cb738d43a3ae31235a209619b9d57840273
 AUX atlas-asm-gentoo.patch 408 RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da SHA1 493d066be68c66cca1f0c906d588da8983ec7afa SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b
 AUX eselect.lapack.atlas 221 RMD160 10a38380469d069b7562b1c8f5a11d0ca94c806d SHA1 381462731ef8f618e8c3cd115c3da812b6f7c2ba SHA256 41b00b000df42c14cc483b468b19d586995b4f528544e24e7aba25feab966a64
@@ -19,8 +22,15 @@ EBUILD lapack-atlas-3.8.0.ebuild 5931 RMD160 789823c7ca9f2c2541b9c22ccab031cfa0b
 EBUILD lapack-atlas-3.8.2.ebuild 5805 RMD160 b2d24df4d09dd0b87cc6c4ac61a2ac1efff64415 SHA1 8f1eb735388f274aaff5a9e1f0607ff68e95f94d SHA256 0e9925634cc1bd9909cd2a64ec44ce79d94fae84876bafea27aae3afd7593bc4
 EBUILD lapack-atlas-3.9.21-r1.ebuild 6304 RMD160 fc24eeb5df853020b48285e22b228953bf52f24e SHA1 579038f7ccee639d1b21f49aa621e5f052ea016b SHA256 ed8139f8d66c37e341dd1105583dd1f6156de70af35f1bb0afb5d0ffd27d32a2
 EBUILD lapack-atlas-3.9.21.ebuild 6301 RMD160 e57ad595ffcc270339ddabe94c4d1b6aeddf8946 SHA1 7ceb637d8f861b4f766039535c9871526635800b SHA256 98ae66548aa7ef96bdf43afd2440aabd410f3852eb13333cb92a150a915a992c
-EBUILD lapack-atlas-3.9.23-r1.ebuild 6832 RMD160 e809ba98a2730e6a3bb0fcaf0e0c6113aff79360 SHA1 f273bb772564ee1e10146515f6db55f9b1b66077 SHA256 3f499abfe642394bd51b09670c92f6149b464406067da875c3b03111c87faf17
+EBUILD lapack-atlas-3.9.23-r2.ebuild 6785 RMD160 0d114c878109dfac1f6a7c572a534ae08a31bca3 SHA1 1aa4b46cc9947dc09cb5cbf5c1963c565ae2c5ff SHA256 925593c2e5354c9c4946d9cb42768214ce65725d0963539336c8b9bd8ea95389
 EBUILD lapack-atlas-3.9.23.ebuild 6324 RMD160 69928cb54951e6f63240c451ea55684f179211ed SHA1 980d0e4947bfa298968fda5101d13741ed0553f0 SHA256 7e03c46171a5c2687b542de5483b1d31940b51ec1962892508238b3ec0f4e98f
 EBUILD lapack-atlas-3.9.3.ebuild 6311 RMD160 fb1e017c8465ccc8e1bebb3d4761f73bae2f01b9 SHA1 92f4761a3459761f818c1c722cf54f56a0e62a28 SHA256 e309572202518c4bffb03a076db785e2a3b351b42b4676ce717c8aed97c42982
-MISC ChangeLog 17389 RMD160 46f17c6b36b32e4f1cc99480252bebe44239f31a SHA1 28ee9b9f4127071554a85c2fcc3302ab24ff7dc7 SHA256 fcf3a2881f79a086b2c0f3277efa2ca07f302fa4283063fb26d32f34b85de193
+MISC ChangeLog 17576 RMD160 3d290c4bdcb6fa3097b0a70a45dd6d95bad1f2d0 SHA1 8a9a4ea209ea633af0ad957d0a348172ccb7ab67 SHA256 05959cff28211e296813306c64a0d69b78c2e70c85b24c3f28d31ec9d5dc7212
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvHduMACgkQgAnW8HDreRYeRACgz7SFitztokGBsmMb71nWWox7
+C7kAnRmKbUsXocoOQj/KBHdtbQkaBKVV
+=IEgQ
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild
index 7f77f45a2ed0422812becc25d30c248192656542..6484a1a8d1b7b6e88d18120a635731d88ab0bccb 100644 (file)
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.1 2010/04/15 20:21:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.2 2010/04/15 20:28:06 jlec Exp $
 
 EAPI="3"
 
@@ -41,6 +41,7 @@ S="${WORKDIR}/ATLAS"
 S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}"
 BLD_DIR="${S}/gentoo-build"
 RPATH="${DESTTREE}/$(get_libdir)/${L_PN}/${MY_PN}"
+S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV}
 
 src_prepare() {
        epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2
@@ -118,6 +119,8 @@ src_configure() {
                -e "s:EXT_ETIME$:INT_CPU_TIME:" \
                make.inc.example > make.inc \
                || die "Failed to set up make.inc"
+       cd "${S_LAPACK}"
+       econf || die "Failed to configure reference lapack lib"
 }
 
 src_compile() {
@@ -128,10 +131,7 @@ src_compile() {
                make lib || die "Failed to make lib in ${d}"
        done
 
-       # build rest of lapack
-       S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV}
        cd "${S_LAPACK}"
-       econf || die "Failed to configure reference lapack lib"
        emake || die "Failed to make reference lapack lib"
 
        cd "${S_LAPACK}"/SRC