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

Package-Manager: portage-2.2.01.21580-prefix

4 files changed, 55 insertions, 45 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 9016da29f..cd866386b 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/Manifest b/sci-libs/acml/Manifest
index 8f75f2e3a..cd911885a 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,8 +1,8 @@
-DIST acml-5-2-0-gfortran-64bit-int64.tgz 69344338 SHA256 bbf16c30acdb82f462081e3500aec9e272e701bb2022fe32acb29f58ea78ff50 SHA512 085fa7dd7b9a8dc034fec645c1ad9d0f2439d7c72bf6e07a3ba9af494e0bbe4d2b42487ae60d983baa18360dcaee621cb8bb1d4385672a9fb11fdf3ae1c861fd WHIRLPOOL 1b0e0ec79654eda1e20a22f12f9a27eafd3f004fcf799a0fc945f015d5de4c9efe01e43cd84c681d1fe1d18c7b4384347bf2efbeff7a26d29d591a0cd6048d09
-DIST acml-5-2-0-gfortran-64bit.tgz 71676355 SHA256 acdb46cd9c9041656bbe36df7640586273d5993ff2dc3ca07676bfb7c56ac866 SHA512 78c45596abddfd3283054dd3620ed2bdd182aa9407d9cdf05e4523594b1df6ad250381d459ddd8d29999bc9d294eb58544f5df914b89c0b57e4e59282a070eae WHIRLPOOL 1cfe7cfef7101e4bfbd96f34ffa5bad3566fa311fb0900b582a9b6a391ba0ce8e9677347d569756940515424c2b197847a47bcb086b52d59ada2f2d2acb416b2
-DIST acml-5-2-0-ifort-64bit-int64.tgz 106635190 SHA256 97627ee0481b086fc66321130f27e1e9f9c779a475530a7c20be9bf55ee6c476 SHA512 200935dac85fcf8967bbcfcfd3d6e30cda014d5db3a39ca4880f9e7eece1db8685d88e7faa45d418aa59932fb492fbbf23139fcbc4753ab95402b1d559bc4ed5 WHIRLPOOL 1a2ba79db08236873d9044ea419dc87e4f5878da8ba052fa8088a50e4cc5c1f9493dfb1f4ca5672aed296d15602e0cac6f76152c84105b03a6b910a64bf73ce4
-DIST acml-5-2-0-ifort-64bit.tgz 107998032 SHA256 1b401801ecd80d64bce3f66d12260637fd414ef1715bdade0e0d3e9cf58a11c4 SHA512 52ed8167f8402fb9821232e7e8e12b0d2347d22bb20ae2c2afea0de193e9c3df1c0637133dec84252c7bc44ceb4434c81151f7bdd3fceeb3101835f309184bab WHIRLPOOL 8a70dea5298176b92ee6015aea3ba9c8c61c49a9a2895c5cd7e858031dfab030a1942bdb98dff99ce320afdd121116fcf9b3d8126516c032a38efb6d10f28b97
-DIST acml-5-2-0-open64-64bit-int64.tgz 84931905 SHA256 0c299f9868452cdb2b123d682af441c1c90318fd51d86a29aa7899def3065c70 SHA512 a035f1d7309811a6128b71d74a98b382f34c36958ea2a20a77bc6c37a260d05be26534b648dd57839abb5a43636700b5738ffd8f5ade6fd3fdb4d7d906d85a5e WHIRLPOOL 905ce859b92fc909fa760c9007b8af65433f29562f35f7303f46ea99a3c6e21439dd501122eb77783e80dcab0934b133d288a1aa954e9318546c8d8d8bc37c2f
-DIST acml-5-2-0-open64-64bit.tgz 86055158 SHA256 0e4c0e39079126cffe4455adf3481d6e47aecd1d5b1d3752fce2a59e15372e7c SHA512 aad1eaae9c455579bd5bafe08638f6a59858a6b05119e51ffbb7f81626a67f78b7826c209fc54e5870fcb59f2a56d8ef305af768fd9e2c62380c595898b44955 WHIRLPOOL f217cb5a88cd6a24eddaa5d7e07c732780d37a9a03078eaa72ecdcda29ee9e8457282fb2af399b7a82936d7281fc7f28d96a66b494c579650c5e7d2b3dd0e5a8
-DIST acml-5-2-0-pgi-64bit-int64.tgz 145633201 SHA256 b893e48abc5b1c72bf6329385de2473bbeebf13269e80f246c072199320805a0 SHA512 8feb351665df5e16f2716f6adb9f65dd7d91051cab36a5262ced73aa3e8ae5716aa32d1692189f0b0c26c184f751614d76f522e57b105b8d7d1c5e82774ac155 WHIRLPOOL ed3e9b2ce4dcddf6a9962ae04f50ce9f52a1b7a07023a718c78c421c78711f10396cb73e01e2851377b688b0561a101843fba25d443a7cd81fd0134614ceb753
-DIST acml-5-2-0-pgi-64bit.tgz 146752015 SHA256 1cc856df359014e151d0dcc2be95e20be8c0793b63f2f96bfae088de2b53fdf6 SHA512 3f10a92ece35e96e43278148076cbd83070b9aa35669787bf2035e78dfe62f7384dbeec57bf82897b0b813bdb8c3d855c6a57ca29537cb331c676890423eb8a5 WHIRLPOOL ebe8223195ea123be512b6d553757638571b2a71edec3a2ddcad3a259422dfa70be78e6d156c8ac79ec81e904c14de130b7b66a584a15c60afc6283e7564de41
+DIST acml-5-3-0-gfortran-64bit-int64.tgz 70661096 SHA256 c10f2ba0664ad6b0865bed8b2c4a8723e26ae041409d5d65ff01b7cac1462756 SHA512 398542d62f5448ccab2e8e44c01ba51ffaaa36db3e7cc3ca059568cdf36be82fbd431dc588d8da84b3005a418d84b40430ae4fceba566960d3d64b5fb51fef4d WHIRLPOOL bc6ba2d49685d13c57b7638126ae708e4f233822879886d0903adfb6779cd4f537423aa23d76963ae48d216850288e52b955f7b34f95b735d4cbacc1689b0471
+DIST acml-5-3-0-gfortran-64bit.tgz 73083869 SHA256 4d0334eaee1867cde841dc6c9f822aa5cc5043043a33964829a0edb057ffbe97 SHA512 e1534fd311a828bacf22c85dfb0d36843f7d09d4aa42b10882578f238710fa372f31f7c682f057cc359b8218741ab172fee819b85483fd57eae94bdf04b266f1 WHIRLPOOL 618247bb0f5026cc48ab2aac7fb80d7a82a0c186a803e18f24cba3afb6525e225cbf1ec289970ba27ad81c92933db34c78b0ceb034ea8adbe60765ddd643483c
+DIST acml-5-3-0-ifort-64bit-int64.tgz 107424814 SHA256 6f5940551badc245d770a06785e8b0d156b4fe1667b18a5b82741113829b831d SHA512 d626a1f535734ef34b5c4f9e8e5621a9bbede0297e8ee3360e2542cfdb47734351b37e015adf36031539507836c40702b29632ed6ce52987ea061a3605efe8a0 WHIRLPOOL 1ceffd0c205259a35fe70d84ca227c2d679fb588ddcce20559817b90b2bc6e5e5734183d14ab0f1ea75f15d9e6a381798def9b3698573c45e0493968fb388374
+DIST acml-5-3-0-ifort-64bit.tgz 108896205 SHA256 3acdfc0377b5b178d1d9a065b115ac83ddebd332de7b771d86b04c498571c256 SHA512 e7c846dd36fbeda20e202cb3e28c47190d20ec4c97e2b355fe97f41dda92b9277c104c3c6f3df4c331b99cfb7b1c1f70739154f0be543f6d8ac233bd91dc51a4 WHIRLPOOL 6a2052e6d753f24b7b43afacae77550cac357f0ebf5406e035aed8022be20c616f41b093137a2cd714085ac517a854bb7e2730b3f681d5c95fc27157dc3c96a3
+DIST acml-5-3-0-open64-64bit-int64.tgz 86474035 SHA256 598699630304cb12cf400f107792a417188c19849968c176c5f20daf034837f7 SHA512 708893a9435469f14d6cf679a2071b42c4da51a63399943bcaae213421dd4821d8d03d7bccc0f3d41b677ef9bddeb9bed26b8f724254349ac69b0b0418776345 WHIRLPOOL 60d4033975329b837dd885a2abcf5db75b33d00050c7c4d4ae8c4007513b134289650566bcab3f4c862268b13cd8af0c732bb922503400b6d036b7738b953ec5
+DIST acml-5-3-0-open64-64bit.tgz 87669832 SHA256 9bdcbf5e5f00ce68f62d103bacc89b16c0dea20c23af2f1f57c79fa80f160c61 SHA512 1125a5d7a866a2421432195b206b037cc4f15edfb79d363637bf984e500963d78ba7faf9835f49069a86fa26086e551dd55b07b4547f1184396946d9ded47f0a WHIRLPOOL 1e3282119bc9225462be0de48b55d4edadafd2597e9597c4c1d87b33792de7cc18b7a28bdaf6de3d83cd82974749edebec4e6f0879d013efe2337a66dacaea48
+DIST acml-5-3-0-pgi-64bit-int64.tgz 148381091 SHA256 2b73e600d12f16277e9c497c149d93119654410763460e17e2d9a2f58aaecad4 SHA512 478dca7985a1434d3fb56484203982341cb38af6b05a4f879f661b9da85beeb3011c76198ceccf6887a45a83572ba2f0926f9a896bfdaea605867d3d82fafed1 WHIRLPOOL 5eaf40bd2794d8bab190f39814604c14a3fa060ea470369016ee6a6675013fc0d0fe2095e5167e9ec186095c919577cdc6e6899f4c76de82fc3bb2232bbff911
+DIST acml-5-3-0-pgi-64bit.tgz 149581665 SHA256 96fab434e1033cb9d3e8f285145568c068f81336d714394b81be671b3aac5ce5 SHA512 69d07c7436437e88ea38c676324992595ac7872c5ed2b32858b6a499564c2010fdad14753cf20051dfedaed2cf112cac9ee319c869043427570e180291dade58 WHIRLPOOL d5f5b483e821eb3a852aa1e8975aaa49064c723903267686defd3b6ddf280f2bad544c04377259e49b96843855b4f7247f53e2fa27ba7a5d6a635c97aa754528
diff --git a/sci-libs/acml/acml-5.2.0.ebuild b/sci-libs/acml/acml-5.3.0.ebuild
index df74d72e0..9d42a7d1c 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 0d6d48c23..ca7fb2caa 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>