Removed old versions. Work around eselect bug #189942.

(Portage version: 2.1.3.12)

21 files changed, 39 insertions, 548 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 2dfc5e241892..28bc3c10cf86 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,14 @@
 # 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.22 2007/10/08 20:47:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.23 2007/10/09 22:06:21 bicatali Exp $
+
+  09 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> -files/c-ACML.blas,
+  -files/eselect.blas, -files/eselect.blas-mp, -files/eselect.cblas,
+  -files/eselect.cblas-mp, -files/eselect.lapack, -files/eselect.lapack-mp,
+  -files/f77-ACML.blas, -files/f77-ACML.lapack, -acml-3.0.0.ebuild,
+  -acml-3.1.0-r1.ebuild, -acml-3.6.0.ebuild, acml-3.6.0-r1.ebuild,
+  -acml-3.6.1.ebuild, acml-3.6.1-r1.ebuild, acml-4.0.0.ebuild:
+  Removed old versions. Work around eselect bug #189942.
 
 *acml-4.0.0 (08 Oct 2007)
 *acml-3.6.1-r1 (08 Oct 2007)
@@ -112,4 +120,3 @@
   +files/c-ACML.blas, +files/f77-ACML.blas, +files/f77-ACML.lapack,
   +acml-2.1.0.ebuild:
   Initial Import.
-
diff --git a/sci-libs/acml/acml-3.0.0.ebuild b/sci-libs/acml/acml-3.0.0.ebuild
deleted file mode 100644
index ab501d4455d0..000000000000
--- a/sci-libs/acml/acml-3.0.0.ebuild
+++ /dev/null
@@ -1,77 +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-3.0.0.ebuild,v 1.5 2007/07/02 15:25:55 peper 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 strip"
-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/acml-3.1.0-r1.ebuild b/sci-libs/acml/acml-3.1.0-r1.ebuild
deleted file mode 100644
index 8d376b0e4f26..000000000000
--- a/sci-libs/acml/acml-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,89 +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-3.1.0-r1.ebuild,v 1.5 2007/07/02 15:25:55 peper 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 strip"
-IUSE="sse sse2"
-LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-RDEPEND="virtual/libc
-	app-admin/eselect-blas
-	app-admin/eselect-cblas
-	app-admin/eselect-lapack"
-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
-
-	# eselect files
-	eselect blas add $(get_libdir) ${FILESDIR}/eselect.blas acml
-	eselect cblas add $(get_libdir) ${FILESDIR}/eselect.cblas acml
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack acml
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect blas show)" ]]; then
-		eselect blas set acml
-	fi
-	if [[ -z "$(eselect cblas show)" ]]; then
-		eselect cblas set acml
-	fi
-	if [[ -z "$(eselect lapack show)" ]]; then
-		eselect lapack set acml
-	fi
-
-	elog "To use ACML's BLAS features, you have to issue (as root):"
-	elog "\n\teselect blas set acml"
-	elog "To use ACML's CBLAS features, you have to issue (as root):"
-	elog "\n\teselect cblas set acml"
-	elog "To use ACML's LAPACK features, you have to issue (as root):"
-	elog "\n\teselect lapack set acml"
-}
diff --git a/sci-libs/acml/acml-3.6.0-r1.ebuild b/sci-libs/acml/acml-3.6.0-r1.ebuild
index 699a21ed10eb..3bbcb7744beb 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
 # 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.1 2007/10/08 20:47:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.2 2007/10/09 22:06:21 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -45,8 +45,8 @@ pkg_nofetch() {
 pkg_setup() {
 	elog "From version 3.5.0 on, ACML no longer supports"
 	elog "hardware without SSE/SSE2 instructions. "
-	elog "For older 32-bit hardware that does not support SSE/SSE2,"
-	elog "you must continue to use an older version (ACML 3.1.0 and ealier)."
+	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."
 	epause
 	FORTRAN=ifc
 	FORT=ifort
@@ -137,14 +137,15 @@ EOF
 
 pkg_postinst() {
 	for p in blas lapack; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# uncomment when eselect bug #189942 is fixed, together with DEPEND
-		#if [[ -z ${current_p} || ${current_p} == ${ESELECT_PROF} ]]; then
-		if [[ -z ${current_p} ]]; then
+		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}/lib/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_p}"
+			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
diff --git a/sci-libs/acml/acml-3.6.0.ebuild b/sci-libs/acml/acml-3.6.0.ebuild
deleted file mode 100644
index 39fce3ae68f8..000000000000
--- a/sci-libs/acml/acml-3.6.0.ebuild
+++ /dev/null
@@ -1,148 +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-3.6.0.ebuild,v 1.2 2007/07/02 15:25:55 peper Exp $
-
-inherit eutils toolchain-funcs fortran
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.jsp"
-
-MY_PV=${PV//\./\-}
-S=${WORKDIR}
-
-SRC_URI="amd64? ( ifc? ( acml-${MY_PV}-ifort-64bit.tgz )
-				!ifc? ( acml-${MY_PV}-gnu-64bit.tgz ) )
-	x86? ( ifc? ( acml-${MY_PV}-ifort-32bit.tgz )
-		!ifc? ( acml-${MY_PV}-gnu-32bit.tgz ) )"
-
-RESTRICT="fetch strip"
-IUSE="ifc openmp doc examples"
-LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	app-admin/eselect-lapack"
-
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-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"
-}
-
-pkg_setup() {
-	if use openmp && ! use ifc; then
-		eerror "Multi-processors ACML not available for g77 compiler"
-		eerror "Please either unset openmp USE flag, choose ifc or update acml"
-		die "setup openmp failed"
-	fi
-	elog "From version 3.5.0 on, ACML no longer supports"
-	elog "hardware without SSE/SSE2 instructions. "
-	elog "For older 32-bit hardware that does not support SSE/SSE2,"
-	elog "you must continue to use an older version (ACML 3.1.0 and ealier)."
-	epause
-	FORTRAN="g77"
-	use ifc && FORTRAN="ifc"
-	fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	local fort
-	case ${FORTRANC} in
-		g77)
-			fort=gnu
-			;;
-		ifc|ifort)
-			fort=ifort
-			;;
-		*)
-			eerror "Unsupported fortran compiler: $FORTRANC"
-			die
-			;;
-	esac
-	local bits="32"
-	use amd64 && bits="64"
-	ACMLDIR=${S}/${fort}${bits}
-	use openmp && ACMLDIR="${ACMLDIR} ${ACMLDIR}_smp"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-	return
-}
-
-src_test() {
-	for f in ${ACMLDIR}; do
-		einfo "Testing acml for $(basename ${f})"
-		for d in . acml_mv; do
-			cd "${f}/examples/${d}"
-			emake \
-				ACMLDIR="${f}" \
-				F77="${FORTRANC}" \
-				CC="$(tc-getCC)" \
-				CPLUSPLUS="$(tc-getCXX)" \
-				|| die "emake test in ${d} failed"
-			emake clean
-		done
-	done
-}
-
-src_install() {
-	# Libraries
-	for f in ${ACMLDIR}; do
-		dolib ${f}/lib/* || die "dolib failed"
-	done
-
-	# Headers (same openmp or not)
-	insinto /usr/include/acml
-	doins ${f}*/include/* || die "doins headers failed"
-	dosym acml/acml.h /usr/include/acml.h
-
-	# Documentation
-	dodoc ReleaseNotes*
-	cd ${S}/Doc
-	dodoc *.txt
-	doinfo *info*
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins acml.pdf
-		dohtml html/*
-	fi
-	if use examples; then
-		for f in ${ACMLDIR}; do
-			insinto "/usr/share/doc/${PF}/examples/$(basename ${f})"
-			doins -r ${f}/examples/*
-		done
-	fi
-
-	# eselect files
-	for l in blas cblas lapack; do
-		eselect ${l} add $(get_libdir) "${FILESDIR}"/eselect.${l} acml
-		use openmp && eselect ${l} add $(get_libdir) "${FILESDIR}"/eselect.${l}-mp acml-mp
-	done
-}
-
-pkg_postinst() {
-	# set acml if none are set yet
-	for l in blas cblas lapack; do
-		if [[ -z "$(eselect ${l} show)" ]]; then
-			if use openmp; then
-				eselect ${l} set acml-mp
-			else
-				eselect ${l} set acml
-			fi
-		fi
-		elog "To use ACML's BLAS features, you have to issue (as root):"
-		elog "\n\teselect ${l} set acml # or acml-mp for multi-processors\n"
-	done
-}
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index 7ae06fc40a19..73b6ed929118 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
 # 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.1 2007/10/08 20:47:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.2 2007/10/09 22:06:21 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -9,10 +9,9 @@ HOMEPAGE="http://developer.amd.com/acml.jsp"
 
 MY_PV=${PV//\./\-}
 S=${WORKDIR}
-SRC_URI="x86?     ( acml-${MY_PV}-gfortran-32bit.tgz )
-		 amd64? ( ( acml-${MY_PV}-gfortran-64bit.tgz )
-		   int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz ) )"
-
+SRC_URI="x86? ( acml-${MY_PV}-gfortran-32bit.tgz )
+	   amd64? ( acml-${MY_PV}-gfortran-64bit.tgz
+	   int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz ) )"
 
 RESTRICT="strip fetch"
 IUSE="openmp int64 doc examples"
@@ -40,8 +39,8 @@ pkg_nofetch() {
 pkg_setup() {
 	elog "From version 3.5.0 on, ACML no longer supports"
 	elog "hardware without SSE/SSE2 instructions. "
-	elog "For older 32-bit hardware that does not support SSE/SSE2,"
-	elog "you must continue to use an older version (ACML 3.1.0 and ealier)."
+	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."
 	FORTRAN="gfortran"
 	fortran_pkg_setup
 	if [[ ${FORTRANC} == gfortran ]]; then
@@ -153,14 +152,15 @@ EOF
 
 pkg_postinst() {
 	for p in blas lapack; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# uncomment when eselect bug #189942 is fixed, together with DEPEND
-		#if [[ -z ${current_p} || ${current_p} == ${ESELECT_PROF} ]]; then
-		if [[ -z ${current_p} ]]; then
+		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}/lib/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_p}"
+			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
diff --git a/sci-libs/acml/acml-3.6.1.ebuild b/sci-libs/acml/acml-3.6.1.ebuild
deleted file mode 100644
index 72a2e6a8675d..000000000000
--- a/sci-libs/acml/acml-3.6.1.ebuild
+++ /dev/null
@@ -1,112 +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-3.6.1.ebuild,v 1.2 2007/07/02 15:25:55 peper Exp $
-
-inherit eutils toolchain-funcs fortran
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.jsp"
-
-MY_PV=${PV//\./\-}
-S=${WORKDIR}
-SRC_URI="x86? ( acml-${MY_PV}-gfortran-32bit.tgz )
-	amd64? ( int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz )
-		!int64? ( acml-${MY_PV}-gfortran-64bit.tgz ) )"
-
-RESTRICT="fetch strip"
-IUSE="int64 doc examples"
-LICENSE="ACML"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	app-admin/eselect-lapack"
-
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-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"
-}
-
-pkg_setup() {
-	elog "From version 3.5.0 on, ACML no longer supports"
-	elog "hardware without SSE/SSE2 instructions. "
-	elog "For older 32-bit hardware that does not support SSE/SSE2,"
-	elog "you must continue to use an older version (ACML 3.1.0 and ealier)."
-	epause
-	FORTRAN="gfortran"
-	fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	local bits="32"
-	use amd64 && bits="64"
-	local i64=""
-	use int64 && i64="_int64"
-	ACMLDIR=${S}/${FORTRANC}${bits}${i64}
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-	return
-}
-
-src_test() {
-	einfo "Testing acml"
-	for d in . acml_mv; do
-		cd "${ACMLDIR}/examples/${d}"
-		emake \
-			ACMLDIR="${ACMLDIR}" \
-			F77="${FORTRANC}" \
-			CC="$(tc-getCC)" \
-			CPLUSPLUS="$(tc-getCXX)" \
-			|| die "emake test in ${d} failed"
-		emake clean
-	done
-}
-
-src_install() {
-	# Libraries
-	dolib ${ACMLDIR}/lib/* || die "dolib failed"
-
-	# Headers
-	insinto /usr/include/acml
-	doins ${ACMLDIR}/include/* || die "doins headers failed"
-	dosym acml/acml.h /usr/include/acml.h
-
-	# Documentation
-	dodoc ReleaseNotes*
-	cd ${S}/Doc
-	dodoc *.txt
-	doinfo *info*
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins acml.pdf
-		dohtml html/*
-	fi
-	use examples && doins -r ${ACMLDIR}/examples
-
-	# eselect files
-	for l in blas cblas lapack; do
-		eselect ${l} add $(get_libdir) "${FILESDIR}"/eselect.${l} acml
-	done
-}
-
-pkg_postinst() {
-	# set acml if none are set yet
-	for l in blas cblas lapack; do
-		[[ -z "$(eselect ${l} show)" ]] && eselect ${l} set acml
-		elog "To use ACML's BLAS features, you have to issue (as root):"
-		elog "\n\teselect ${l} set acml # or acml-mp for multi-processors\n"
-	done
-}
diff --git a/sci-libs/acml/acml-4.0.0.ebuild b/sci-libs/acml/acml-4.0.0.ebuild
index 2824d505580a..d2b6db226a62 100644
--- a/sci-libs/acml/acml-4.0.0.ebuild
+++ b/sci-libs/acml/acml-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2007/10/08 20:47:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.0.ebuild,v 1.2 2007/10/09 22:06:21 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -9,8 +9,8 @@ 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 ) )"
+	!ifc? ( int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz )
+		   !int64? ( acml-${MY_PV}-gfortran-64bit.tgz ) )"
 
 IUSE="openmp ifc int64 doc examples"
 KEYWORDS="~amd64"
@@ -153,14 +153,15 @@ EOF
 
 pkg_postinst() {
 	for p in blas lapack; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# uncomment when eselect bug #189942 is fixed, together with DEPEND
-		#if [[ -z ${current_p} || ${current_p} == ${ESELECT_PROF} ]]; then
-		if [[ -z ${current_p} ]]; then
+		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}/lib/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_p}"
+			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
diff --git a/sci-libs/acml/files/c-ACML.blas b/sci-libs/acml/files/c-ACML.blas
deleted file mode 100644
index 5a67234a2823..000000000000
--- a/sci-libs/acml/files/c-ACML.blas
+++ /dev/null
@@ -1,14 +0,0 @@
-CFLAGS="-I/usr/include/acml"
-CLIBS="-L/usr/$(get_libdir)/ -lcblas"
- 
-setup() {
-MY_LIBDIR="$(get_libdir)" 
-einfo "/usr/${MY_LIBDIR}/libcblas.so -> libacml.so"
-ln -sf /usr/${MY_LIBDIR}/libacml.so /usr/${MY_LIBDIR}/libcblas.so
-
-einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> libacml.so"
-ln -sf /usr/${MY_LIBDIR}/libacml.so /usr/${MY_LIBDIR}/libcblas.so.0
- 
-einfo "/usr/${MY_LIBDIR}/libcblas.a -> libacml.a"
-ln -sf /usr/${MY_LIBDIR}/libacml.a /usr/${MY_LIBDIR}/libcblas.a
-}
diff --git a/sci-libs/acml/files/digest-acml-3.0.0 b/sci-libs/acml/files/digest-acml-3.0.0
deleted file mode 100644
index 2c58181e440d..000000000000
--- a/sci-libs/acml/files/digest-acml-3.0.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 304856e4ed33c4bd5e64f15861427fa6 acml-3-0-0-gnu-32bit.tgz 24117886
-RMD160 6c8f4829c9b8ca5ec7250e2aad4d85bdfcdd7862 acml-3-0-0-gnu-32bit.tgz 24117886
-SHA256 1818e48c23254f586c5c81383eeffe907442800cb16040837b4e2b4ebcbf144e acml-3-0-0-gnu-32bit.tgz 24117886
-MD5 551f9758771cd3ae9a0a659f44d110d6 acml-3-0-0-gnu-64bit.tgz 9995385
-RMD160 b3f979e6c303207bc22bdcb5057fd7e4aded51e9 acml-3-0-0-gnu-64bit.tgz 9995385
-SHA256 c9c447f871134214ffc363d4b8f2b4df1c4ccbb82e8b4e4c90601d01a7c745e5 acml-3-0-0-gnu-64bit.tgz 9995385
diff --git a/sci-libs/acml/files/digest-acml-3.1.0-r1 b/sci-libs/acml/files/digest-acml-3.1.0-r1
deleted file mode 100644
index 39d53cbafbbd..000000000000
--- a/sci-libs/acml/files/digest-acml-3.1.0-r1
+++ /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
diff --git a/sci-libs/acml/files/digest-acml-3.6.0 b/sci-libs/acml/files/digest-acml-3.6.0
deleted file mode 100644
index 78ad50e56f66..000000000000
--- a/sci-libs/acml/files/digest-acml-3.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 544b271fac69f3a5de4859c42962d257 acml-3-6-0-gnu-32bit.tgz 9879145
-RMD160 bafa6acd1d8a319fb385245559779450c7bdcd66 acml-3-6-0-gnu-32bit.tgz 9879145
-SHA256 81ee83babf134bc021e5e64983200abf815531ee20ecc5ecc97a30bbdb5cf6dd acml-3-6-0-gnu-32bit.tgz 9879145
-MD5 cd29b05621cc8af7094bc30e3d8288e3 acml-3-6-0-gnu-64bit.tgz 11101900
-RMD160 f6d674a4fbf99e79109bb379d1ba5dbaf88ce010 acml-3-6-0-gnu-64bit.tgz 11101900
-SHA256 240cd40c9f9c993c15ec113278faf8689713b45b7626da2d0c369024bec97c03 acml-3-6-0-gnu-64bit.tgz 11101900
-MD5 b142edc1cd30cee76262c7df3d6e491c acml-3-6-0-ifort-32bit.tgz 17399749
-RMD160 c41ebe1b62470858d176c5815e05893ba4caf4ad acml-3-6-0-ifort-32bit.tgz 17399749
-SHA256 1585df79ced4ecd6fdcbb59b36e2686b61d6faf7b755d5ac5a267eddeff36340 acml-3-6-0-ifort-32bit.tgz 17399749
-MD5 e887b75ceec837ba9778b3fe18913faa acml-3-6-0-ifort-64bit.tgz 21966276
-RMD160 a6031f5cdacdc70d11c06cf6d8e8ae3149eff55f acml-3-6-0-ifort-64bit.tgz 21966276
-SHA256 bdfb47a5f018d1bcca257b9223f176726663596ae0e8337dc295a312f8382950 acml-3-6-0-ifort-64bit.tgz 21966276
diff --git a/sci-libs/acml/files/digest-acml-3.6.1 b/sci-libs/acml/files/digest-acml-3.6.1
deleted file mode 100644
index 31c6126b2492..000000000000
--- a/sci-libs/acml/files/digest-acml-3.6.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 3aa80dc1a5fed2ccedceacffcbf22501 acml-3-6-1-gfortran-32bit.tgz 17682562
-RMD160 abdb8ea2f66f08f478a951b37c5ce5945854a357 acml-3-6-1-gfortran-32bit.tgz 17682562
-SHA256 adec95c65d1042c65fa1490978b76042c3bf9670df7c226cd28431473985898c acml-3-6-1-gfortran-32bit.tgz 17682562
-MD5 1eb1958766688332a83e4b9807031495 acml-3-6-1-gfortran-64bit-int64.tgz 19802195
-RMD160 3cb2317d6a5ec62797c4a11ab1336aabb50e16fa acml-3-6-1-gfortran-64bit-int64.tgz 19802195
-SHA256 56cbbb6deac2a93d21f3954511ad95ccc2a8ce893fdbf9a8605a2d81deb1fc41 acml-3-6-1-gfortran-64bit-int64.tgz 19802195
-MD5 f1df8d99221337e5644e85ca790e19c2 acml-3-6-1-gfortran-64bit.tgz 20452058
-RMD160 8df00704e7ac037dcd55a9207f45d6f0b2214ff8 acml-3-6-1-gfortran-64bit.tgz 20452058
-SHA256 efec543a8185ffb6e6e68db94ef0cbd92c1b9ee1580affe6cd0a73c580ad8bdc acml-3-6-1-gfortran-64bit.tgz 20452058
diff --git a/sci-libs/acml/files/eselect.blas b/sci-libs/acml/files/eselect.blas
deleted file mode 100644
index 8310576034cf..000000000000
--- a/sci-libs/acml/files/eselect.blas
+++ /dev/null
@@ -1,3 +0,0 @@
-libacml.so /usr/@LIBDIR@/libblas.so
-libacml.so /usr/@LIBDIR@/libblas.so.0
-libacml.a /usr/@LIBDIR@/libblas.a
diff --git a/sci-libs/acml/files/eselect.blas-mp b/sci-libs/acml/files/eselect.blas-mp
deleted file mode 100644
index 58af5042ffe3..000000000000
--- a/sci-libs/acml/files/eselect.blas-mp
+++ /dev/null
@@ -1,3 +0,0 @@
-libacml_mp.so /usr/@LIBDIR@/libblas.so
-libacml_mp.so /usr/@LIBDIR@/libblas.so.0
-libacml_mp.a /usr/@LIBDIR@/libblas.a
diff --git a/sci-libs/acml/files/eselect.cblas b/sci-libs/acml/files/eselect.cblas
deleted file mode 100644
index d304979b95c1..000000000000
--- a/sci-libs/acml/files/eselect.cblas
+++ /dev/null
@@ -1,3 +0,0 @@
-libacml.so /usr/@LIBDIR@/libcblas.so
-libacml.so /usr/@LIBDIR@/libcblas.so.0
-libacml.a /usr/@LIBDIR@/libcblas.a
diff --git a/sci-libs/acml/files/eselect.cblas-mp b/sci-libs/acml/files/eselect.cblas-mp
deleted file mode 100644
index e5d94c4f315f..000000000000
--- a/sci-libs/acml/files/eselect.cblas-mp
+++ /dev/null
@@ -1,3 +0,0 @@
-libacml_mp.so /usr/@LIBDIR@/libcblas.so
-libacml_mp.so /usr/@LIBDIR@/libcblas.so.0
-libacml_mp.a /usr/@LIBDIR@/libcblas.a
diff --git a/sci-libs/acml/files/eselect.lapack b/sci-libs/acml/files/eselect.lapack
deleted file mode 100644
index 691dff2a5f49..000000000000
--- a/sci-libs/acml/files/eselect.lapack
+++ /dev/null
@@ -1,3 +0,0 @@
-libacml.so /usr/@LIBDIR@/liblapack.so
-libacml.so /usr/@LIBDIR@/liblapack.so.0
-libacml.a /usr/@LIBDIR@/liblapack.a
diff --git a/sci-libs/acml/files/eselect.lapack-mp b/sci-libs/acml/files/eselect.lapack-mp
deleted file mode 100644
index 5ad6e799543e..000000000000
--- a/sci-libs/acml/files/eselect.lapack-mp
+++ /dev/null
@@ -1,3 +0,0 @@
-libacml_mp.so /usr/@LIBDIR@/liblapack.so
-libacml_mp.so /usr/@LIBDIR@/liblapack.so.0
-libacml_mp.a /usr/@LIBDIR@/liblapack.a
diff --git a/sci-libs/acml/files/f77-ACML.blas b/sci-libs/acml/files/f77-ACML.blas
deleted file mode 100644
index c200afc3d6a2..000000000000
--- a/sci-libs/acml/files/f77-ACML.blas
+++ /dev/null
@@ -1,14 +0,0 @@
-F77LIBS="-L/usr/$(get_libdir)/ -lblas"
-
-setup() {
-MY_LIBDIR="$(get_libdir)" 
-einfo "/usr/${MY_LIBDIR}/libblas.so -> libacml.so"
-ln -sf /usr/${MY_LIBDIR}/libacml.so /usr/${MY_LIBDIR}/libblas.so
-
-einfo "/usr/${MY_LIBDIR}/libblas.so.0 -> libacml.so"
-ln -sf /usr/${MY_LIBDIR}/libacml.so /usr/${MY_LIBDIR}/libblas.so.0
-
-einfo "/usr/${MY_LIBDIR}/libblas.a -> libacml.a"
-ln -sf /usr/${MY_LIBDIR}/libacml.a /usr/${MY_LIBDIR}/libblas.a
-
-}
diff --git a/sci-libs/acml/files/f77-ACML.lapack b/sci-libs/acml/files/f77-ACML.lapack
deleted file mode 100644
index 90122de523b3..000000000000
--- a/sci-libs/acml/files/f77-ACML.lapack
+++ /dev/null
@@ -1,13 +0,0 @@
-F77LIBS="-L/usr/$(get_libdir)/ -lacml"
-
-setup() {
-MY_LIBDIR="$(get_libdir)" 
-einfo "/usr/${MY_LIBDIR}/liblapack.so -> libacml.so"
-ln -sf /usr/${MY_LIBDIR}/libacml.so /usr/${MY_LIBDIR}/liblapack.so
-
-einfo "/usr/${MY_LIBDIR}/liblapack.so.0 -> libacml.so"
-ln -sf /usr/${MY_LIBDIR}/libacml.so /usr/${MY_LIBDIR}/liblapack.so.0
-
-einfo "/usr/${MY_LIBDIR}/liblapack.a -> libacml.a"
-ln -sf /usr/${MY_LIBDIR}/libacml.a /usr/${MY_LIBDIR}/liblapack.a
-}