[gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     31670d27197789c8fe9ec8327a92ef8a3e42df74
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 18:05:44 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 18:05:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=31670d27

switch to eapi4 + cleaning

---
 sci-libs/acml/Manifest          |    2 +-
 sci-libs/acml/acml-4.4.0.ebuild |   29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 49ce50d..a09e233 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a615cf2b3294294162ccb89e9ad
 DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580
 DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256 f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0
 DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d280715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07dc0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf
-EBUILD acml-4.4.0.ebuild 3518 RMD160 d8fd9e54163b7cd017d3d5f57eed8eb058135b46 SHA1 7fa4bf6cd5262f72ecde49f18198ee3440529ae8 SHA256 73ec1e91299543c17b12411f9b5467fafc593f1e9bf0c094bb94a5581fb98928
+EBUILD acml-4.4.0.ebuild 3384 RMD160 04293bd6cafda5b0d45bcfcd18c7c572c03f9008 SHA1 cc72743e39266d806adabe0a45868551b997b634 SHA256 aedfaf68159f0a9f4f0a52d0be3649d36ffbcd88f7027c2252712d3369b117b1
 MISC ChangeLog 8360 RMD160 9ba66449beb8a1e69a85350af6aa19f0b6a75282 SHA1 3f9a99bd9338d885b78be8d6fa7dc571c45705f0 SHA256 0c5e6390e9db8d9564078133f3b4d49300782dff4f1c474f420a61213dc78b9d
 MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e SHA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f836c29c818176cf23d239dc1e5aa29e4702cbbe85042

diff --git a/sci-libs/acml/acml-4.4.0.ebuild b/sci-libs/acml/acml-4.4.0.ebuild
index e48694d..3e9be5b 100644
--- a/sci-libs/acml/acml-4.4.0.ebuild
+++ b/sci-libs/acml/acml-4.4.0.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils multilib toolchain-funcs versionator alternatives-2
 
-ACML_INST_DIR="opt/${PN}${PV}"
+ACML_INST_DIR=opt/${PN}${PV}
 QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
 
 MYP=${PN}-$(replace_all_version_separators -)
@@ -48,13 +48,12 @@ src_unpack() {
 }
 
 src_test() {
+	local fdir d
 	for fdir in */examples; do
 		einfo "Testing acml in ${fdir}"
 		for d in . acml_mv; do
-			pushd ${fdir} > /dev/null
-			emake \
-				ACMLDIR="${S}/${fdir%/examples}" \
-				|| die "emake test in ${fdir}/${d} failed"
+			pushd ${fdir}/${d} > /dev/null
+			emake ACMLDIR="${S}/${fdir%/examples}"
 			emake clean
 			popd > /dev/null
 		done
@@ -64,14 +63,14 @@ src_test() {
 src_install() {
 	# install libraries, pkgconfig file and eselect files for each profile
 	# fdef will be the default (gfortran if available) to be in path
-	local fdef
+	local fdef lib
 	for lib in */lib; do
 		local fdir=${lib%/*}
 		use examples || rm -rf ${fdir}/examples
 		use static-libs || rm -f ${fdir}/lib/*.a
 		insinto /${ACML_INST_DIR}
-		doins -r ${fdir} || die "install ${fdir} failed"
-		local acml_libs=
+		doins -r ${fdir}
+		local alib acml_libs
 		for alib in ${fdir}/lib/*.so; do
 			alib=$(basename ${alib} .so)
 			acml_libs="${acml_libs} -l${alib#lib}"
@@ -88,15 +87,15 @@ src_install() {
 			Libs: -L\${libdir} ${acml_libs}
 			Cflags: -I\${includedir}
 		EOF
-		local libdir=$(get_libdir)
+		local libdir=$(get_libdir) x
 		[[ ${fdef} == gfortran${libdir#lib} ]] || fdef=${fdir}
 		use multilib && [[ ${fdir} == *32* ]] && libdir=lib32
 		insinto /usr/${libdir}/pkgconfig
 		doins ${PN}-${fdir}.pc
 		for x in blas lapack; do
 			alternatives_for ${x} ${PN}-${fdir} 0 \
-				"/usr/${libdir}/pkgconfig/${x}.pc" "${PN}-${fdir}.pc" \
-				"/${ACML_INST_DIR}/${libdir}" "${fdir}/lib"
+				/usr/${libdir}/pkgconfig/${x}.pc ${PN}-${fdir}.pc \
+				/${ACML_INST_DIR}/${libdir} ${fdir}/lib
 		done
 	done
 	echo -n > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
@@ -106,13 +105,13 @@ src_install() {
 		echo -n >> 35acml ":${EPREFIX}/${ACML_INST_DIR}/lib32"
 	fi
 	echo >> 35acml
-	doenvd 35acml || die
+	doenvd 35acml
 
 	insinto /${ACML_INST_DIR}
 	doins ReleaseNotes*
 	# info files go to standard /usr/share/info to avoid more env variables
-	doinfo Doc/*info* || die "info install failed"
+	doinfo Doc/*info*
 	rm Doc/*EULA* Doc/*info*
 	use doc || rm -rf Doc/*.pdf Doc/acml.html Doc/html
-	doins -r Doc || die "install Doc failed"
+	doins -r Doc
 }