Drop old; move to EAPI=5, fixes #478598

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 34 insertions, 390 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 1c0ec66ebe57..a6733964bef0 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.48 2015/02/15 06:46:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.49 2015/02/20 14:46:15 jlec Exp $
+
+*acml-4.1.0-r2 (20 Feb 2015)
+
+  20 Feb 2015; Justin Lecher <jlec@gentoo.org> +acml-4.1.0-r2.ebuild,
+  -acml-3.6.1-r1.ebuild, -acml-4.0.1.ebuild, -acml-4.1.0-r1.ebuild:
+  Drop old; move to EAPI=5, fixes #478598
 
   15 Feb 2015; Mike Frysinger <vapier@gentoo.org> acml-4.1.0-r1.ebuild:
   Switch to matching versions as the SLOT in older versions is changing #528196.
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 6cabe3bd9af2..df26f26df11b 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,39 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX blas.pc.in 305 SHA256 1e87f717f13a36b81faaa12d45bd08e5add3b9f7977a9b6b43105ca10822e2a3 SHA512 6cd3d4067b0eaef5d2ebf16c0e344fd1aeefc60b3089359defc421703fc94bf2990119360b2b6317587a595e5246d2f2c429f450c49868269f48fad7a5e4f0e3 WHIRLPOOL 05410c2c3e7032e9052ccb2f2be97be0772706f5e6f2d4f66b44d77528cea28ba1e5a71ef042930e7532ac2f92788cdab744cd423d904b61b86c9de37ed062c1
 AUX lapack.pc.in 300 SHA256 1ed9c723892aa4c614738a1dfda4216ce0d596380d733495b351dd8770c450f5 SHA512 c311d839244a7b778245e37bcfee66c25a8282236ea6825cae11ec4a925567236ccbfdfdd62813176a826ef9f59ca6267dee0d4c0b75eb7be774b532aa0f2f97 WHIRLPOOL e19a9c51132aa9436fcebb1488eaf45e6ed305092bad374bb72b93be4247f8d262c13d89437aecb5f61df2c7a7d849277f67343936a4b9ca6ce167937ed7794c
-DIST acml-3-6-1-gfortran-32bit.tgz 17682562 SHA256 adec95c65d1042c65fa1490978b76042c3bf9670df7c226cd28431473985898c
-DIST acml-3-6-1-gfortran-64bit-int64.tgz 19802195 SHA256 56cbbb6deac2a93d21f3954511ad95ccc2a8ce893fdbf9a8605a2d81deb1fc41
-DIST acml-3-6-1-gfortran-64bit.tgz 20452058 SHA256 efec543a8185ffb6e6e68db94ef0cbd92c1b9ee1580affe6cd0a73c580ad8bdc
-DIST acml-4-0-1-gfortran-64bit-int64.tgz 21885486 SHA256 aa9d506218c80577c3375e5c9076e786f39d0951426ca2e2ac2356c867db84ea
-DIST acml-4-0-1-gfortran-64bit.tgz 22558344 SHA256 a1063922d7c8b4bbff3635d19b3757674b225c91c784416f0d7edd0939baf658
-DIST acml-4-0-1-ifort-64bit.tgz 24741959 SHA256 ee2553fb850eb0b32105c1df48e2a1d0507db8876003e62c3b7724fd15d5f57e
 DIST acml-4-1-0-gfortran-32bit.tgz 18258099 SHA256 52580576c3a425635eccb19fc5df38c3139fbc44fd669799bc8ffd0e2d82ccc7
 DIST acml-4-1-0-gfortran-64bit-int64.tgz 29351223 SHA256 825ae742df873cf6d41fbaaecff08941badb2b43a7021ba6c8af7abc75a6d14d
 DIST acml-4-1-0-gfortran-64bit.tgz 29995624 SHA256 50f64687b86556123538e1f2bd4c185ff1d018501a5a5834ec8acf7487c817c4
 DIST acml-4-1-0-ifort-32bit.tgz 18797527 SHA256 5dfa768c12e96d2d25678e85cf2e0eea3bd427ddd94f417bcad09abe25369375
 DIST acml-4-1-0-ifort-64bit-int64.tgz 36135363 SHA256 3da0ded50ab25e44f531ac58b469344fed0f6af4ae70aa58b1286cf8de9731a4
 DIST acml-4-1-0-ifort-64bit.tgz 36577689 SHA256 b5b60425fccb624e3baf48f5d51ae68ccdc3e9852a4a50661bb3e45a6f25be40
-EBUILD acml-3.6.1-r1.ebuild 4917 SHA256 8033f273173a3d191981fd57f37aecc478ad2c12b147498c4c19183f57e6314a SHA512 c9c64c7ea7badb3a239a4563e9f8d84768ae7961e36a1be1e12ec74c72215cc03344f016dba18da5025ef17ddfd11c9270f607806353fabae22e480bdde69d34 WHIRLPOOL 9487cdfd1d60d394835623855ffd9724ce95596711223d940b1a64d731642bbfbf32c447fd709e8fceafe364515eb519cc79e0e0e07cbc9007a70dd6dc5886c9
-EBUILD acml-4.0.1.ebuild 4870 SHA256 658dc02c59e59c93b011e6bcaeaf81f34338b0053879ab9178be29f3a4eb3e9d SHA512 9cbb1640fede897d42a95a0b4960b7f85977880770abc2cbdd22d73374fa280771fcd3aaec6678bdff04dfd9c10984ca576a1f7de365874bca1518e2017412c9 WHIRLPOOL e27cb4eeb387815e3e1a6c2f4254c63ae4557e7580891b6a1ddebb6d6bd65ee7a0141bea4227e0440afbcf49ffdbea1d4dfb8b1b97ef92a54aec5205246428f2
-EBUILD acml-4.1.0-r1.ebuild 5516 SHA256 ae6e2a2a5a3c253b0c812d05852c6a3039ef1ff4ddf433b8097d054a73c81eae SHA512 f323631cd7df816c19c0213064cb69cb5a7ce76c93561cd3d488d6f6ce0d2d9441c5d395604afcc3024700ddd47d7c234aa961b5cee02b6f8fc8e69e3934cd35 WHIRLPOOL c72293f4ea546061fdb648ca7346cf5630c813e7e5a7408a6cde8052534a40d2f2dfafb8f1a1f5bf5453b335dd07caef8637508c0fd47dc556ec94930e9d5521
-MISC ChangeLog 9080 SHA256 3a052f896f611b5935f2ad145070d6b22378d96bab73d254e3d704bc388bcde3 SHA512 703e4650b90b75ccfd3b445c71e35ee0a1de639d336a7e68958073a4064594b410dd55b3a43ed707b9f844073c143547d629f42830873a95cc4fa7e709df235a WHIRLPOOL 421ffccbab3483185d9b93ad6cca5ea6db0edcec8f792a74cc1017bee5f822c3edbafb5c81f3b2da4e34d68fb0da124aeaab176fb264b9c1d944b974954db240
+EBUILD acml-4.1.0-r2.ebuild 5403 SHA256 72a49a300e276ebeee6f24a4aefd7fe6b05690b0146998171c19a03f3252ea16 SHA512 3185691c1357a427d71250533a7e4bb4e0aa772a66b29476105414532520b37944344d60a707f81a25243c7bb6aaa742b10b90a03ca73eca77d72357f9eff2be WHIRLPOOL 73316dca676caca68b87d0684cdd7dc0bc565c2e38dbc5dfd3a678bf46a89e26b1bebd669c1db1e7a921f2f4b36ba9e6822bcc9bb6573b1800eb7454b6c3462d
+MISC ChangeLog 9289 SHA256 17149b596619dac11b1983c118cd694bc3d52f5c8a22b0beb2bc8f4d7edcfae5 SHA512 0da94bd53717a898b93abbf83ec776b0b40435cb7d91570d5b965b4c001c4ebe36165c0969de00c777c51d262e36a11c1505fa67351501a717a90e3e01dc96f4 WHIRLPOOL 30507a6e53cca4978529697a13d80fba42b9d94f5db042f145b3f2aac1951bdbffb2fd770734b8d81d9fe05adec435081d98e9f26fa2e02bd587ceff62fdbf32
 MISC metadata.xml 1089 SHA256 f2c40b20cf49369672d12c77766bbd3de2a518266966615c57a955056bef7fe2 SHA512 2f10c9aaaa74a82eb04839e6cebb5e3cd82d8aa41ad12b4c979d28fde4746049a8addb7bebb41eeebbe9caae38e75778b92f278192eada91c81e75f3fe342d26 WHIRLPOOL c76c719ab4977f6750af73070f80be6c127e02a3e4e9c9f53d575e32f15c95007cfd8bf22a176434466c19aa8e4cdb6efa425f443a29641b9853cda4fc50ed55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU4EDUAAoJEPGu1DbS6WIAITgP/jI5wGMOB4G3hwEqKAHiPMxP
-2/UIut6e5YLBEqgUlPT5kZIr1YySeK5BRDxTO/PGcEUsW3p4fi5H2k8UvWy1+CFV
-INJJkN7xR8WHOHhBUSQkYPn+881wKXlMF/mq7VHh4vTA7aY1VwBTzCzP0aIvwBdn
-3u8s81y5bQUPJNx/CqcViQCi/OJaCzX99bGaIxYyyLSYpZjLDmgTBbWl/0+Qml2+
-QKUa2/KTVgK3GH44nwVsFX/dwDPQOthN7LNEgcj09mbQLyGmWk0QA70JCJE9eoQz
-gBsR2y1ed0wKP7RdeysJKP63chYpiTz8BKB8oowPzND3ZVJQs+3hk395rBIuIyak
-M+m+zS4rgzvH+TaP8UCqrkOECIbav3xgVQvezAkIFVz+yjU0lgJrNoadbqcPlPyI
-zIop4oeclVulCJ3rGs/H2qtGAN9t73+E7tkCzj3fTiBKaQsFuh2uu9zP9ss9Lnq0
-J1n/+6uCd45rY0lKN/S2rjWh12gH6DOxiLSF5yjVbcDq8RElyP7Ntd/jhH4RU/PC
-wrv0J43Ct2oAXvm8dkhkcfAjqBzr7mMkENU3NGNziXVJCc2rdKXbyVRMGDj52OFo
-AfMXNltxMHx9/qj7j0+iOS01fNuiSm9L4jQNUa99LjhYXaG2wfrdxQEQkuYyiN2Z
-UjOobYjbEwKbnrw5l+1H
-=YMgM
+iQJ8BAEBCgBmBQJU50i4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirsdMP/A4FRPPmwL+xvN8xc0YSr/Dj
+a8U8RSbk+PifA6/+5TrTtFFmXy/kkIEF7hEDDiN6fEvaA+yK/7fmzOjBjtr2840Z
+q7BGo2Xa9gZFnFpDZdhqCAuytzCFAppO/jsJebrgXifKEC/F4ZOuXoLVrJnLnqHC
+ZIvSFmgqkqcWmS9B20mPgjzuutYyA+Y7lBsTYEiY9TUg6NEyALvPGNqhAb9CUqx0
+DAAVB2CYGvJ5lyo7mMwSbCIibLEdAZJx/Ho72739ZjrZg9lCz2MfvQ6fx/Bd9+FI
+lbPYtVX4G9EBgT3wvEE6izuj9IfBmf+AzIAK4vbCdc2atue08XuC4+iLsstnbjzX
+tnRptX0t+6p+EDV1ZLrHSze3surqcj9+I52B/Sh4Bl9cQ0Vn1tQhHy/Gh71OyRZe
+7Nzo9e5LakPVtnWT1kk2JIAtjbP5vCzQvlBFX3stQLyxnB0TQFn2lq9xUaib65Lj
+mq2/DYPFYLh0D64jF2+ZIbshDIj74nzHKvLtV5XGlTlE30bwxFUTNk4rmqyMBuWQ
+PIWLwbCBnBbK1K5PP++kbRDLTeoY3VNHTwrbuNbUcNX4LwRaKXfDjwB3I1QgGqL/
+H6hpo5tpu9skR/LqCMNf4W96CBMguKLKAI6t7Rxwpb5bQC49E4gvpMRPKYfsJGEK
+XwXDFUhaVEAqKRkyoZIP
+=R5of
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
deleted file mode 100644
index c8ae04267bfe..000000000000
--- a/sci-libs/acml/acml-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.14 2012/10/16 20:48:56 jlec Exp $
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-MY_PV=${PV//\./\-}
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.jsp"
-SRC_URI="
-	x86? ( acml-${MY_PV}-gfortran-32bit.tgz )
-	amd64? (
-		acml-${MY_PV}-gfortran-64bit.tgz
-		int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz ) )"
-
-SLOT="0"
-LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
-IUSE="openmp int64 doc examples"
-
-RESTRICT="strip fetch"
-
-DEPEND="
-	app-admin/eselect-blas
-	app-admin/eselect-lapack"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs app-doc/lapack-docs )"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download the ACML from:"
-	einfo "${HOMEPAGE}"
-	einfo "and place it in ${DISTDIR}."
-	einfo "The previous versions could be found at"
-	einfo "http://developer.amd.com/acmlarchive.jsp"
-}
-
-get_fcomp() {
-	case $(tc-getFC) in
-		*gfortran* )
-			FCOMP="gfortran" ;;
-		ifort )
-			FCOMP="ifc" ;;
-		* )
-			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-pkg_setup() {
-	elog "From version 3.5.0 on, ACML no longer supports"
-	elog "hardware without SSE/SSE2 instructions. "
-	elog "For older 32-bit without SSE/SSE2, use other blas/lapack libraries,"
-	elog "or file a bug if you wish to have earlier ACML versions supported."
-	if use openmp; then
-		tc-has-openmp || die "Please ensure your compiler has openmp support"
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	get_fcomp
-}
-
-src_unpack() {
-	unpack ${A}
-	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	case ${FCOMP} in
-		gfortran) FORT=gfortran ;;
-		if*) FORT=ifort ;;
-		*) eerror "Unsupported fortran compiler: $(tc-getFC)"
-			die ;;
-	esac
-	use openmp || rm -rf ${FORT}*_mp*
-	FORTDIRS="$(ls -d ${FORT}*)"
-}
-
-src_test() {
-	local forts=${FORTDIRS}
-	# only testing with current compiler
-	use openmp && forts="$(ls -d ${FORT}*_mp*)"
-	for fort in ${forts}; do
-		einfo "Testing acml for ${fort}"
-		cd "${S}"/${fort}/examples
-		for d in . acml_mv; do
-			cd "${S}"/${fort}/examples/${d}
-			emake \
-				ACMLDIR="${S}"/${fort} \
-				F77=$(tc-getFC) \
-				CC="$(tc-getCC)" \
-				CPLUSPLUS="$(tc-getCXX)" \
-				|| die "emake test in ${fort}/examples/${d} failed"
-			emake clean
-		done
-	done
-}
-
-src_install() {
-	# respect acml default install dir (and FHS)
-	local instdir=/opt/${PN}${PV}
-	dodir ${instdir}
-
-	for fort in ${FORTDIRS}; do
-		# install acml
-		use examples || rm -rf "${S}"/${fort}/examples
-		cp -pPR "${S}/${fort}" "${D}"${instdir} || die "copy ${fort} failed"
-
-		# install profiles
-		ESELECT_PROF=acml-${FCOMP}
-		local acmldir=${instdir}/${fort}
-		local acmllibs="-lacml -lacml_mv"
-		local libname=${acmldir}/lib/libacml
-		local extlibs
-		local extflags
-		if [[ ${fort} =~ int64 ]]; then
-			ESELECT_PROF=${ESELECT_PROF}-int64
-			extflags="${extflags} -fdefault-integer-8"
-		fi
-		[[ ${fort} =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-		if [[ ${fort} =~ _mp ]]; then
-			ESELECT_PROF=${ESELECT_PROF}-openmp
-			extlibs="${extlibs} -lpthread"
-			acmllibs="-lacml_mp -lacml_mv"
-			libname=${libname}_mp
-			extflags="${extflags} -fopenmp"
-		fi
-		for l in blas lapack; do
-			# pkgconfig files
-			sed -e "s:@LIBDIR@:$(get_libdir):" \
-				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}:g" \
-				-e "s:@ACMLLIBS@:${acmllibs}:g" \
-				-e "s:@EXTLIBS@:${extlibs}:g" \
-				-e "s:@EXTFLAGS@:${extflags}:g" \
-				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
-				|| die "sed ${l}.pc failed"
-			insinto ${acmldir}/lib
-			doins ${l}.pc
-
-			# eselect files
-			cat > eselect.${l} <<-EOF
-				${libname}.so /usr/@LIBDIR@/lib${l}.so.0
-				${libname}.so /usr/@LIBDIR@/lib${l}.so
-				${libname}.a /usr/@LIBDIR@/lib${l}.a
-				${acmldir}/lib/${l}.pc  /usr/@LIBDIR@/pkgconfig/${l}.pc
-			EOF
-			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
-		done
-		echo "LDPATH=${acmldir}/lib" > "${S}"/35acml
-	done
-
-	doenvd "${S}"/35acml || die "doenvd failed"
-	use doc || rm -rf "${S}"/Doc/acml.pdf "${S}"/Doc/html
-	cp -pPR "${S}"/Doc "${D}"${instdir} || die "copy doc failed"
-}
-
-pkg_postinst() {
-	for p in blas lapack; do
-		local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-		if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-			local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
-			[[ -e ${configfile} ]] && rm -f ${configfile}
-			eselect ${p} set ${ESELECT_PROF}
-			elog "${p} has been eselected to ${ESELECT_PROF}"
-		else
-			elog "Current eselected ${p} is ${current_lib}"
-			elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-	if use openmp; then
-		elog "Remember that if you want to use openmp"
-		elog "You need to switch to gcc >= 4.2 with gcc-config"
-		elog "When using ACML without openmp, stick with gcc-4.1.x"
-	fi
-}
diff --git a/sci-libs/acml/acml-4.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
deleted file mode 100644
index 81bb7cf391de..000000000000
--- a/sci-libs/acml/acml-4.0.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.10 2012/10/16 20:48:56 jlec Exp $
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-MY_PV=${PV//\./\-}
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86_64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.jsp"
-SRC_URI="
-	ifc? ( acml-${MY_PV}-ifort-64bit.tgz )
-	!ifc? (
-		int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz )
-		!int64? ( acml-${MY_PV}-gfortran-64bit.tgz )
-		)"
-
-SLOT="0"
-LICENSE="ACML"
-KEYWORDS="~amd64"
-IUSE="openmp ifc int64 doc examples"
-
-RESTRICT="strip fetch"
-
-DEPEND="
-	ifc? ( dev-lang/ifc )
-	app-admin/eselect-blas
-	app-admin/eselect-lapack"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs app-doc/lapack-docs )"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download the ACML from:"
-	einfo "${HOMEPAGE}"
-	einfo "and place it in ${DISTDIR}."
-	einfo "The previous versions could be found at"
-	einfo "http://developer.amd.com/acmlarchive.jsp"
-	einfo "SRC=${A} $SRC_URI"
-}
-
-get_fcomp() {
-	case $(tc-getFC) in
-		*gfortran* )
-			FCOMP="gfortran" ;;
-		ifort )
-			FCOMP="ifc" ;;
-		* )
-			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-pkg_setup() {
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		local gcc_version=$(gcc-major-version)$(gcc-minor-version)
-		if ! use openmp && (( ${gcc_version} != 41 )); then
-			eerror "You need gcc-4.1.x to test acml."
-			eerror "Please use gcc-config to swicth gcc version 4.1.x"
-			die "setup gcc failed"
-		fi
-	fi
-	if use openmp; then
-		tc-has-openmp || die "Please ensure your compiler has openmp support"
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	get_fcomp
-}
-
-src_unpack() {
-	unpack ${A}
-	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	case ${FCOMP} in
-		gfortran) FORT=gfortran ;;
-		if*) FORT=ifort ;;
-		*) eerror "Unsupported fortran compiler: $(tc-getFC)"
-		   die "failed configuring fortran";;
-	esac
-	use openmp || rm -rf ${FORT}*_mp*
-	FORTDIRS="$(ls -d ${FORT}*)"
-}
-
-src_test() {
-	local forts=${FORTDIRS}
-	# only testing with current compiler
-	use openmp && forts="$(ls -d ${FORT}*_mp*)"
-	for fort in ${forts}; do
-		einfo "Testing acml for ${fort}"
-		cd "${S}"/${fort}/examples
-		for d in . acml_mv; do
-			cd "${S}"/${fort}/examples/${d}
-			emake \
-				ACMLDIR="${S}"/${fort} \
-				F77=$(tc-getFC) \
-				CC="$(tc-getCC)" \
-				CPLUSPLUS="$(tc-getCXX)" \
-				|| die "emake test in ${fort}/examples/${d} failed"
-			emake clean
-		done
-	done
-}
-
-src_install() {
-	# respect acml default install dir (and FHS)
-	local instdir=/opt/${PN}${PV}
-	dodir ${instdir}
-
-	for fort in ${FORTDIRS}; do
-		# install acml
-		use examples || rm -rf "${S}"/${fort}/examples
-		cp -pPR "${S}"/${fort} "${D}"${instdir} || die "copy ${fort} failed"
-
-		# install profiles
-		ESELECT_PROF=acml-${FCOMP}
-		local acmldir=${instdir}/${fort}
-		local acmllibs="-lacml -lacml_mv"
-		local libname=${acmldir}/lib/libacml
-		local extlibs=
-		local extflags=
-		if [[ ${fort} =~ int64 ]]; then
-			ESELECT_PROF=${ESELECT_PROF}-int64
-			extflags="${extflags} -fdefault-integer-8"
-		fi
-		[[ ${fort} =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-		if [[ ${fort} =~ _mp ]]; then
-			ESELECT_PROF=${ESELECT_PROF}-openmp
-			extlibs="${extlibs} -lpthread"
-			acmllibs="-lacml_mp -lacml_mv"
-			libname=${libname}_mp
-			extflags="${extflags} -fopenmp"
-		fi
-		for l in blas lapack; do
-			# pkgconfig files
-			sed -e "s:@LIBDIR@:$(get_libdir):" \
-				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}:g" \
-				-e "s:@ACMLLIBS@:${acmllibs}:g" \
-				-e "s:@EXTLIBS@:${extlibs}:g" \
-				-e "s:@EXTFLAGS@:${extflags}:g" \
-				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
-				|| die "sed ${l}.pc failed"
-			insinto ${acmldir}/lib
-			doins ${l}.pc || die "doins ${l}.pc failed"
-
-			# eselect files
-			cat > eselect.${l} <<-EOF
-				${libname}.so /usr/@LIBDIR@/lib${l}.so.0
-				${libname}.so /usr/@LIBDIR@/lib${l}.so
-				${libname}.a /usr/@LIBDIR@/lib${l}.a
-				${acmldir}/lib/${l}.pc /usr/@LIBDIR@/pkgconfig/${l}.pc
-			EOF
-			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
-		done
-		echo "LDPATH=${instdir}/${fort}/lib" > 35acml
-	done
-
-	doenvd 35acml || die "doenvd failed"
-
-	use doc || rm -rf "${S}"/Doc/acml.pdf "${S}"/Doc/html
-	cp -pPR "${S}"/Doc "${D}"${instdir} || die "copy doc failed"
-}
-
-pkg_postinst() {
-	for p in blas lapack; do
-		local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-		if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-			local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
-			[[ -e ${configfile} ]] && rm -f ${configfile}
-			eselect ${p} set ${ESELECT_PROF}
-			elog "${p} has been eselected to ${ESELECT_PROF}"
-		else
-			elog "Current eselected ${p} is ${current_lib}"
-			elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-}
diff --git a/sci-libs/acml/acml-4.1.0-r1.ebuild b/sci-libs/acml/acml-4.1.0-r2.ebuild
index 6fc63cd0ba11..5a7c9f088341 100644
--- a/sci-libs/acml/acml-4.1.0-r1.ebuild
+++ b/sci-libs/acml/acml-4.1.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v 1.13 2015/02/15 06:46:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r2.ebuild,v 1.1 2015/02/20 14:46:15 jlec Exp $
 
-EAPI=1
+EAPI=5
 
 inherit eutils fortran-2 multilib toolchain-funcs versionator
 
@@ -36,9 +36,10 @@ CDEPEND="
 	gfortran? ( =sys-devel/gcc-4.2* )
 	!gfortran? ( !ifc? ( =sys-devel/gcc-4.2* ) )"
 
-DEPEND="test? (	${CDEPEND} )
+DEPEND="
 	app-admin/eselect-blas
-	app-admin/eselect-lapack"
+	app-admin/eselect-lapack
+	test? (	${CDEPEND} )"
 
 RDEPEND="${CDEPEND}
 	app-admin/eselect-blas
@@ -68,7 +69,6 @@ get_fcomp() {
 }
 
 pkg_setup() {
-
 	if use test; then
 		# work around incomplete fortran eclass
 		if use gfortran &&
@@ -111,8 +111,7 @@ src_test() {
 				ACMLDIR="${S}"/${fdir} \
 				F77=$(tc-getFC) \
 				CC="$(tc-getCC)" \
-				CPLUSPLUS="$(tc-getCXX)" \
-				|| die "emake test in ${fdir}/examples/${d} failed"
+				CPLUSPLUS="$(tc-getCXX)"
 			emake clean
 		done
 	done
@@ -163,7 +162,7 @@ src_install() {
 				"${FILESDIR}"/${x}.pc.in > ${x}.pc \
 				|| die "sed ${x}.pc failed"
 			insinto ${acmldir}/lib
-			doins ${x}.pc || die "doins ${x}.pc failed"
+			doins ${x}.pc
 
 			# eselect files
 			cat > eselect.${prof}.${x} <<-EOF
@@ -177,7 +176,7 @@ src_install() {
 	done
 
 	echo "LDPATH=${instdir}/${ACML_DEFAULT_DIR}/lib" > 35acml
-	doenvd "${S}"/35acml || die "doenvd failed"
+	doenvd "${S}"/35acml
 	use doc || rm -rf "${S}"/Doc/acml.pdf "${S}"/Doc/html
 	cp -pPR "${S}"/Doc "${D}"${instdir} || die "copy doc failed"
 }