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

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

commit:     342520315beabebc8f3c9109fd7e2cd936b5d175
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 19:46:16 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 19:46:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=34252031

sci-libs/acml: Version bump, now fetch restricted.

Package-Manager: portage-2.2.01.21580-prefix

---
 sci-libs/acml/ChangeLog                            |    8 ++-
 .../acml/{acml-5.2.0.ebuild => acml-5.3.0.ebuild}  |   73 ++++++++++---------
 sci-libs/acml/metadata.xml                         |    3 +-
 3 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 9016da2..cd86638 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/acml
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.40 2009/07/07 23:27:59 flameeyes Exp $
 
+*acml-5.3.0 (24 Jan 2013)
+
+  24 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +acml-5.3.0.ebuild,
+  -acml-5.2.0.ebuild, metadata.xml:
+  sci-libs/acml: Version bump, now fetch restricted.
+
   12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> -acml-4.4.0-r1.ebuild,
   metadata.xml:
   sci-libs/acml: Removed old

diff --git a/sci-libs/acml/acml-5.2.0.ebuild b/sci-libs/acml/acml-5.3.0.ebuild
similarity index 56%
rename from sci-libs/acml/acml-5.2.0.ebuild
rename to sci-libs/acml/acml-5.3.0.ebuild
index df74d72..9d42a7d 100644
--- a/sci-libs/acml/acml-5.2.0.ebuild
+++ b/sci-libs/acml/acml-5.3.0.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib toolchain-funcs versionator alternatives-2
+inherit eutils multilib toolchain-funcs versionator alternatives-2 fortran-2
 
 ACML_INST_DIR=opt/${PN}${PV}
 QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
 
 MYP=${PN}-$(replace_all_version_separators -)
 
-DESCRIPTION="AMD Core Math Library for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/cpu/libraries/acml/Pages/default.aspx"
+DESCRIPTION="AMD Core Math Library for amd64 CPUs"
+HOMEPAGE="http://developer.amd.com/tools/cpu-development/amd-core-math-library-acml/"
 
 # here we go for the url mess
 FCOMP64=""
-URI="http://download2-developer.amd.com/amd/ACML"
+URI="http://developer.amd.com/tools/cpu-development/amd-core-math-library-acml/acml-downloads-resources/"
 for fcomp in gfortran ifort open64 pgi; do
 	FCOMP64="${FCOMP64} ${fcomp}? ( ${URI}/${MYP}-${fcomp}-64bit.tgz
 			int64? ( ${URI}/${MYP}-${fcomp}-64bit-int64.tgz ) )"
@@ -29,51 +29,48 @@ SRC_URI="
 
 LICENSE="ACML"
 SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="doc examples gfortran ifort int64 open64 openmp pgi static-libs test"
-RESTRICT="strip mirror"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="doc examples fma gfortran ifort int64 open64 openmp pgi static-libs test"
+RESTRICT="fetch strip mirror"
 
-DEPEND="test? ( virtual/fortran )"
-RDEPEND="virtual/fortran"
+DEPEND=""
+RDEPEND=""
 
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 	unpack ./contents-acml-*.tgz
-	use openmp || rm -rf *_mp
+	use openmp || rm -rf *_mp*
+	use fma || rm -rf *_fma*
 }
 
 src_test() {
 	local fdir d
 	for fdir in */examples; do
 		einfo "Testing acml in ${fdir}"
-		for d in . acml_mv; do
-			pushd ${fdir}/${d} > /dev/null
-			emake ACMLDIR="${S}/${fdir%/examples}"
-			emake clean
-			popd > /dev/null
-		done
+		pushd ${fdir} > /dev/null
+		emake ACMLDIR="${S}/${fdir%/examples}"
+		emake clean
+		popd > /dev/null
 	done
 }
 
 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 prof libs fdir libdir x fdef
+	local prof libs fdir libdir=$(get_libdir)  x
 	for fdir in */lib; do
 		fdir=$(dirname ${fdir})
-		prof=acml$(echo ${fdir} | sed \
+		prof=acml-$(echo ${fdir} | sed \
 			-e 's:mp:openmp:' \
-			-e 's:_:-:g' \
-			-e 's:\([a-z]*\)\(32\|64\)\(-openmp\|\)\(-int64\|\):\2\4-\1\3:')
-		use examples || rm -rf ${fdir}/examples
-		use static-libs || rm -f ${fdir}/lib/*.a
+			-e 's:_:-:g')
+		use examples || rm -r ${fdir}/examples
+		use static-libs || rm ${fdir}/lib/*.a
 		dodir /${ACML_INST_DIR}
-		cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR}
+		cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR} || die
 		libs="$(find ${fdir} -name \*.so -printf '%f ' | sed -e 's:lib:-l:g' -e 's:\.so::g')"
 		cat <<-EOF > ${prof}.pc
-			prefix=${EPREFIX}/${ACML_INST_DIR}/${fdir}
+			prefix=${EROOT}/${ACML_INST_DIR}/${fdir}
 			libdir=\${prefix}/lib
 			includedir=\${prefix}/include
 			Name: ${prof}
@@ -83,7 +80,6 @@ src_install() {
 			Libs: -L\${libdir} ${libs}
 			Cflags: -I\${includedir}
 		EOF
-		libdir=$(get_libdir)
 		insinto /usr/${libdir}/pkgconfig
 		doins ${prof}.pc
 		for x in blas lapack; do
@@ -91,19 +87,26 @@ src_install() {
 				/usr/${libdir}/pkgconfig/${x}.pc ${prof}.pc \
 				/${ACML_INST_DIR}/${libdir} ${fdir}/lib
 		done
-		[[ ${fdef} = gfortran${libdir#lib} ]] || fdef=${fdir}
 	done
 
-	# install env file
-	use openmp && [[ ${fdef} != *_mp ]] && fdef=${fdef}_mp
-	echo -n > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
-	dosym ${fdef}/lib /${ACML_INST_DIR}/$(get_libdir)
+	echo > 35acml "LDPATH=${EROOT}/${ACML_INST_DIR}/${libdir}"
 	doenvd 35acml
 
+	# default profile: first one matching use flags
+	local opts=gfortran
+	for fdir in ifort open64 pgi; do
+		use ${fdir} && opts=${fdir}
+	done
+	opts+="64"
+	use fma && opts+="_fma4"
+	use openmp && opts+="_mp"
+	use int64 && opts+="_int64"
+	dosym $(ls -1d */lib | grep ${opts}) /${ACML_INST_DIR}/${libdir}
+
 	insinto /${ACML_INST_DIR}
 	# info files go to standard /usr/share/info to avoid more env variables
 	doinfo Doc/*info*
-	rm Doc/*EULA* Doc/*info*
-	use doc || rm -rf Doc/*.pdf Doc/acml.html Doc/html
+	rm Doc/*EULA* Doc/*info* || die
+	use doc || rm -r Doc/*.pdf Doc/acml.html Doc/html
 	doins -r Doc ReleaseNotes*
 }

diff --git a/sci-libs/acml/metadata.xml b/sci-libs/acml/metadata.xml
index 0d6d48c..ca7fb2c 100644
--- a/sci-libs/acml/metadata.xml
+++ b/sci-libs/acml/metadata.xml
@@ -15,10 +15,11 @@
   Alle Routinen sind hoch optimiert für AMD(R) x86 und amd64 CPUs.
 </longdescription>
 <use>
+  <flag name='fma'>Use the Fused Multiply Add instruction set</flag>
   <flag name='gfortran'>Fetch and install acml compiled with GNU FORTRAN compiler</flag>
   <flag name='ifort'>Fetch and install acml compiled with the Intel FORTRAN compiler</flag>
+  <flag name='int64'>Install the 64 bits integer library</flag>
   <flag name='pgi'>Fetch and install acml compiled with the Portland Group FORTRAN compiler</flag>
   <flag name='open64'>Fetch and install acml compiled with the Open64 FORTRAN Compiler</flag>
-  <flag name='int64'>Install the 64 bits integer library</flag>
 </use>
 </pkgmetadata>