Re-arrange pkgconfig files, removed old version.

Package-Manager: portage-2.1.4_rc14

9 files changed, 53 insertions, 236 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index a4f0009c409d..c99c0266e418 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,11 @@
 # 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.30 2007/12/25 14:17:07 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.31 2008/01/08 09:46:17 bicatali Exp $
+
+  08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/lapack.pc.in, acml-3.6.0-r1.ebuild, acml-3.6.1-r1.ebuild,
+  -acml-4.0.0.ebuild, acml-4.0.1.ebuild:
+  Re-arrange pkgconfig files, removed old version.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing kugelfang from metadata.xml as per #46972.
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 820b700ea4f1..5d586a39f0c3 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 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
+AUX blas.pc.in 292 RMD160 fd530dc7d07db62890fd4e95624033526bed996b SHA1 c64a7a4499cf7e87bcb82618ef8430e7b844df6d SHA256 c1a952dd9f5cfa31a4d98076740526b95ed1b88f3ff84f50888dfa2cbf7e920d
+MD5 0d81a7c8ea5a0400dbb2394790551e0b files/blas.pc.in 292
+RMD160 fd530dc7d07db62890fd4e95624033526bed996b files/blas.pc.in 292
+SHA256 c1a952dd9f5cfa31a4d98076740526b95ed1b88f3ff84f50888dfa2cbf7e920d files/blas.pc.in 292
+AUX lapack.pc.in 289 RMD160 7188a9046f5e95178556c9998aa30195e5bdfae3 SHA1 b96c68ba2d933f7587756358749594440bf8773a SHA256 a4eeee717e97ad5d9d14f65b4ad7e0c11ba9fd35a138719fd115374cfa9e18e8
+MD5 f5b76baf1328f6e654f0d9726913f528 files/lapack.pc.in 289
+RMD160 7188a9046f5e95178556c9998aa30195e5bdfae3 files/lapack.pc.in 289
+SHA256 a4eeee717e97ad5d9d14f65b4ad7e0c11ba9fd35a138719fd115374cfa9e18e8 files/lapack.pc.in 289
 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
@@ -16,32 +16,25 @@ DIST acml-3-6-0-ifort-64bit.tgz 21966276 RMD160 a6031f5cdacdc70d11c06cf6d8e8ae31
 DIST acml-3-6-1-gfortran-32bit.tgz 17682562 RMD160 abdb8ea2f66f08f478a951b37c5ce5945854a357 SHA1 7606b690061319c50f30af11766694205b03922f SHA256 adec95c65d1042c65fa1490978b76042c3bf9670df7c226cd28431473985898c
 DIST acml-3-6-1-gfortran-64bit-int64.tgz 19802195 RMD160 3cb2317d6a5ec62797c4a11ab1336aabb50e16fa SHA1 a9be2f4ecbfdb6e0f849f545b66e78f752367f00 SHA256 56cbbb6deac2a93d21f3954511ad95ccc2a8ce893fdbf9a8605a2d81deb1fc41
 DIST acml-3-6-1-gfortran-64bit.tgz 20452058 RMD160 8df00704e7ac037dcd55a9207f45d6f0b2214ff8 SHA1 f0d2a10e5db83dc264d6f937189ce10a1f461a4d SHA256 efec543a8185ffb6e6e68db94ef0cbd92c1b9ee1580affe6cd0a73c580ad8bdc
-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 4483 RMD160 d6d91e1a16787a20a5d003a6fa7fbb2f1f2de623 SHA1 93f56ed9f8f92cdd7357e6e7f35ae57a6b670722 SHA256 7ad78db5183031e912b363d568d0e4c3757524bdc72e91715f73d835f688a02a
-MD5 0fc9419fe3de4d59999157ad88bd237e acml-3.6.0-r1.ebuild 4483
-RMD160 d6d91e1a16787a20a5d003a6fa7fbb2f1f2de623 acml-3.6.0-r1.ebuild 4483
-SHA256 7ad78db5183031e912b363d568d0e4c3757524bdc72e91715f73d835f688a02a acml-3.6.0-r1.ebuild 4483
-EBUILD acml-3.6.1-r1.ebuild 5240 RMD160 55441fe57584cc505a69f22bcd505f08dd11dd32 SHA1 2d00a7dca839ab02a02d2cce4adc23625584652a SHA256 54481a0a03263188ed94c3be4b75cbaf926df782cbdede0bdfb618891eaec6c3
-MD5 5a2313f3f7e9a77309c1583f0757243a acml-3.6.1-r1.ebuild 5240
-RMD160 55441fe57584cc505a69f22bcd505f08dd11dd32 acml-3.6.1-r1.ebuild 5240
-SHA256 54481a0a03263188ed94c3be4b75cbaf926df782cbdede0bdfb618891eaec6c3 acml-3.6.1-r1.ebuild 5240
-EBUILD acml-4.0.0.ebuild 4830 RMD160 adf9cc005177787f51eff1e0bdf0175c6eb87b78 SHA1 aa5e082f0a62b7a7f0efde3e5c6df08fe73503c5 SHA256 681a7447ef72f99a79d7063c491d443116bd68ee294eb3da117e41df11af24da
-MD5 a62275fc4451124aa260e9856c331ba1 acml-4.0.0.ebuild 4830
-RMD160 adf9cc005177787f51eff1e0bdf0175c6eb87b78 acml-4.0.0.ebuild 4830
-SHA256 681a7447ef72f99a79d7063c491d443116bd68ee294eb3da117e41df11af24da acml-4.0.0.ebuild 4830
-EBUILD acml-4.0.1.ebuild 4868 RMD160 749368f1450e178e7f33c9368aa2d0e92f102f43 SHA1 1f047b3b767c99ba5946d931591181a3e9b0e95b SHA256 a39dc1ba1ec2dd0885d25ab94f3b067444d4a27c48ba6309c37aeab7e92f3542
-MD5 e6f6dcbb1dd09eff89a880150636ea3f acml-4.0.1.ebuild 4868
-RMD160 749368f1450e178e7f33c9368aa2d0e92f102f43 acml-4.0.1.ebuild 4868
-SHA256 a39dc1ba1ec2dd0885d25ab94f3b067444d4a27c48ba6309c37aeab7e92f3542 acml-4.0.1.ebuild 4868
-MISC ChangeLog 5946 RMD160 cdf7408647df713a27e89b58534e907111332731 SHA1 191bb42e52085ddca71bd767a7dbbfa6a1a253d6 SHA256 6fe955ef82abbf57578e981aaef67d92a6606b0a34465110fe59e83d7bef82c5
-MD5 8a8b1797720b9476e9fa25774f94bcac ChangeLog 5946
-RMD160 cdf7408647df713a27e89b58534e907111332731 ChangeLog 5946
-SHA256 6fe955ef82abbf57578e981aaef67d92a6606b0a34465110fe59e83d7bef82c5 ChangeLog 5946
+EBUILD acml-3.6.0-r1.ebuild 4425 RMD160 72a22f8cc168e17bc2a60a6757f57b9e24199f59 SHA1 3d020719f714e6cf5073a4e247093fad2207113e SHA256 34baed9dcf4d9d1233ad6ba63b05f552d728fbdd45b3b5cb137f5d179311bb6a
+MD5 64952e7f13bce282a340322e1c819034 acml-3.6.0-r1.ebuild 4425
+RMD160 72a22f8cc168e17bc2a60a6757f57b9e24199f59 acml-3.6.0-r1.ebuild 4425
+SHA256 34baed9dcf4d9d1233ad6ba63b05f552d728fbdd45b3b5cb137f5d179311bb6a acml-3.6.0-r1.ebuild 4425
+EBUILD acml-3.6.1-r1.ebuild 5183 RMD160 06d5363d56feae7bb84cb300c4324de533ea8db6 SHA1 f693f9afc0cea2a3920b50f5002aba0104a91977 SHA256 f52ac3c08856745e3946534371f52c0f3d7b3b864f452dfcc958f5fb946f085a
+MD5 f2a46a602c8e3c3a42ecb16cb573dc20 acml-3.6.1-r1.ebuild 5183
+RMD160 06d5363d56feae7bb84cb300c4324de533ea8db6 acml-3.6.1-r1.ebuild 5183
+SHA256 f52ac3c08856745e3946534371f52c0f3d7b3b864f452dfcc958f5fb946f085a acml-3.6.1-r1.ebuild 5183
+EBUILD acml-4.0.1.ebuild 4866 RMD160 c850b1d5130aef954002db1eab6c1c34660a072d SHA1 641d949c4e4ebf5f08182ed75818edaf2dadfb86 SHA256 0ea0b6f380e6dd33a44076a9a6956d29009e5ce7292bf37306d485746269ba7b
+MD5 75f85ee687c3eaddac0a7084d0a9fc70 acml-4.0.1.ebuild 4866
+RMD160 c850b1d5130aef954002db1eab6c1c34660a072d acml-4.0.1.ebuild 4866
+SHA256 0ea0b6f380e6dd33a44076a9a6956d29009e5ce7292bf37306d485746269ba7b acml-4.0.1.ebuild 4866
+MISC ChangeLog 6180 RMD160 5deb0f1f03b645a5204694b3e9c8b4ba61a408f7 SHA1 27077a607068d1267a4405768e07d66e1f18a47d SHA256 36afe659996171d336d0f6a34e4d7b623fe10ac88c9ae224500deb4466bb7378
+MD5 2e1f92cf480058a4d6510e4ed48da519 ChangeLog 6180
+RMD160 5deb0f1f03b645a5204694b3e9c8b4ba61a408f7 ChangeLog 6180
+SHA256 36afe659996171d336d0f6a34e4d7b623fe10ac88c9ae224500deb4466bb7378 ChangeLog 6180
 MISC metadata.xml 812 RMD160 878a52e199a177a1dade27a1ebfdf623a42b7e5d SHA1 24e5f44c01dfc65ac8c699015bb649abf29efcaf SHA256 3597c6694fc8b1f7b57103ffd799dfa077c29444c31d6a5be43ebc0198636cae
 MD5 641da49ad8af7b972fd48e3860941574 metadata.xml 812
 RMD160 878a52e199a177a1dade27a1ebfdf623a42b7e5d metadata.xml 812
@@ -52,16 +45,13 @@ SHA256 47bd4eee1e3dfc0f1b508ce5a41054c23089bb9b9d7add427abcdc24942a1887 files/di
 MD5 f822ee466ea41e1f6900d64b52a495c6 files/digest-acml-3.6.1-r1 840
 RMD160 47a3138d09b475dcfe429b1ac3fc9c8a31bee749 files/digest-acml-3.6.1-r1 840
 SHA256 b1ab60561ac029d5f444f7c4b5c7c7dc1793f89ae5ec1b20baa7d4bfdb10a025 files/digest-acml-3.6.1-r1 840
-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 v2.0.7 (GNU/Linux)
 
-iD8DBQFHcRHgyuNVb5qfaOYRAqQAAJsG4ExBViAm4/qRm6wootmm1xfNNACfYjQf
-fVBt7TCfKeDS2E5n9Quz+JA=
-=guqj
+iD8DBQFHg0Z31ycZbhPLE2ARAuALAKCuDi0wvBRYB3MfNRyX0GFHHnkh4gCbBGNu
+CgBijUKyw6QjAO6fhWh3beg=
+=s5gt
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-3.6.0-r1.ebuild b/sci-libs/acml/acml-3.6.0-r1.ebuild
index 4f34d42d9da8..7d0349efe685 100644
--- a/sci-libs/acml/acml-3.6.0-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.7 2008/01/08 09:46:17 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -109,7 +109,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
+				-e "s:@ACMLDIR@:${acmldir}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
@@ -127,7 +127,6 @@ src_install() {
 			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
 		done
 		echo "LDPATH=${instdir}/${fort}/lib" > 35acml
-		echo "INCLUDE=${instdir}/${fort}/include" >> 35acml
 	done
 
 	doenvd 35acml || die "doenvd failed"
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index c5b422fcc994..2b2bc7f5ed76 100644
--- a/sci-libs/acml/acml-3.6.1-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.6 2007/12/19 19:30:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.7 2008/01/08 09:46:17 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -125,7 +125,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
+				-e "s:@ACMLDIR@:${acmldir}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
@@ -143,7 +143,6 @@ src_install() {
 			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
 		done
 		echo "LDPATH=${acmldir}/lib" > "${S}"/35acml
-		echo "INCLUDE=${acmldir}/include" >> "${S}"/35acml
 	done
 
 	doenvd "${S}"/35acml || die "doenvd failed"
diff --git a/sci-libs/acml/acml-4.0.0.ebuild b/sci-libs/acml/acml-4.0.0.ebuild
deleted file mode 100644
index 289fa8e89497..000000000000
--- a/sci-libs/acml/acml-4.0.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.0.ebuild,v 1.5 2007/11/21 00:25:36 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 ;;
-		ifc|ifort) 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
-		echo "INCLUDE=${instdir}/${fort}/include" >> 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.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
index a1a80bc1e531..e7fc3726243e 100644
--- a/sci-libs/acml/acml-4.0.1.ebuild
+++ b/sci-libs/acml/acml-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.2 2007/12/19 13:03:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.3 2008/01/08 09:46:17 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -108,8 +108,8 @@ src_install() {
 		ESELECT_PROF=acml-${FORTRANC}
 		local acmldir=${instdir}/${fort}
 		local libname=${acmldir}/lib/libacml
-		local extlibs
-		local extflags
+		local extlibs=
+		local extflags=
 		if [[ ${fort} =~ int64 ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-int64
 			extflags="${extflags} -fdefault-integer-8"
@@ -125,7 +125,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
+				-e "s:@ACMLDIR@:${acmldir}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
diff --git a/sci-libs/acml/files/blas.pc.in b/sci-libs/acml/files/blas.pc.in
index 12836e6a5998..d9f7f4087943 100644
--- a/sci-libs/acml/files/blas.pc.in
+++ b/sci-libs/acml/files/blas.pc.in
@@ -1,10 +1,11 @@
-prefix=/usr
+prefix=@ACMLDIR@
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/lib
+includedir=${prefix}/include
 
 Name: blas
 Description: ACML implementations of the Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L@ACMLDIR@ -lblas -lacml_mv @EXTLIBS@
+Libs: -L${libdir} -lblas -lacml_mv @EXTLIBS@
 Cflags: @EXTFLAGS@
diff --git a/sci-libs/acml/files/digest-acml-4.0.0 b/sci-libs/acml/files/digest-acml-4.0.0
deleted file mode 100644
index 3d884d84518b..000000000000
--- a/sci-libs/acml/files/digest-acml-4.0.0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 50879e5fa9cafc7a9badde44037f55ab acml-4-0-0-gfortran-64bit-int64.tgz 21881646
-RMD160 65d3d4ca146ade1781efb43ca35c80cc85387c90 acml-4-0-0-gfortran-64bit-int64.tgz 21881646
-SHA256 eda0b3c1350716509b1d244641200edca30faaae42c7b7b3873f573b4036f1f6 acml-4-0-0-gfortran-64bit-int64.tgz 21881646
-MD5 47f15966a5ed81243350d31afdd4e7f6 acml-4-0-0-gfortran-64bit.tgz 22559682
-RMD160 cd9042e882fb4e8c1f5951e8eb2880d035ab14ea acml-4-0-0-gfortran-64bit.tgz 22559682
-SHA256 3a7300dd9f7a494177baddd8bc34375daf80e550f5b6edb9539ed966adb80f11 acml-4-0-0-gfortran-64bit.tgz 22559682
-MD5 175b1968c5a3279cb7ebfab7018c0b82 acml-4-0-0-ifort-64bit.tgz 26676345
-RMD160 2f4a1f14a55ac3334fd3fc045355a4fdebf2e87f acml-4-0-0-ifort-64bit.tgz 26676345
-SHA256 090f64a5fe309c6ed2ee9bcf7ae73687e0577a02da9f8ceabd4e5315fecb4769 acml-4-0-0-ifort-64bit.tgz 26676345
diff --git a/sci-libs/acml/files/lapack.pc.in b/sci-libs/acml/files/lapack.pc.in
index 65763893ac8f..d2453f180759 100644
--- a/sci-libs/acml/files/lapack.pc.in
+++ b/sci-libs/acml/files/lapack.pc.in
@@ -1,10 +1,11 @@
-prefix=/usr
+prefix=@ACMLDIR@
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/lib
+includedir=${prefix}/include
 
 Name: lapack
 Description: ACML implementation of the F77 Linear Algebra PACKage
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L@ACMLDIR@ -llapack -lacml_mv @EXTLIBS@
+Libs: -L${libdir} -llapack -lacml_mv @EXTLIBS@
 Cflags: @EXTFLAGS@