Removed version 2.1.0. Marked stable version 2.5.0. Bumped to version 2.7.0.

(Portage version: 2.0.51.22-r2)

6 files changed, 36 insertions, 40 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index f5b366c6d928..a9f21000259d 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.3 2005/04/03 15:23:48 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.4 2005/08/31 21:33:40 kugelfang Exp $
+
+*acml-2.7.0 (31 Aug 2005)
+
+  31 Aug 2005; Danny van Dyk <kugelfang@gentoo.org> -acml-2.1.0.ebuild,
+  acml-2.5.0.ebuild, +acml-2.7.0.ebuild:
+  Removed version 2.1.0. Marked stable version 2.5.0. Bumped to version 2.7.0.
 
 *acml-2.5.0 (03 Apr 2005)
 
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index e10fd1ebed08..1ee99d1e7b08 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 245ae524374b3b759298eb17744790e0 ChangeLog 888
-MD5 4a5e4b2ee4034b19d7a6c04686fcb98f acml-2.1.0.ebuild 1721
+MD5 e4c87203616dfa34401026607cd2ede8 acml-2.7.0.ebuild 1706
 MD5 a42a87565bfb006095c3fa658c84b275 metadata.xml 879
-MD5 155bf9300a9067db07dceb2e240a9628 acml-2.5.0.ebuild 1721
+MD5 10c2d816fef2d8520c63dffb8f114d04 acml-2.5.0.ebuild 1719
+MD5 245ae524374b3b759298eb17744790e0 ChangeLog 888
 MD5 e92e9b2507e25e7826de1be1cce7c7ae files/c-ACML.blas 465
-MD5 3b43533f073305dc2ed60f13091025a0 files/digest-acml-2.1.0 134
+MD5 3c4c90e3f371d9be4feaa163e1a3c5e8 files/digest-acml-2.7.0 141
 MD5 ed54e2d6cb585bafe8a23f0a5d07c02b files/f77-ACML.blas 430
 MD5 035015e5be8999d26202cfb042029acc files/f77-ACML.lapack 441
 MD5 991ee1ce068d43f39da5177877a6b4ee files/digest-acml-2.5.0 134
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFClwCB5mJXAu5GbtIRAmuIAJ47lFvaz48LhVdNf74yyrxULRnIyACfdozL
-M81T93YeINM0D1rdc+9YD7Y=
-=eeXj
------END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-2.5.0.ebuild b/sci-libs/acml/acml-2.5.0.ebuild
index 3c668b59c118..7fe41cb64485 100644
--- a/sci-libs/acml/acml-2.5.0.ebuild
+++ b/sci-libs/acml/acml-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1 2005/04/03 15:23:48 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-2.5.0.ebuild,v 1.2 2005/08/31 21:33:40 kugelfang Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="amd64? ( acml-64bit-${MY_PV}.tgz )
 RESTRICT="fetch nostrip"
 IUSE=""
 LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 RDEPEND="virtual/libc
 	sci-libs/blas-config
diff --git a/sci-libs/acml/acml-2.1.0.ebuild b/sci-libs/acml/acml-2.7.0.ebuild
index a5ee84525793..a3cf81fc1577 100644
--- a/sci-libs/acml/acml-2.1.0.ebuild
+++ b/sci-libs/acml/acml-2.7.0.ebuild
@@ -1,42 +1,42 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-2.1.0.ebuild,v 1.3 2005/04/03 15:23:48 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-2.7.0.ebuild,v 1.1 2005/08/31 21:33:40 kugelfang Exp $
 
 inherit eutils
 
 DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://www.developwithamd.com/appPartnerProg/acml/forms/index.cfm?action=home"
+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 )"
+SRC_URI="amd64? ( acml-${MY_PV}-gnu-64bit.tgz )
+	x86? ( acml-${MY_PV}-gnu-32bit.tgz )"
 RESTRICT="fetch nostrip"
-IUSE=""
+IUSE="sse sse2"
 LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 SLOT="0"
 RDEPEND="virtual/libc
-	sci-libs/blas-config
-	sci-libs/lapack-config"
+	app-admin/eselect"
 PROVIDE="virtual/blas
 	virtual/lapack"
 
 src_unpack() {
 	unpack ${A}
-	if [ "${ARCH}" == "amd64" ]; then
-		export SUFFIX="64"
-	else
-		export SUFFIX="32"
+	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${SUFFIX}.tgz)
+	(DISTDIR="${S}" unpack contents-acml-${MY_PV}-gnu-${BITS}bit.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() {
@@ -50,11 +50,11 @@ src_install() {
 
 	# Headers
 	mkdir -p ${D}/usr/include/acml/
-	cp ${S}/gnu${SUFFIX}/include/* ${D}/usr/include/acml/
+	cp ${S}/gnu${BITS}${SUFFIX}/include/* ${D}/usr/include/acml/
 
 	# Libraries
 	mkdir -p ${D}/usr/$(get_libdir)/
-	cp ${S}/gnu${SUFFIX}/lib/* ${D}/usr/$(get_libdir)/
+	cp ${S}/gnu${BITS}${SUFFIX}/lib/* ${D}/usr/$(get_libdir)/
 	unset SUFFIX
 
 	# Configfiles
@@ -67,7 +67,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo "To use ACML's BLAS features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/blas-config ACML"
+	einfo "\n\t/usr/bin/eclectic blas set ACML"
 	einfo "To use ACML's LAPACK features, you have to issue (as root):"
-	einfo "\n\t/usr/bin/lapack-config ACML"
+	einfo "\n\t/usr/bin/eclectic lapack set ACML"
 }
diff --git a/sci-libs/acml/files/digest-acml-2.1.0 b/sci-libs/acml/files/digest-acml-2.1.0
deleted file mode 100644
index 646c58d9e66c..000000000000
--- a/sci-libs/acml/files/digest-acml-2.1.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dd459804fb8fbf50005614bfc73e8016 acml-64bit-2-1-0.tgz 25311085
-MD5 39391a716a449651d90988bab1931f85 acml-32bit-2-1-0.tgz 51496942
diff --git a/sci-libs/acml/files/digest-acml-2.7.0 b/sci-libs/acml/files/digest-acml-2.7.0
new file mode 100644
index 000000000000..5d5e13960108
--- /dev/null
+++ b/sci-libs/acml/files/digest-acml-2.7.0
@@ -0,0 +1,2 @@
+MD5 64efbea743c396658a6e6f52305500ac acml-2-7-0-gnu-64bit.tgz 9414564
+MD5 37c93acc41441a30d6f9190f211a8381 acml-2-7-0-gnu-32bit.tgz 23223016