Version bump + fixed pkg-config files

Package-Manager: portage-2.1.4_rc9

6 files changed, 211 insertions, 20 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index f9208e793996..de2d435062b0 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.26 2007/11/21 00:25:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.27 2007/12/19 02:19:05 bicatali Exp $
+
+*acml-4.0.1 (19 Dec 2007)
+
+  19 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/lapack.pc.in, +acml-4.0.1.ebuild:
+  Version bump + fixed pkg-config files
 
   21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> acml-3.6.0-r1.ebuild,
   acml-3.6.1-r1.ebuild, acml-4.0.0.ebuild:
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 0a0e90fcdc8e..c176dcf156a6 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX blas.pc.in 277 RMD160 8cb47efd4dde249c1167474349f5dfd627cf0db8 SHA1 528846352226a1f2543a7562370a60110c958252 SHA256 36cef41ee7bede42836c6d9b4d8d95ee95270f238ed52994440565741e0db129
-MD5 f00b2103879c1f4c8f85533e2b20d80f files/blas.pc.in 277
-RMD160 8cb47efd4dde249c1167474349f5dfd627cf0db8 files/blas.pc.in 277
-SHA256 36cef41ee7bede42836c6d9b4d8d95ee95270f238ed52994440565741e0db129 files/blas.pc.in 277
-AUX lapack.pc.in 274 RMD160 7d97022fffe23c7b1215de1555851a4057efebe2 SHA1 b6b1c19d6c5fe734bb40877c23f33134838a7f6e SHA256 0a0d676a89f34710c8955178440f5f72114adaa8ec9d73d067f43480360c443a
-MD5 bcc3002846ea0acf7d199f861d83b1d1 files/lapack.pc.in 274
-RMD160 7d97022fffe23c7b1215de1555851a4057efebe2 files/lapack.pc.in 274
-SHA256 0a0d676a89f34710c8955178440f5f72114adaa8ec9d73d067f43480360c443a files/lapack.pc.in 274
+AUX blas.pc.in 258 RMD160 012fc0967d9309eb37ee7671021a3e01bf17efa4 SHA1 ef805ede07e908ca290f2ca5f2fbffe39be14f50 SHA256 b354b584828b9f1e15ea6168ba42bc5d9a9de3fd0ed3a5cf68f5c1bf23cf8b5b
+MD5 2d2b3fdabfe2255a8de6a44875a1a137 files/blas.pc.in 258
+RMD160 012fc0967d9309eb37ee7671021a3e01bf17efa4 files/blas.pc.in 258
+SHA256 b354b584828b9f1e15ea6168ba42bc5d9a9de3fd0ed3a5cf68f5c1bf23cf8b5b files/blas.pc.in 258
+AUX lapack.pc.in 255 RMD160 5b6fc96425af18f30d880b13dbfa1d5580c95adc SHA1 a4fecec48bdf98d04d68ba8c4482661f536e5033 SHA256 db4b67af072808b7c6f45216bb8f63033d96d02ef84db78732e9bfe280a44803
+MD5 d5a9f1c7d75b3b94cf7b8a28dd50ef3c files/lapack.pc.in 255
+RMD160 5b6fc96425af18f30d880b13dbfa1d5580c95adc files/lapack.pc.in 255
+SHA256 db4b67af072808b7c6f45216bb8f63033d96d02ef84db78732e9bfe280a44803 files/lapack.pc.in 255
 DIST acml-3-6-0-gnu-32bit.tgz 9879145 RMD160 bafa6acd1d8a319fb385245559779450c7bdcd66 SHA1 7dad2ce9fb99572da79e127c711aabe29a888298 SHA256 81ee83babf134bc021e5e64983200abf815531ee20ecc5ecc97a30bbdb5cf6dd
 DIST acml-3-6-0-gnu-64bit.tgz 11101900 RMD160 f6d674a4fbf99e79109bb379d1ba5dbaf88ce010 SHA1 6f5aab32f396ac9cf99a9c142d89f0b835cb54f0 SHA256 240cd40c9f9c993c15ec113278faf8689713b45b7626da2d0c369024bec97c03
 DIST acml-3-6-0-ifort-32bit.tgz 17399749 RMD160 c41ebe1b62470858d176c5815e05893ba4caf4ad SHA1 87254fc12032ea9ea49822e00300774d8cda73b8 SHA256 1585df79ced4ecd6fdcbb59b36e2686b61d6faf7b755d5ac5a267eddeff36340
@@ -19,6 +19,9 @@ DIST acml-3-6-1-gfortran-64bit.tgz 20452058 RMD160 8df00704e7ac037dcd55a9207f45d
 DIST acml-4-0-0-gfortran-64bit-int64.tgz 21881646 RMD160 65d3d4ca146ade1781efb43ca35c80cc85387c90 SHA1 e57ac634fe7c9a8ba82db59df572b0fa4e1d3434 SHA256 eda0b3c1350716509b1d244641200edca30faaae42c7b7b3873f573b4036f1f6
 DIST acml-4-0-0-gfortran-64bit.tgz 22559682 RMD160 cd9042e882fb4e8c1f5951e8eb2880d035ab14ea SHA1 27632153f219d9659734d4079c884d5347842b10 SHA256 3a7300dd9f7a494177baddd8bc34375daf80e550f5b6edb9539ed966adb80f11
 DIST acml-4-0-0-ifort-64bit.tgz 26676345 RMD160 2f4a1f14a55ac3334fd3fc045355a4fdebf2e87f SHA1 8a862389cc73d6b2975e8f2c682669f6bc1d9c3b SHA256 090f64a5fe309c6ed2ee9bcf7ae73687e0577a02da9f8ceabd4e5315fecb4769
+DIST acml-4-0-1-gfortran-64bit-int64.tgz 21885486 RMD160 a5811d98744a2662855c85efb2c22ab78f42bee0 SHA1 8bcf5c8a1c4f9bd18f5e197edb1256910c627656 SHA256 aa9d506218c80577c3375e5c9076e786f39d0951426ca2e2ac2356c867db84ea
+DIST acml-4-0-1-gfortran-64bit.tgz 22558344 RMD160 1f2e06eb99568899a9145d27c520043d55b21606 SHA1 87ab9473899caef3bfeae11ebeeb4929e3640a51 SHA256 a1063922d7c8b4bbff3635d19b3757674b225c91c784416f0d7edd0939baf658
+DIST acml-4-0-1-ifort-64bit.tgz 24741959 RMD160 323827cc893de6a524bd8ece8126f4e2b502d0e4 SHA1 bacfddb5ab2359191666871c542ae9933cc93a48 SHA256 ee2553fb850eb0b32105c1df48e2a1d0507db8876003e62c3b7724fd15d5f57e
 EBUILD acml-3.6.0-r1.ebuild 4394 RMD160 492b09b11781f9a1367b3bae1e525427207f424d SHA1 2c6d8957ba25e3f9d28714fb4a2447267a4d12e6 SHA256 ef78dce7889f5b139a3c0307dfba73a6f575c0eac63e16a9720a7dcfeff3ea3e
 MD5 401bbf11ccb105ec62688b7ba522b160 acml-3.6.0-r1.ebuild 4394
 RMD160 492b09b11781f9a1367b3bae1e525427207f424d acml-3.6.0-r1.ebuild 4394
@@ -31,10 +34,14 @@ EBUILD acml-4.0.0.ebuild 4830 RMD160 adf9cc005177787f51eff1e0bdf0175c6eb87b78 SH
 MD5 a62275fc4451124aa260e9856c331ba1 acml-4.0.0.ebuild 4830
 RMD160 adf9cc005177787f51eff1e0bdf0175c6eb87b78 acml-4.0.0.ebuild 4830
 SHA256 681a7447ef72f99a79d7063c491d443116bd68ee294eb3da117e41df11af24da acml-4.0.0.ebuild 4830
-MISC ChangeLog 5309 RMD160 aa42350e80a1dd4ec4cf97c959b3c49475b5c738 SHA1 07a70596ea241c9a6513854577d54360a6d46388 SHA256 41b5958b5262840c39edc1f2fdde19490a30bc8562e9dc07f424681e2f2c8de8
-MD5 21ef5a8b4c05d262909b31b08c9831d6 ChangeLog 5309
-RMD160 aa42350e80a1dd4ec4cf97c959b3c49475b5c738 ChangeLog 5309
-SHA256 41b5958b5262840c39edc1f2fdde19490a30bc8562e9dc07f424681e2f2c8de8 ChangeLog 5309
+EBUILD acml-4.0.1.ebuild 4789 RMD160 2901bc23db31e641cc5d40ae683ee772ee4fe47d SHA1 c5c2d46afe8d79dd36f8d791873298b24b7dbdcb SHA256 0dafa69ad9138a6bfc1f24004face245d1f40e2167903ed21cf1a3e45111d78e
+MD5 66135e9179c7d241bcc5e56ca9019204 acml-4.0.1.ebuild 4789
+RMD160 2901bc23db31e641cc5d40ae683ee772ee4fe47d acml-4.0.1.ebuild 4789
+SHA256 0dafa69ad9138a6bfc1f24004face245d1f40e2167903ed21cf1a3e45111d78e acml-4.0.1.ebuild 4789
+MISC ChangeLog 5492 RMD160 c996d01b5e523c204d1e1f09161cd6bd58b12895 SHA1 bbe5bed18855abbf70b23c0507a8c7f8efd6f445 SHA256 0132998c6928d82fa8e427adcf66ba2bd3367963908cbc2339f2a97d2bb89143
+MD5 aef9371c6c5978e3a908717cbeb0cd7b ChangeLog 5492
+RMD160 c996d01b5e523c204d1e1f09161cd6bd58b12895 ChangeLog 5492
+SHA256 0132998c6928d82fa8e427adcf66ba2bd3367963908cbc2339f2a97d2bb89143 ChangeLog 5492
 MISC metadata.xml 879 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f SHA1 375f02d5d2550aa144c759818140e7f1c55de278 SHA256 a2b244cea577e4260368dad481a0b5886a471185f966288bc58af29fb335fe74
 MD5 a42a87565bfb006095c3fa658c84b275 metadata.xml 879
 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f metadata.xml 879
@@ -48,10 +55,13 @@ SHA256 b1ab60561ac029d5f444f7c4b5c7c7dc1793f89ae5ec1b20baa7d4bfdb10a025 files/di
 MD5 30c75ad6d4c67447b44e64aaf2fbc377 files/digest-acml-4.0.0 831
 RMD160 e3e44e6538bc48e46f21b7f3d0a7157470084635 files/digest-acml-4.0.0 831
 SHA256 cb97c792d69b1d1ce81af1153f870042bbb951dfae73530d5db4c89a445f62c1 files/digest-acml-4.0.0 831
+MD5 a6f304a28466a09417ed989cf627e45f files/digest-acml-4.0.1 831
+RMD160 4c5d0457ff500ca0018d1d639ad333530cf228d3 files/digest-acml-4.0.1 831
+SHA256 4506265713b69006c1f709c64bdd3523216f6ab938b95f5ed92ac572e59186a7 files/digest-acml-4.0.1 831
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHQ3sJ1ycZbhPLE2ARAr7MAJwM+nQuyODx7vGbeek/Rj+4anu5CQCfRkqS
-cSLWxxYIs6ExPdwMamHqYms=
-=osUd
+iD8DBQFHaH+k1ycZbhPLE2ARAnzpAJ9mCYXJPwkqUf3yGRSudUXeaK2CWgCgj52M
+3KvO3uJn5Ty24d9435tDE/s=
+=AlJx
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-4.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
new file mode 100644
index 000000000000..7dd177477d40
--- /dev/null
+++ b/sci-libs/acml/acml-4.0.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2007 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.1 2007/12/19 02:19:05 bicatali Exp $
+
+inherit eutils toolchain-funcs fortran
+
+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 ) )"
+
+IUSE="openmp ifc int64 doc examples"
+KEYWORDS="~amd64"
+
+RESTRICT="strip fetch"
+LICENSE="ACML"
+SLOT="0"
+
+DEPEND="app-admin/eselect-blas
+	app-admin/eselect-lapack
+	ifc? ( dev-lang/ifc )
+	openmp? ( !ifc? ( >=sys-devel/gcc-4.2 ) )
+	!openmp? ( !ifc? ( =sys-devel/gcc-4.1* ) )"
+
+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"
+}
+
+pkg_setup() {
+	FORTRAN="gfortran"
+	use ifc && FORTRAN="ifc"
+	fortran_pkg_setup
+	if [[ ${FORTRANC} == 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"
+		elif use openmp && (( ${gcc_version} != 42 )); then
+			eerror "You need gfortran >= 4.2 to use openmp features."
+			eerror "Please use gcc-config to switch gcc version >= 4.2"
+			die "setup gcc failed"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	(DISTDIR="${S}" unpack contents-acml-*.tgz)
+	case ${FORTRANC} in
+		gfortran) FORT=gfortran ;;
+		if*) FORT=ifort ;;
+		*) eerror "Unsupported fortran compiler: ${FORTRANC}"
+		   die "failed configuring fortran";;
+	esac
+	use openmp || rm -rf ${FORT}*_mp*
+	FORTDIRS="$(ls -d ${FORT}*)"
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+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=${FORTRANC} \
+				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-${FORTRANC}
+		local acmldir=${instdir}/${fort}
+		local libname=${acmldir}/lib/libacml
+		local extlibs
+		local extflags
+		if [[ ${fort} =~ int64 ]]; then
+			ESELECT_PROF=${ESELECT_PROF}-int64
+			extflags="${extflags} -fdefault-integer-8"
+		fi
+		if [[ ${fort} =~ _mp ]]; then
+			ESELECT_PROF=${ESELECT_PROF}-openmp
+			#extlibs=-lpthread
+			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:@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/files/blas.pc.in b/sci-libs/acml/files/blas.pc.in
index fd1d57ffd054..12836e6a5998 100644
--- a/sci-libs/acml/files/blas.pc.in
+++ b/sci-libs/acml/files/blas.pc.in
@@ -1,11 +1,10 @@
 prefix=/usr
 exec_prefix=${prefix}
 libdir=/usr/@LIBDIR@
-includedir=@ACMLDIR@/include
 
 Name: blas
 Description: ACML implementations of the Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L${libdir} -lblas @EXTLIBS@
+Libs: -L@ACMLDIR@ -lblas -lacml_mv @EXTLIBS@
 Cflags: @EXTFLAGS@
diff --git a/sci-libs/acml/files/digest-acml-4.0.1 b/sci-libs/acml/files/digest-acml-4.0.1
new file mode 100644
index 000000000000..9389b125bbc2
--- /dev/null
+++ b/sci-libs/acml/files/digest-acml-4.0.1
@@ -0,0 +1,9 @@
+MD5 36bfad5024c4243c447f126148424b2a acml-4-0-1-gfortran-64bit-int64.tgz 21885486
+RMD160 a5811d98744a2662855c85efb2c22ab78f42bee0 acml-4-0-1-gfortran-64bit-int64.tgz 21885486
+SHA256 aa9d506218c80577c3375e5c9076e786f39d0951426ca2e2ac2356c867db84ea acml-4-0-1-gfortran-64bit-int64.tgz 21885486
+MD5 483d6bc50f3ffbdae6961e8798d1faeb acml-4-0-1-gfortran-64bit.tgz 22558344
+RMD160 1f2e06eb99568899a9145d27c520043d55b21606 acml-4-0-1-gfortran-64bit.tgz 22558344
+SHA256 a1063922d7c8b4bbff3635d19b3757674b225c91c784416f0d7edd0939baf658 acml-4-0-1-gfortran-64bit.tgz 22558344
+MD5 b61e888cbb03b1a651c5f10bab82639b acml-4-0-1-ifort-64bit.tgz 24741959
+RMD160 323827cc893de6a524bd8ece8126f4e2b502d0e4 acml-4-0-1-ifort-64bit.tgz 24741959
+SHA256 ee2553fb850eb0b32105c1df48e2a1d0507db8876003e62c3b7724fd15d5f57e acml-4-0-1-ifort-64bit.tgz 24741959
diff --git a/sci-libs/acml/files/lapack.pc.in b/sci-libs/acml/files/lapack.pc.in
index e312798d8485..65763893ac8f 100644
--- a/sci-libs/acml/files/lapack.pc.in
+++ b/sci-libs/acml/files/lapack.pc.in
@@ -1,11 +1,10 @@
 prefix=/usr
 exec_prefix=${prefix}
 libdir=/usr/@LIBDIR@
-includedir=@ACMLDIR@/include
 
 Name: lapack
 Description: ACML implementation of the F77 Linear Algebra PACKage
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L${libdir} -llapack @EXTLIBS@
+Libs: -L@ACMLDIR@ -llapack -lacml_mv @EXTLIBS@
 Cflags: @EXTFLAGS@