sci-libs/blas-atlas: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

10 files changed, 38 insertions, 966 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 803790557c41..78e7625953b0 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/blas-atlas
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.105 2011/06/21 15:42:16 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.106 2012/10/18 21:15:45 jlec Exp $
+
+  18 Oct 2012; Justin Lecher <jlec@gentoo.org> blas-atlas-3.8.0.ebuild,
+  -blas-atlas-3.8.2.ebuild, -blas-atlas-3.9.3.ebuild,
+  -blas-atlas-3.9.21.ebuild, -blas-atlas-3.9.21-r1.ebuild,
+  blas-atlas-3.9.23.ebuild, blas-atlas-3.9.23-r2.ebuild,
+  blas-atlas-3.9.23-r4.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> blas-atlas-3.8.0.ebuild,
   blas-atlas-3.8.2.ebuild, blas-atlas-3.9.3.ebuild, blas-atlas-3.9.21.ebuild,
diff --git a/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild b/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild
index 4f8dcec6f5c2..cb3f338d12b3 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild,v 1.15 2011/06/21 15:42:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild,v 1.16 2012/10/18 21:15:45 jlec Exp $
 
 inherit eutils fortran-2 toolchain-funcs multilib
 
 PATCH_V="3.7.39"
 
+MY_PN=${PN/blas-/}
+
 DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
 HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN=${PN/blas-/}
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
+SRC_URI="
+	mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
 	mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.patch.bz2"
 
-LICENSE="BSD"
 SLOT="0"
+LICENSE="BSD"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
-	virtual/fortran
 	app-admin/eselect-blas
 	app-admin/eselect-cblas
 	doc? ( app-doc/blas-docs )"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild b/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild
deleted file mode 100644
index b0e5f1d2c4a9..000000000000
--- a/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild,v 1.5 2011/06/21 15:42:16 jlec Exp $
-
-inherit eutils fortran-2 toolchain-funcs multilib
-
-PATCH_V="3.7.39"
-
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN=${PN/blas-/}
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	virtual/fortran
-	app-admin/eselect-blas
-	app-admin/eselect-cblas
-	doc? ( app-doc/blas-docs )"
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	>=sys-devel/libtool-1.5"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	# icc won't compile (as of icc-10.0.026)
-	# and will blow out $PORTAGE_TMPDIR
-	if [[ $(tc-getCC) = icc* ]]; then
-		eerror "icc compiler is not supported with sci-libs/blas-atlas"
-		die "blas-atlas won't compile with icc"
-	fi
-
-	echo
-	ewarn "Please make sure to disable CPU throttling completely"
-	ewarn "during the compile of blas-atlas. Otherwise, all atlas"
-	ewarn "generated timings will be completely random and the"
-	ewarn "performance of the resulting libraries will be degraded"
-	ewarn "considerably."
-	echo
-	ewarn "For users of <=gcc-4.1.1 only:"
-	ewarn "If you experience failing SANITY tests during"
-	ewarn "atlas' compile please try passing -mfpmath=387; this"
-	ewarn "option might also result in much better performance"
-	ewarn "than using then sse instruction set depending on your"
-	ewarn "CPU."
-	echo
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-	epatch "${FILESDIR}"/${MY_PN}-${PATCH_V}-decl-fix.patch
-
-	BLD_DIR="${S}"/gentoo-build
-	mkdir "${BLD_DIR}" || die "failed to generate build directory"
-	cd "${BLD_DIR}"
-	cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war"
-
-	local archselect=
-	if use amd64 || use ppc64; then
-		archselect="-b 64"
-	elif use alpha; then
-		archselect=""
-	else
-		archselect="-b 32"
-	fi
-
-	../configure \
-		--cc="$(tc-getCC)" \
-		--cflags="${CFLAGS}" \
-		--prefix="${D}/${DESTTREE}" \
-		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
-		--incdir="${D}/${DESTTREE}"/include \
-		-C ac "$(tc-getCC)" -F ac "${CFLAGS}" \
-		-C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \
-		-Ss pmake "\$(MAKE) ${MAKEOPTS}" \
-		-Si cputhrchk 0 ${archselect} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	cd "${BLD_DIR}"
-
-	# atlas does its own parallel builds
-	emake -j1 || die "emake failed"
-
-	RPATH="${DESTTREE}"/$(get_libdir)/blas
-	make \
-		LIBDIR=$(get_libdir) \
-		RPATH="${RPATH}"/atlas \
-		shared || die "failed to build shared libraries"
-
-	# build shared libraries of threaded libraries if applicable
-	if [[ -d gentoo/libptcblas.a ]]; then
-		make \
-			LIBDIR=$(get_libdir) \
-			RPATH="${RPATH}"/threaded-atlas \
-			ptshared || die "failed to build threaded shared libraries"
-	fi
-}
-
-src_test() {
-	# make check does not work because
-	# we don't build lapack libs
-	for i in F77 C; do
-		einfo "Testing ${i} interface"
-		cd "${BLD_DIR}"/interfaces/blas/${i}/testing
-		make sanity_test || die "emake tests for ${i} failed"
-		if [[ -d "${BLD_DIR}"/gentoo/libptf77blas.a ]]; then
-			make ptsanity_test || die "emake tests threaded for ${i}failed"
-		fi
-	done
-	echo "Timing ATLAS"
-	cd "${BLD_DIR}"
-	emake time || die "emake time failed"
-}
-
-src_install () {
-	dodir "${RPATH}"/atlas
-	cd "${BLD_DIR}"/gentoo/libs
-	cp -P libatlas* "${D}/${DESTTREE}"/$(get_libdir) \
-		|| die "Failed to install libatlas"
-
-	# pkgconfig files
-	local extlibs="-lm"
-	local threadlibs
-	[[ $(tc-getFC) =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-	[[ $(tc-getFC) =~ g77 ]] && extlibs="${extlibs} -lg2c"
-	cp "${FILESDIR}"/blas.pc.in blas.pc
-	cp "${FILESDIR}"/cblas.pc.in cblas.pc
-	sed -i \
-		-e "s:@LIBDIR@:$(get_libdir):" \
-		-e "s:@PV@:${PV}:" \
-		-e "s:@EXTLIBS@:${extlibs}:g" \
-		-e "s:@THREADLIBS@:${threadlibs}:g" \
-		*blas.pc || die "sed *blas.pc failed"
-
-	cp -P *blas* "${D}/${RPATH}"/atlas \
-		|| die "Failed to install blas/cblas"
-
-	ESELECT_PROF=atlas
-	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.atlas ${ESELECT_PROF}
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.atlas ${ESELECT_PROF}
-
-	if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]];	then
-		dodir "${RPATH}"/threaded-atlas
-		cd "${BLD_DIR}"/gentoo/threaded-libs
-
-		# pkgconfig files
-		cp "${FILESDIR}"/blas.pc.in blas.pc
-		cp "${FILESDIR}"/cblas.pc.in cblas.pc
-		threadlibs="-lpthread"
-		sed -i \
-			-e "s:@LIBDIR@:$(get_libdir):" \
-			-e "s:@PV@:${PV}:" \
-			-e "s:@EXTLIBS@:${extlibs}:g" \
-			-e "s:@THREADLIBS@:${threadlibs}:g" \
-			*blas.pc || die "sed *blas.pc failed"
-
-		cp -P * "${D}/${RPATH}"/threaded-atlas \
-			|| die "Failed to install threaded atlas"
-		ESELECT_PROF=atlas-threads
-
-		eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.threaded-atlas ${ESELECT_PROF}
-		eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.threaded-atlas ${ESELECT_PROF}
-	fi
-
-	insinto "${DESTTREE}"/include/atlas
-	doins \
-		"${S}"/include/cblas.h \
-		"${S}"/include/atlas_misc.h \
-		"${S}"/include/atlas_enum.h \
-		|| die "failed to install headers"
-
-	# These headers contain the architecture-specific
-	# optimizations determined by ATLAS. The atlas-lapack build
-	# is much shorter if they are available, so save them:
-	doins "${BLD_DIR}"/include/*.h \
-		|| die "failed to install timing headers"
-
-	# some docs
-	cd "${S}"/doc
-	dodoc INDEX.txt AtlasCredits.txt ChangeLog || die "dodoc failed"
-	# atlas specific doc (blas generic docs installed by blas-docs)
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins atlas*pdf cblasqref.pdf || die "doins docs failed"
-	fi
-}
-
-pkg_postinst() {
-	for p in blas cblas; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# this snippet works around the eselect bug #189942 and makes
-		# sure that users upgrading from a previous blas-atlas
-		# version pick up the new pkg-config files
-		if [[ ${current_p} == ${ESELECT_PROF} \
-			  || ${current_p} == "threaded-atlas" \
-			  || -z ${current_p} ]]; then
-			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_p}"
-			elog "To use the ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-}
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild
deleted file mode 100644
index 077e84456e00..000000000000
--- a/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild,v 1.5 2011/06/21 15:42:16 jlec Exp $
-
-inherit eutils fortran-2 toolchain-funcs multilib
-
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN=${PN/blas-/}
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PV}-shared-libs.2.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	virtual/fortran
-	app-admin/eselect-blas
-	app-admin/eselect-cblas
-	doc? ( app-doc/blas-docs )"
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	>=sys-devel/libtool-1.5"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	# icc won't compile (as of icc-10.0.026)
-	# and will blow out $PORTAGE_TMPDIR
-	if [[ $(tc-getCC) = icc* ]]; then
-		eerror "icc compiler is not supported with sci-libs/blas-atlas"
-		die "blas-atlas won't compile with icc"
-	fi
-
-	echo
-	ewarn "Please make sure to disable CPU throttling completely"
-	ewarn "during the compile of blas-atlas. Otherwise, all atlas"
-	ewarn "generated timings will be completely random and the"
-	ewarn "performance of the resulting libraries will be degraded"
-	ewarn "considerably."
-	echo
-	ewarn "For users of <=gcc-4.1 only:"
-	ewarn "If you experience failing SANITY tests during"
-	ewarn "atlas' compile please try passing -mfpmath=387; this"
-	ewarn "option might also result in much better performance"
-	ewarn "than using then sse instruction set depending on your"
-	ewarn "CPU."
-	echo
-	ewarn "If blas-atlas fails during linking with a message"
-	ewarn "'relocation R_X86_64_32 .... recompile with -fPIC.'"
-	ewarn "please re-emerge libtool and then try again."
-	echo
-	epause 5
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.2.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-
-	BLD_DIR="${S}"/gentoo-build
-	mkdir "${BLD_DIR}" || die "failed to generate build directory"
-	cd "${BLD_DIR}"
-	cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war"
-
-	local archselect=
-	if use amd64 || use ppc64; then
-		archselect="-b 64"
-	elif use alpha; then
-		archselect=""
-	else
-		archselect="-b 32"
-	fi
-
-	# Remove -m64 on alpha, since the compiler doesn't support it
-	use alpha && sed -i -e 's/-m64//g' "${S}"/CONFIG/src/probe_comp.c
-
-	# unfortunately, atlas-3.9.0 chokes when passed
-	# x86_64-pc-linux-gnu-gcc and friends instead of
-	# plain gcc. Hence, we'll have to workaround this
-	# until it is fixed by upstream
-	local c_compiler=$(tc-getCC)
-	if [[ "${c_compiler}" == *gcc* ]]; then
-		c_compiler="gcc"
-	fi
-
-	../configure \
-		--cc="${c_compiler}" \
-		--cflags="${CFLAGS}" \
-		--prefix="${D}/${DESTTREE}" \
-		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
-		--incdir="${D}/${DESTTREE}"/include \
-		-C ac "${c_compiler}" -F ac "${CFLAGS}" \
-		-C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \
-		-Ss pmake "\$(MAKE) ${MAKEOPTS}" \
-		-Si cputhrchk 0 ${archselect} \
-		|| die "configure failed"
-
-	# fix LDFLAGS
-	sed -e "s|LDFLAGS =.*|LDFLAGS = ${LDFLAGS}|" \
-		-i "${BLD_DIR}"/Make.inc
-}
-
-src_compile() {
-	cd "${BLD_DIR}"
-
-	# atlas does its own parallel builds
-	# — and it fails parallel make, bug #294172
-	emake -j1 || die "emake failed"
-
-	RPATH="${DESTTREE}"/$(get_libdir)/blas
-	emake -j1 \
-		LIBDIR=$(get_libdir) \
-		RPATH="${RPATH}"/atlas \
-		shared || die "failed to build shared libraries"
-
-	# build shared libraries of threaded libraries if applicable
-	if [[ -d gentoo/libptcblas.a ]]; then
-		emake -j1 \
-			LIBDIR=$(get_libdir) \
-			RPATH="${RPATH}"/threaded-atlas \
-			ptshared || die "failed to build threaded shared libraries"
-	fi
-}
-
-src_test() {
-	# make check does not work because
-	# we don't build lapack libs
-	for i in F77 C; do
-		einfo "Testing ${i} interface"
-		cd "${BLD_DIR}"/interfaces/blas/${i}/testing
-		make sanity_test || die "emake tests for ${i} failed"
-		if [[ -d "${BLD_DIR}"/gentoo/libptf77blas.a ]]; then
-			make ptsanity_test || die "emake tests threaded for ${i}failed"
-		fi
-	done
-	echo "Timing ATLAS"
-	cd "${BLD_DIR}"
-	emake time || die "emake time failed"
-}
-
-src_install () {
-	dodir "${RPATH}"/atlas
-	cd "${BLD_DIR}"/gentoo/libs
-	cp -P libatlas* "${D}/${DESTTREE}"/$(get_libdir) \
-		|| die "Failed to install libatlas"
-
-	# pkgconfig files
-	local extlibs="-lm"
-	local threadlibs
-	[[ $(tc-getFC) =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-	[[ $(tc-getFC) =~ g77 ]] && extlibs="${extlibs} -lg2c"
-	cp "${FILESDIR}"/blas.pc.in blas.pc
-	cp "${FILESDIR}"/cblas.pc.in cblas.pc
-	sed -i \
-		-e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \
-		-e "s:@PV@:${PV}:" \
-		-e "s:@EXTLIBS@:${extlibs}:g" \
-		-e "s:@THREADLIBS@:${threadlibs}:g" \
-		*blas.pc || die "sed *blas.pc failed"
-
-	cp -P *blas* "${D}/${RPATH}"/atlas \
-		|| die "Failed to install blas/cblas"
-
-	ESELECT_PROF=atlas
-	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.atlas ${ESELECT_PROF}
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.atlas ${ESELECT_PROF}
-
-	if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]];	then
-		dodir "${RPATH}"/threaded-atlas
-		cd "${BLD_DIR}"/gentoo/threaded-libs
-
-		# pkgconfig files
-		cp "${FILESDIR}"/blas.pc.in blas.pc
-		cp "${FILESDIR}"/cblas.pc.in cblas.pc
-		threadlibs="-lpthread"
-		sed -i \
-			-e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \
-			-e "s:@PV@:${PV}:" \
-			-e "s:@EXTLIBS@:${extlibs}:g" \
-			-e "s:@THREADLIBS@:${threadlibs}:g" \
-			*blas.pc || die "sed *blas.pc failed"
-
-		cp -P * "${D}/${RPATH}"/threaded-atlas \
-			|| die "Failed to install threaded atlas"
-		ESELECT_PROF=atlas-threads
-
-		eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.threaded-atlas ${ESELECT_PROF}
-		eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.threaded-atlas ${ESELECT_PROF}
-	fi
-
-	insinto "${DESTTREE}"/include/atlas
-	doins \
-		"${S}"/include/cblas.h \
-		"${S}"/include/atlas_misc.h \
-		"${S}"/include/atlas_enum.h \
-		"${S}"/include/atlas_aux.h \
-		|| die "failed to install headers"
-
-	# These headers contain the architecture-specific
-	# optimizations determined by ATLAS. The atlas-lapack build
-	# is much shorter if they are available, so save them:
-	doins "${BLD_DIR}"/include/*.h \
-		|| die "failed to install timing headers"
-
-	# some docs
-	cd "${S}"/doc
-	dodoc INDEX.txt AtlasCredits.txt ChangeLog || die "dodoc failed"
-	# atlas specific doc (blas generic docs installed by blas-docs)
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins atlas*pdf cblasqref.pdf || die "doins docs failed"
-	fi
-}
-
-pkg_postinst() {
-	for p in blas cblas; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# this snippet works around the eselect bug #189942 and makes
-		# sure that users upgrading from a previous blas-atlas
-		# version pick up the new pkg-config files
-		if [[ ${current_p} == ${ESELECT_PROF} \
-			  || ${current_p} == "threaded-atlas" \
-			  || -z ${current_p} ]]; then
-			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_p}"
-			elog "To use the ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-}
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild
deleted file mode 100644
index 878ffcc5e48e..000000000000
--- a/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild,v 1.8 2011/06/21 15:42:16 jlec Exp $
-
-inherit eutils fortran-2 toolchain-funcs multilib
-
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN=${PN/blas-/}
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PV}-shared-libs.2.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	virtual/fortran
-	app-admin/eselect-blas
-	app-admin/eselect-cblas
-	doc? ( app-doc/blas-docs )"
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	>=sys-devel/libtool-1.5"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	# icc won't compile (as of icc-10.0.026)
-	# and will blow out $PORTAGE_TMPDIR
-	if [[ $(tc-getCC) = icc* ]]; then
-		eerror "icc compiler is not supported with sci-libs/blas-atlas"
-		die "blas-atlas won't compile with icc"
-	fi
-
-	echo
-	ewarn "Please make sure to disable CPU throttling completely"
-	ewarn "during the compile of blas-atlas. Otherwise, all atlas"
-	ewarn "generated timings will be completely random and the"
-	ewarn "performance of the resulting libraries will be degraded"
-	ewarn "considerably."
-	echo
-	ewarn "For users of <=gcc-4.1 only:"
-	ewarn "If you experience failing SANITY tests during"
-	ewarn "atlas' compile please try passing -mfpmath=387; this"
-	ewarn "option might also result in much better performance"
-	ewarn "than using then sse instruction set depending on your"
-	ewarn "CPU."
-	echo
-	ewarn "If blas-atlas fails during linking with a message"
-	ewarn "'relocation R_X86_64_32 .... recompile with -fPIC.'"
-	ewarn "please re-emerge libtool and then try again."
-	echo
-	epause 5
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.2.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-
-	BLD_DIR="${S}"/gentoo-build
-	mkdir "${BLD_DIR}" || die "failed to generate build directory"
-	cd "${BLD_DIR}"
-	cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war"
-
-	local archselect=
-	if use amd64 || use ppc64; then
-		archselect="-b 64"
-	elif use alpha; then
-		archselect=""
-	else
-		archselect="-b 32"
-	fi
-
-	# Remove -m64 on alpha, since the compiler doesn't support it
-	use alpha && sed -i -e 's/-m64//g' "${S}"/CONFIG/src/probe_comp.c
-
-	# unfortunately, atlas-3.9.0 chokes when passed
-	# x86_64-pc-linux-gnu-gcc and friends instead of
-	# plain gcc. Hence, we'll have to workaround this
-	# until it is fixed by upstream
-	local c_compiler=$(tc-getCC)
-	if [[ "${c_compiler}" == *gcc* ]]; then
-		c_compiler="gcc"
-	fi
-
-	../configure \
-		--cc="${c_compiler}" \
-		--cflags="${CFLAGS}" \
-		--prefix="${D}/${DESTTREE}" \
-		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
-		--incdir="${D}/${DESTTREE}"/include \
-		-C ac "${c_compiler}" -F ac "${CFLAGS}" \
-		-C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \
-		-Ss pmake "\$(MAKE) ${MAKEOPTS}" \
-		-Si cputhrchk 0 ${archselect} \
-		|| die "configure failed"
-
-	# fix LDFLAGS
-	sed -e "s|LDFLAGS =.*|LDFLAGS = ${LDFLAGS}|" \
-		-i "${BLD_DIR}"/Make.inc
-}
-
-src_compile() {
-	cd "${BLD_DIR}"
-
-	# atlas does its own parallel builds
-	# — and it fails parallel make, bug #294172
-	emake -j1 || die "emake failed"
-
-	RPATH="${DESTTREE}"/$(get_libdir)/blas
-	emake -j1 \
-		LIBDIR=$(get_libdir) \
-		RPATH="${RPATH}"/atlas \
-		shared || die "failed to build shared libraries"
-
-	# build shared libraries of threaded libraries if applicable
-	if [[ -d gentoo/libptcblas.a ]]; then
-		emake -j1 \
-			LIBDIR=$(get_libdir) \
-			RPATH="${RPATH}"/threaded-atlas \
-			ptshared || die "failed to build threaded shared libraries"
-	fi
-}
-
-src_test() {
-	# make check does not work because
-	# we don't build lapack libs
-	for i in F77 C; do
-		einfo "Testing ${i} interface"
-		cd "${BLD_DIR}"/interfaces/blas/${i}/testing
-		make sanity_test || die "emake tests for ${i} failed"
-		if [[ -d "${BLD_DIR}"/gentoo/libptf77blas.a ]]; then
-			make ptsanity_test || die "emake tests threaded for ${i}failed"
-		fi
-	done
-	echo "Timing ATLAS"
-	cd "${BLD_DIR}"
-	emake time || die "emake time failed"
-}
-
-src_install () {
-	dodir "${RPATH}"/atlas
-	cd "${BLD_DIR}"/gentoo/libs
-	cp -P libatlas* "${D}/${DESTTREE}"/$(get_libdir) \
-		|| die "Failed to install libatlas"
-
-	# pkgconfig files
-	local extlibs="-lm"
-	local threadlibs
-	[[ $(tc-getFC) =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-	[[ $(tc-getFC) =~ g77 ]] && extlibs="${extlibs} -lg2c"
-	cp "${FILESDIR}"/blas.pc.in blas.pc
-	cp "${FILESDIR}"/cblas.pc.in cblas.pc
-	sed -i \
-		-e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \
-		-e "s:@PV@:${PV}:" \
-		-e "s:@EXTLIBS@:${extlibs}:g" \
-		-e "s:@THREADLIBS@:${threadlibs}:g" \
-		*blas.pc || die "sed *blas.pc failed"
-
-	cp -P *blas* "${D}/${RPATH}"/atlas \
-		|| die "Failed to install blas/cblas"
-
-	ESELECT_PROF=atlas
-	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.atlas ${ESELECT_PROF}
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.atlas ${ESELECT_PROF}
-
-	if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]];	then
-		dodir "${RPATH}"/threaded-atlas
-		cd "${BLD_DIR}"/gentoo/threaded-libs
-
-		# pkgconfig files
-		cp "${FILESDIR}"/blas.pc.in blas.pc
-		cp "${FILESDIR}"/cblas.pc.in cblas.pc
-		threadlibs="-lpthread"
-		sed -i \
-			-e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \
-			-e "s:@PV@:${PV}:" \
-			-e "s:@EXTLIBS@:${extlibs}:g" \
-			-e "s:@THREADLIBS@:${threadlibs}:g" \
-			*blas.pc || die "sed *blas.pc failed"
-
-		cp -P * "${D}/${RPATH}"/threaded-atlas \
-			|| die "Failed to install threaded atlas"
-		ESELECT_PROF=atlas-threads
-
-		eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.threaded-atlas ${ESELECT_PROF}
-		eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.threaded-atlas ${ESELECT_PROF}
-	fi
-
-	insinto "${DESTTREE}"/include/atlas
-	doins \
-		"${S}"/include/cblas.h \
-		"${S}"/include/atlas_misc.h \
-		"${S}"/include/atlas_enum.h \
-		|| die "failed to install headers"
-
-	# These headers contain the architecture-specific
-	# optimizations determined by ATLAS. The atlas-lapack build
-	# is much shorter if they are available, so save them:
-	doins "${BLD_DIR}"/include/*.h \
-		|| die "failed to install timing headers"
-
-	# some docs
-	cd "${S}"/doc
-	dodoc INDEX.txt AtlasCredits.txt ChangeLog || die "dodoc failed"
-	# atlas specific doc (blas generic docs installed by blas-docs)
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins atlas*pdf cblasqref.pdf || die "doins docs failed"
-	fi
-}
-
-pkg_postinst() {
-	for p in blas cblas; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# this snippet works around the eselect bug #189942 and makes
-		# sure that users upgrading from a previous blas-atlas
-		# version pick up the new pkg-config files
-		if [[ ${current_p} == ${ESELECT_PROF} \
-			  || ${current_p} == "threaded-atlas" \
-			  || -z ${current_p} ]]; then
-			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_p}"
-			elog "To use the ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-}
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild
index 6e87625e630b..8747dafd1d81 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild,v 1.6 2011/06/21 15:42:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild,v 1.7 2012/10/18 21:15:45 jlec Exp $
 
 EAPI="3"
 
 inherit eutils fortran-2 toolchain-funcs multilib
 
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
 MY_PN=${PN/blas-/}
 PATCH_V="3.9.21"
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
+DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
+HOMEPAGE="http://math-atlas.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
 	mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2"
 
 LICENSE="BSD"
@@ -19,7 +20,6 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="
-	virtual/fortran
 	app-admin/eselect-blas
 	app-admin/eselect-cblas
 	doc? ( app-doc/blas-docs )"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild
index a6e1361952b3..18a6792977c2 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild,v 1.6 2011/06/21 15:42:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild,v 1.7 2012/10/18 21:15:45 jlec Exp $
 
 EAPI="3"
 
 inherit eutils fortran-2 toolchain-funcs multilib
 
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
 MY_PN=${PN/blas-/}
 PATCH_V="3.9.21"
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
+DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
+HOMEPAGE="http://math-atlas.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
 	mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2"
 
 LICENSE="BSD"
@@ -19,7 +20,6 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-mac
 IUSE="doc"
 
 RDEPEND="
-	virtual/fortran
 	app-admin/eselect-blas
 	app-admin/eselect-cblas
 	doc? ( app-doc/blas-docs )"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild
index 66ad78c20e55..61580d5f73ae 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild,v 1.5 2011/06/21 15:42:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild,v 1.6 2012/10/18 21:15:45 jlec Exp $
 
 inherit eutils fortran-2 toolchain-funcs multilib
 
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
 MY_PN=${PN/blas-/}
 PATCH_V="3.9.21"
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
+
+DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
+HOMEPAGE="http://math-atlas.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
 	mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2"
 
-LICENSE="BSD"
 SLOT="0"
+LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="
-	virtual/fortran
 	app-admin/eselect-blas
 	app-admin/eselect-cblas
 	doc? ( app-doc/blas-docs )"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
deleted file mode 100644
index 64ef7d08c364..000000000000
--- a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.10 2011/06/21 15:42:16 jlec Exp $
-
-inherit eutils fortran-2 toolchain-funcs multilib
-
-PATCH_V="3.9.0"
-
-DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN=${PN/blas-/}
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PV}-shared-libs.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	virtual/fortran
-	app-admin/eselect-blas
-	app-admin/eselect-cblas
-	doc? ( app-doc/blas-docs )"
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	>=sys-devel/libtool-1.5"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	# icc won't compile (as of icc-10.0.026)
-	# and will blow out $PORTAGE_TMPDIR
-	if [[ $(tc-getCC) = icc* ]]; then
-		eerror "icc compiler is not supported with sci-libs/blas-atlas"
-		die "blas-atlas won't compile with icc"
-	fi
-
-	echo
-	ewarn "Please make sure to disable CPU throttling completely"
-	ewarn "during the compile of blas-atlas. Otherwise, all atlas"
-	ewarn "generated timings will be completely random and the"
-	ewarn "performance of the resulting libraries will be degraded"
-	ewarn "considerably."
-	echo
-	ewarn "For users of <=gcc-4.1 only:"
-	ewarn "If you experience failing SANITY tests during"
-	ewarn "atlas' compile please try passing -mfpmath=387; this"
-	ewarn "option might also result in much better performance"
-	ewarn "than using then sse instruction set depending on your"
-	ewarn "CPU."
-	echo
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-	epatch "${FILESDIR}"/${MY_PN}-${PATCH_V}-decl-fix.patch
-
-	BLD_DIR="${S}"/gentoo-build
-	mkdir "${BLD_DIR}" || die "failed to generate build directory"
-	cd "${BLD_DIR}"
-	cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war"
-
-	local archselect=
-	if use amd64 || use ppc64; then
-		archselect="-b 64"
-	elif use alpha; then
-		archselect=""
-	else
-		archselect="-b 32"
-	fi
-
-	# Remove -m64 on alpha, since the compiler doesn't support it
-	use alpha && sed -i -e 's/-m64//g' "${S}"/CONFIG/src/probe_comp.c
-
-	# unfortunately, atlas-3.9.0 chokes when passed
-	# x86_64-pc-linux-gnu-gcc and friends instead of
-	# plain gcc. Hence, we'll have to workaround this
-	# until it is fixed by upstream
-	local c_compiler=$(tc-getCC)
-	if [[ "${c_compiler}" == *gcc* ]]; then
-		c_compiler="gcc"
-	fi
-
-	../configure \
-		--cc="${c_compiler}" \
-		--cflags="${CFLAGS}" \
-		--prefix="${D}/${DESTTREE}" \
-		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
-		--incdir="${D}/${DESTTREE}"/include \
-		-C ac "${c_compiler}" -F ac "${CFLAGS}" \
-		-C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \
-		-Ss pmake "\$(MAKE) ${MAKEOPTS}" \
-		-Si cputhrchk 0 ${archselect} \
-		|| die "configure failed"
-
-	# fix LDFLAGS
-	sed -e "s|LDFLAGS =.*|LDFLAGS = ${LDFLAGS}|" \
-		-i "${BLD_DIR}"/Make.inc
-}
-
-src_compile() {
-	cd "${BLD_DIR}"
-
-	# atlas does its own parallel builds
-	# it fails parallel make, bug #294172
-	emake -j1 || die "emake failed"
-
-	RPATH="${DESTTREE}"/$(get_libdir)/blas
-	emake -j1 \
-		LIBDIR=$(get_libdir) \
-		RPATH="${RPATH}"/atlas \
-		shared || die "failed to build shared libraries"
-
-	# build shared libraries of threaded libraries if applicable
-	if [[ -d gentoo/libptcblas.a ]]; then
-		emake -j1 \
-			LIBDIR=$(get_libdir) \
-			RPATH="${RPATH}"/threaded-atlas \
-			ptshared || die "failed to build threaded shared libraries"
-	fi
-}
-
-src_test() {
-	# make check does not work because
-	# we don't build lapack libs
-	for i in F77 C; do
-		einfo "Testing ${i} interface"
-		cd "${BLD_DIR}"/interfaces/blas/${i}/testing
-		make sanity_test || die "emake tests for ${i} failed"
-		if [[ -d "${BLD_DIR}"/gentoo/libptf77blas.a ]]; then
-			make ptsanity_test || die "emake tests threaded for ${i}failed"
-		fi
-	done
-	echo "Timing ATLAS"
-	cd "${BLD_DIR}"
-	emake time || die "emake time failed"
-}
-
-src_install () {
-	dodir "${RPATH}"/atlas
-	cd "${BLD_DIR}"/gentoo/libs
-	cp -P libatlas* "${D}/${DESTTREE}"/$(get_libdir) \
-		|| die "Failed to install libatlas"
-
-	# pkgconfig files
-	local extlibs="-lm"
-	local threadlibs
-	[[ $(tc-getFC) =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-	[[ $(tc-getFC) =~ g77 ]] && extlibs="${extlibs} -lg2c"
-	cp "${FILESDIR}"/blas.pc.in blas.pc
-	cp "${FILESDIR}"/cblas.pc.in cblas.pc
-	sed -i \
-		-e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \
-		-e "s:@PV@:${PV}:" \
-		-e "s:@EXTLIBS@:${extlibs}:g" \
-		-e "s:@THREADLIBS@:${threadlibs}:g" \
-		*blas.pc || die "sed *blas.pc failed"
-
-	cp -P *blas* "${D}/${RPATH}"/atlas \
-		|| die "Failed to install blas/cblas"
-
-	ESELECT_PROF=atlas
-	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.atlas ${ESELECT_PROF}
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.atlas ${ESELECT_PROF}
-
-	if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]];	then
-		dodir "${RPATH}"/threaded-atlas
-		cd "${BLD_DIR}"/gentoo/threaded-libs
-
-		# pkgconfig files
-		cp "${FILESDIR}"/blas.pc.in blas.pc
-		cp "${FILESDIR}"/cblas.pc.in cblas.pc
-		threadlibs="-lpthread"
-		sed -i \
-			-e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \
-			-e "s:@PV@:${PV}:" \
-			-e "s:@EXTLIBS@:${extlibs}:g" \
-			-e "s:@THREADLIBS@:${threadlibs}:g" \
-			*blas.pc || die "sed *blas.pc failed"
-
-		cp -P * "${D}/${RPATH}"/threaded-atlas \
-			|| die "Failed to install threaded atlas"
-		ESELECT_PROF=atlas-threads
-
-		eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.threaded-atlas ${ESELECT_PROF}
-		eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.threaded-atlas ${ESELECT_PROF}
-	fi
-
-	insinto "${DESTTREE}"/include/atlas
-	doins \
-		"${S}"/include/cblas.h \
-		"${S}"/include/atlas_misc.h \
-		"${S}"/include/atlas_enum.h \
-		|| die "failed to install headers"
-
-	# These headers contain the architecture-specific
-	# optimizations determined by ATLAS. The atlas-lapack build
-	# is much shorter if they are available, so save them:
-	doins "${BLD_DIR}"/include/*.h \
-		|| die "failed to install timing headers"
-
-	# some docs
-	cd "${S}"/doc
-	dodoc INDEX.txt AtlasCredits.txt ChangeLog || die "dodoc failed"
-	# atlas specific doc (blas generic docs installed by blas-docs)
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins atlas*pdf cblasqref.pdf || die "doins docs failed"
-	fi
-}
-
-pkg_postinst() {
-	for p in blas cblas; do
-		local current_p=$(eselect ${p} show | cut -d' ' -f2)
-		# this snippet works around the eselect bug #189942 and makes
-		# sure that users upgrading from a previous blas-atlas
-		# version pick up the new pkg-config files
-		if [[ ${current_p} == ${ESELECT_PROF} \
-			  || ${current_p} == "threaded-atlas" \
-			  || -z ${current_p} ]]; then
-			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_p}"
-			elog "To use the ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-}
diff --git a/sci-libs/blas-atlas/metadata.xml b/sci-libs/blas-atlas/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/sci-libs/blas-atlas/metadata.xml
+++ b/sci-libs/blas-atlas/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>