7 files changed, 14 insertions, 266 deletions
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 28168e5612ef..a5c411c7010f 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX c-ACML.blas 465 RMD160 71b32038e97db51ff63ca9090bc1b3cd759c1768 SHA1 4110d471675aa5821bf862b9658d6c0509e98c54 SHA256 3f784a81417fc88dcbfc4bbf4b2497eeef5b1f88084ea5b948725c1aa54ef3fd
 MD5 e92e9b2507e25e7826de1be1cce7c7ae files/c-ACML.blas 465
 RMD160 71b32038e97db51ff63ca9090bc1b3cd759c1768 files/c-ACML.blas 465
@@ -22,22 +25,10 @@ AUX f77-ACML.lapack 441 RMD160 d51ae2b9561c40a9d5402077e30766bfb00cab80 SHA1 e2d
 MD5 035015e5be8999d26202cfb042029acc files/f77-ACML.lapack 441
 RMD160 d51ae2b9561c40a9d5402077e30766bfb00cab80 files/f77-ACML.lapack 441
 SHA256 b3a2a05d934e1826868399b6d6a5717d96136c36dc411ab2d0581d96e12de3c0 files/f77-ACML.lapack 441
-DIST acml-2-7-0-gnu-32bit.tgz 23223016
-DIST acml-2-7-0-gnu-64bit.tgz 9414564
 DIST acml-3-0-0-gnu-32bit.tgz 24117886
 DIST acml-3-0-0-gnu-64bit.tgz 9995385 RMD160 b3f979e6c303207bc22bdcb5057fd7e4aded51e9 SHA1 aaa0efbd314c69ce5b8112bd5997a9950343f98e SHA256 c9c447f871134214ffc363d4b8f2b4df1c4ccbb82e8b4e4c90601d01a7c745e5
 DIST acml-3-1-0-gnu-32bit.tgz 24132771 RMD160 45530e58db9cc6ff31721cca1f440a852ca6a2a9 SHA1 902f14ea0accb659deab4c2552f4ecf06bb9ad37 SHA256 32581925aad8df6449453cc62eeaa28a07b6c081b625a8a77e985859466e05de
 DIST acml-3-1-0-gnu-64bit.tgz 10052069 RMD160 6b32df6645068299e3905b5758c16dc1f21960e3 SHA1 a8334109b8a723f8a1e338b611c48d9951826882 SHA256 0d0002310297d03efff198bcc3204b5f690e9387f959d8bd8b78a0e4ca0f2f14
-DIST acml-32bit-2-5-0.tgz 51348288
-DIST acml-64bit-2-5-0.tgz 25893994
-EBUILD acml-2.5.0.ebuild 1733 RMD160 e0f54414d42a0da4631bc0254117a317cd11784e SHA1 cde7b9aca29c7fded1cde4816b1e3504f9e9d5b6 SHA256 c2b4bc6c73530c0d81a926a0cbc794637fadb373354933a79e6b23c3ee706bae
-MD5 bd5fb4ea9095f20c4cf136f06a45ef23 acml-2.5.0.ebuild 1733
-RMD160 e0f54414d42a0da4631bc0254117a317cd11784e acml-2.5.0.ebuild 1733
-SHA256 c2b4bc6c73530c0d81a926a0cbc794637fadb373354933a79e6b23c3ee706bae acml-2.5.0.ebuild 1733
-EBUILD acml-2.7.0.ebuild 1766 RMD160 8d799eaa13310b9424b2db6f62033c86b0dc2704 SHA1 f8a30b93c5d562a29ccb3ee5c8f99c50faa7b6c2 SHA256 3b51c4c12cfbdf7e708df1991c2a380c01f13413eb100421ad407e51b71596e1
-MD5 8a6ccaf4a74f1acbe2af70dcd6361153 acml-2.7.0.ebuild 1766
-RMD160 8d799eaa13310b9424b2db6f62033c86b0dc2704 acml-2.7.0.ebuild 1766
-SHA256 3b51c4c12cfbdf7e708df1991c2a380c01f13413eb100421ad407e51b71596e1 acml-2.7.0.ebuild 1766
 EBUILD acml-3.0.0.ebuild 1846 RMD160 5ee3db8e91f7899915d60fdce14b7b40ddd6b31f SHA1 a80974232851378660ee5bee159ae97f55eac4db SHA256 fa8055de001feff29531ae264af718f39902725084bdf9871f88c111ad2507e7
 MD5 489c42e9589e445ff005b6ef91a24771 acml-3.0.0.ebuild 1846
 RMD160 5ee3db8e91f7899915d60fdce14b7b40ddd6b31f acml-3.0.0.ebuild 1846
@@ -46,30 +37,24 @@ EBUILD acml-3.1.0-r1.ebuild 2223 RMD160 61ad9b824a924d9cf403ed4fff04a66495f4fcd7
 MD5 4de0d3696313d02840d78a31b4c659b1 acml-3.1.0-r1.ebuild 2223
 RMD160 61ad9b824a924d9cf403ed4fff04a66495f4fcd7 acml-3.1.0-r1.ebuild 2223
 SHA256 2024e4b182d5f6ed35966d32704b8f11f3f55a25828bf61dafce617176595a47 acml-3.1.0-r1.ebuild 2223
-EBUILD acml-3.1.0.ebuild 1848 RMD160 b3e63371a02e699a5684a4139e1e1fce581204a7 SHA1 94069b8535cc77b524882ff93b362ba3f0d9a593 SHA256 9cc6abfd562563dd347b27f26ff900e2c6626b5d3599cd89a2b1f1edc658155f
-MD5 ff84a125530a23b3f078af1a32d1a50e acml-3.1.0.ebuild 1848
-RMD160 b3e63371a02e699a5684a4139e1e1fce581204a7 acml-3.1.0.ebuild 1848
-SHA256 9cc6abfd562563dd347b27f26ff900e2c6626b5d3599cd89a2b1f1edc658155f acml-3.1.0.ebuild 1848
-MISC ChangeLog 2752 RMD160 6fd53f413d0707a604ed20621b71c291da541e0f SHA1 e65b0bb2bbf0f4b0685d7725529b69d71eba62a7 SHA256 4f1607e175acacdcd65068f164f88e50c7b8b57d3ddec0eda0b5a7891683640d
-MD5 9e7bbf699ebfd3e51cbeae6e1686cf16 ChangeLog 2752
-RMD160 6fd53f413d0707a604ed20621b71c291da541e0f ChangeLog 2752
-SHA256 4f1607e175acacdcd65068f164f88e50c7b8b57d3ddec0eda0b5a7891683640d ChangeLog 2752
+MISC ChangeLog 2896 RMD160 57d012eb74d9cf1218b3c86c5933a33cff9b2710 SHA1 16f897f8ac77a47626ffd40118420850d1028b8c SHA256 7ec6be20b46c76c9bdf396be8197fc67df472fe90f9163788352e44548d269d9
+MD5 08e08ea2567300ec07db5ef49e3f9379 ChangeLog 2896
+RMD160 57d012eb74d9cf1218b3c86c5933a33cff9b2710 ChangeLog 2896
+SHA256 7ec6be20b46c76c9bdf396be8197fc67df472fe90f9163788352e44548d269d9 ChangeLog 2896
 MISC metadata.xml 879 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f SHA1 375f02d5d2550aa144c759818140e7f1c55de278 SHA256 a2b244cea577e4260368dad481a0b5886a471185f966288bc58af29fb335fe74
 MD5 a42a87565bfb006095c3fa658c84b275 metadata.xml 879
 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f metadata.xml 879
 SHA256 a2b244cea577e4260368dad481a0b5886a471185f966288bc58af29fb335fe74 metadata.xml 879
-MD5 991ee1ce068d43f39da5177877a6b4ee files/digest-acml-2.5.0 134
-RMD160 aff8afc550514cad1ee47c40b374fbb1d9d6fbaa files/digest-acml-2.5.0 134
-SHA256 72a146f41eb03e652daff242495742c2081819b82054d2b7e2b0d9b11a7938cb files/digest-acml-2.5.0 134
-MD5 3c4c90e3f371d9be4feaa163e1a3c5e8 files/digest-acml-2.7.0 141
-RMD160 b5181852b22c707ef196198975d18846565a06f4 files/digest-acml-2.7.0 141
-SHA256 b145179f1bd5f474050862e599b2fe866ad85585c67be65706a15ec54c5b2245 files/digest-acml-2.7.0 141
 MD5 18f2443a23cff3b908ee2b7797f654d9 files/digest-acml-3.0.0 327
 RMD160 32bd6ccf022116f9d7c44bdb6ec475adf7559233 files/digest-acml-3.0.0 327
 SHA256 3df29798529d89b42aa78b2c512a8506e7ba8c7283c385f825dde4498958071f files/digest-acml-3.0.0 327
-MD5 a7cd760fb34a3f70b2f1cd76c4ee794e files/digest-acml-3.1.0 518
-RMD160 92c9e2afa50e9ea265fd1e73f175a3a55fc588af files/digest-acml-3.1.0 518
-SHA256 6b247371ce9a1a190f833759fc570bc065870f0e0a9bdcd406a001541e933887 files/digest-acml-3.1.0 518
 MD5 a7cd760fb34a3f70b2f1cd76c4ee794e files/digest-acml-3.1.0-r1 518
 RMD160 92c9e2afa50e9ea265fd1e73f175a3a55fc588af files/digest-acml-3.1.0-r1 518
 SHA256 6b247371ce9a1a190f833759fc570bc065870f0e0a9bdcd406a001541e933887 files/digest-acml-3.1.0-r1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFFoaBL5mJXAu5GbtIRAmc1AJ9GMSrVmEUH3QUvY3bwt5KAJ6WvfgCeLlgU
+JjMFN0/zgfoYrSE6Uk5yMjA=
+=7+SU
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-2.5.0.ebuild b/sci-libs/acml/acml-2.5.0.ebuild
deleted file mode 100644
index 62aedefee226..000000000000
--- a/sci-libs/acml/acml-2.5.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-2.5.0.ebuild,v 1.4 2006/05/15 15:41:59 spyderous Exp $
-
-inherit eutils
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.aspx"
-
-MY_PV=${PV//\./\-}
-S=${WORKDIR}
-
-SRC_URI="amd64? ( acml-64bit-${MY_PV}.tgz )
-	x86? ( acml-32bit-${MY_PV}.tgz )"
-RESTRICT="fetch nostrip"
-IUSE=""
-LICENSE="ACML"
-KEYWORDS="amd64 x86"
-SLOT="0"
-RDEPEND="virtual/libc
-	sci-libs/blas-config
-	sci-libs/lapack-config"
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-src_unpack() {
-	unpack ${A}
-	if [ "${ARCH}" == "amd64" ]; then
-		export SUFFIX="64"
-	else
-		export SUFFIX="32"
-	fi
-	(DISTDIR="${S}" unpack contents${SUFFIX}.tgz)
-
-	# Remove non-gnu libraries...
-	# TODO: probably a useflag for non-gnu libraries to be used ?
-	rm -Rf ${S}/pgi* install*.sh README*
-	mv Doc doc
-
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	# Documentation
-	cd ${S}/doc
-	dodoc acml.*
-
-	# Headers
-	mkdir -p ${D}/usr/include/acml/
-	cp ${S}/gnu${SUFFIX}/include/* ${D}/usr/include/acml/
-	cd ${D}/usr/include
-	ln -s acml/acml.h acml.h
-
-	# Libraries
-	mkdir -p ${D}/usr/$(get_libdir)/
-	cp ${S}/gnu${SUFFIX}/lib/* ${D}/usr/$(get_libdir)/
-	unset SUFFIX
-
-	# Configfiles
-	mkdir -p ${D}/usr/$(get_libdir)/{blas,lapack}
-	for x in ${FILESDIR}/*.{blas,lapack}; do
-		y="$(basename $x)"
-		cp $x ${D}/usr/$(get_libdir)/${y/*\.}/${y/\.*}
-	done
-}
-
-pkg_postinst() {
-	einfo "To use ACML's BLAS features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/eselect blas set ACML"
-	einfo "To use ACML's LAPACK features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/eselect lapack set ACML"
-}
diff --git a/sci-libs/acml/acml-2.7.0.ebuild b/sci-libs/acml/acml-2.7.0.ebuild
deleted file mode 100644
index 9380ce6911a8..000000000000
--- a/sci-libs/acml/acml-2.7.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-2.7.0.ebuild,v 1.3 2006/05/10 18:37:21 kugelfang Exp $
-
-inherit eutils
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.aspx"
-
-MY_PV=${PV//\./\-}
-S=${WORKDIR}
-
-SRC_URI="amd64? ( acml-${MY_PV}-gnu-64bit.tgz )
-	x86? ( acml-${MY_PV}-gnu-32bit.tgz )"
-RESTRICT="fetch nostrip"
-IUSE="sse sse2"
-LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-RDEPEND="virtual/libc
-	>=app-admin/eselect-1.0_rc2"
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-src_unpack() {
-	unpack ${A}
-	if [ "${ARCH}" == "amd64" ] ; then
-		export BITS="64"
-	elif [ "${ARCH}" == "x86" ] ; then
-		export BITS="32"
-		if ! use sse2 ; then
-			use sse \
-				&& export SUFFIX="_nosse2" \
-				|| export SUFFIX="_nosse"
-		fi
-	fi
-	(DISTDIR="${S}" unpack contents-acml-${MY_PV}-gnu-${BITS}bit.tgz)
-
-	mv Doc doc
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	# Documentation
-	cd ${S}/doc
-	dodoc acml.*
-
-	# Headers
-	mkdir -p ${D}/usr/include/acml/
-	cp ${S}/gnu${BITS}${SUFFIX}/include/* ${D}/usr/include/acml/
-	cd ${D}/usr/include
-	ln -s acml/acml.h acml.h
-
-	# Libraries
-	mkdir -p ${D}/usr/$(get_libdir)/
-	cp ${S}/gnu${BITS}${SUFFIX}/lib/* ${D}/usr/$(get_libdir)/
-	unset SUFFIX
-
-	# Configfiles
-	mkdir -p ${D}/usr/$(get_libdir)/{blas,lapack}
-	for x in ${FILESDIR}/*.{blas,lapack}; do
-		y="$(basename $x)"
-		cp $x ${D}/usr/$(get_libdir)/${y/*\.}/${y/\.*}
-	done
-}
-
-pkg_postinst() {
-	einfo "To use ACML's BLAS features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/eselect blas set ACML"
-	einfo "To use ACML's LAPACK features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/eselect lapack set ACML"
-}
diff --git a/sci-libs/acml/acml-3.1.0.ebuild b/sci-libs/acml/acml-3.1.0.ebuild
deleted file mode 100644
index a88ef2b9101d..000000000000
--- a/sci-libs/acml/acml-3.1.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.1.0.ebuild,v 1.2 2006/05/10 18:37:21 kugelfang Exp $
-
-inherit eutils
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.aspx"
-
-MY_PV=${PV//\./\-}
-S=${WORKDIR}
-
-SRC_URI="amd64? ( acml-${MY_PV}-gnu-64bit.tgz )
-	x86? ( acml-${MY_PV}-gnu-32bit.tgz )"
-RESTRICT="fetch nostrip"
-IUSE="sse sse2"
-LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-RDEPEND="virtual/libc
-	>=app-admin/eselect-1.0_rc2"
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-src_unpack() {
-	unpack ${A}
-	if [ "${ARCH}" == "amd64" ] ; then
-		export BITS="64"
-	elif [ "${ARCH}" == "x86" ] ; then
-		export BITS="32"
-		if ! use sse2 ; then
-			use sse \
-				&& export SUFFIX="_nosse2" \
-				|| export SUFFIX="_nosse"
-		fi
-	fi
-	(DISTDIR="${S}" unpack contents-acml-${MY_PV}-gnu-${BITS}bit.tgz)
-
-	mv Doc doc
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	# Documentation
-	cd ${S}/doc
-	dodoc acml.*
-
-	# Headers
-	mkdir -p ${D}/usr/include/acml/
-	cp ${S}/gnu${BITS}${SUFFIX}/include/* ${D}/usr/include/acml/ \
-		|| die "Could not copy header file"
-	cd ${D}/usr/include
-	ln -s acml/acml.h acml.h
-
-	# Libraries
-	mkdir -p ${D}/usr/$(get_libdir)/
-	cp ${S}/gnu${BITS}${SUFFIX}/lib/* ${D}/usr/$(get_libdir)/ \
-		|| die "Could not copy library files"
-	unset SUFFIX
-
-	# Configfiles
-	mkdir -p ${D}/usr/$(get_libdir)/{blas,lapack}
-	for x in ${FILESDIR}/*.{blas,lapack}; do
-		y="$(basename $x)"
-		cp $x ${D}/usr/$(get_libdir)/${y/*\.}/${y/\.*}
-	done
-}
-
-pkg_postinst() {
-	einfo "To use ACML's BLAS features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/eselect blas set ACML"
-	einfo "To use ACML's LAPACK features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/eselect lapack set ACML"
-}
diff --git a/sci-libs/acml/files/digest-acml-2.5.0 b/sci-libs/acml/files/digest-acml-2.5.0
deleted file mode 100644
index 811de400ad4b..000000000000
--- a/sci-libs/acml/files/digest-acml-2.5.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48a96211b5af7413d45dc8a06767906b acml-64bit-2-5-0.tgz 25893994
-MD5 d4fa77b6e6ca9625f9c6a61fc7d919a0 acml-32bit-2-5-0.tgz 51348288
diff --git a/sci-libs/acml/files/digest-acml-2.7.0 b/sci-libs/acml/files/digest-acml-2.7.0
deleted file mode 100644
index 5d5e13960108..000000000000
--- a/sci-libs/acml/files/digest-acml-2.7.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 64efbea743c396658a6e6f52305500ac acml-2-7-0-gnu-64bit.tgz 9414564
-MD5 37c93acc41441a30d6f9190f211a8381 acml-2-7-0-gnu-32bit.tgz 23223016
diff --git a/sci-libs/acml/files/digest-acml-3.1.0 b/sci-libs/acml/files/digest-acml-3.1.0
deleted file mode 100644
index 39d53cbafbbd..000000000000
--- a/sci-libs/acml/files/digest-acml-3.1.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fe959ed7661a2b275d92a7e83c7e2b3f acml-3-1-0-gnu-32bit.tgz 24132771
-RMD160 45530e58db9cc6ff31721cca1f440a852ca6a2a9 acml-3-1-0-gnu-32bit.tgz 24132771
-SHA256 32581925aad8df6449453cc62eeaa28a07b6c081b625a8a77e985859466e05de acml-3-1-0-gnu-32bit.tgz 24132771
-MD5 15e933002e5c6c147c15194b5f619093 acml-3-1-0-gnu-64bit.tgz 10052069
-RMD160 6b32df6645068299e3905b5758c16dc1f21960e3 acml-3-1-0-gnu-64bit.tgz 10052069
-SHA256 0d0002310297d03efff198bcc3204b5f690e9387f959d8bd8b78a0e4ca0f2f14 acml-3-1-0-gnu-64bit.tgz 10052069