Removed old versions, now switch to new style virtuals. Workaround eselect bug #189942.

Package-Manager: portage-2.1.3.12

19 files changed, 50 insertions, 527 deletions

diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
index 417aecc266d8..ac23014c869a 100644
--- a/sci-libs/blas-reference/ChangeLog
+++ b/sci-libs/blas-reference/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/blas-reference
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.36 2007/10/08 18:14:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.37 2007/10/10 12:30:50 bicatali Exp $
+
+  10 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/blas-reference-19940131-autotool.patch, -files/Makefile,
+  -files/eselect-reference, -files/f77-reference,
+  -blas-reference-19940131-r3.ebuild, -blas-reference-19940131-r4.ebuild,
+  blas-reference-20070226.ebuild:
+  Removed old versions, now switch to new style virtuals. Workaround
+  eselect bug #189942.
 
   08 Oct 2007; Markus Rothe <corsair@gentoo.org>
   blas-reference-20070226.ebuild:
diff --git a/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild b/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild
deleted file mode 100644
index 40586c5d601d..000000000000
--- a/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild
+++ /dev/null
@@ -1,52 +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/blas-reference/blas-reference-19940131-r3.ebuild,v 1.6 2006/09/13 18:08:34 kugelfang Exp $
-
-inherit autotools fortran multilib
-
-Name="blas"
-DESCRIPTION="FORTRAN reference implementation of the BLAS (linear algebra lib)"
-LICENSE="public-domain"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/blas/${Name}.tgz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ia64 ppc ppc64 x86"
-
-RDEPEND="sci-libs/blas-config"
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/blas"
-
-#TODO: detect 64bit size from compiler, not eclass
-FORTRAN="g77 gfortran ifc" || FORTRAN="g77 gfortran f2c ifc" # No f2c on 64-bit systems yet :-/
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-autotool.patch
-	cd "${S}"
-	eautoreconf
-}
-
-src_install() {
-	# Profile information will be installed in TOP_PATH:
-	TOP_PATH="${DESTTREE}"/$(get_libdir)/blas
-	# Libraries will be installed in RPATH:
-	RPATH="${TOP_PATH}"/reference
-
-	make DESTDIR="${D}" install || die "install failed"
-
-	# Fix for switching
-	dodir ${RPATH}
-	mv ${D}/usr/$(get_libdir)/libblas* ${D}/${RPATH}
-
-	insinto ${TOP_PATH}
-	doins ${FILESDIR}/f77-reference || die
-}
-
-pkg_postinst() {
-	blas-config f77-reference
-}
diff --git a/sci-libs/blas-reference/blas-reference-19940131-r4.ebuild b/sci-libs/blas-reference/blas-reference-19940131-r4.ebuild
deleted file mode 100644
index 80dc846bebd7..000000000000
--- a/sci-libs/blas-reference/blas-reference-19940131-r4.ebuild
+++ /dev/null
@@ -1,55 +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/blas-reference/blas-reference-19940131-r4.ebuild,v 1.8 2007/06/29 17:42:09 jer Exp $
-
-inherit autotools fortran multilib
-
-Name="blas"
-DESCRIPTION="FORTRAN reference implementation of the BLAS (linear algebra lib)"
-LICENSE="public-domain"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/blas/${Name}.tgz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="app-admin/eselect-blas"
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/blas"
-
-#TODO: detect 64bit size from compiler, not eclass
-FORTRAN="g77 gfortran ifc" || FORTRAN="g77 gfortran f2c ifc" # No f2c on 64-bit systems yet :-/
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-}
-
-src_install() {
-	# Profile information will be installed in TOP_PATH:
-	TOP_PATH="${DESTTREE}"/$(get_libdir)/blas
-	# Libraries will be installed in RPATH:
-	RPATH="${TOP_PATH}"/reference
-
-	make DESTDIR="${D}" install || die "install failed"
-
-	# Fix for switching
-	dodir ${RPATH}
-	mv ${D}/usr/$(get_libdir)/libblas* ${D}/${RPATH}
-
-	eselect blas add $(get_libdir) ${FILESDIR}/eselect-reference reference
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect blas show)" ]]; then
-		eselect blas set reference
-	fi
-
-	elog "Configuration now uses eselect rather than blas-config."
-}
diff --git a/sci-libs/blas-reference/blas-reference-20070226.ebuild b/sci-libs/blas-reference/blas-reference-20070226.ebuild
index 5e466981e00e..faf809c05b75 100644
--- a/sci-libs/blas-reference/blas-reference-20070226.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226.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/blas-reference/blas-reference-20070226.ebuild,v 1.11 2007/10/08 18:14:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226.ebuild,v 1.12 2007/10/10 12:30:50 bicatali Exp $
 
 inherit eutils autotools fortran multilib flag-o-matic
 
@@ -22,14 +22,12 @@ DEPEND="app-admin/eselect-blas
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
-PROVIDE="virtual/blas"
-
 S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
 
 pkg_setup() {
 	FORTRAN="g77 gfortran ifc"
 	fortran_pkg_setup
-	if  [[ ${FORTRANC:0:2} == "if" ]]; then
+	if  [[ ${FORTRANC} == if* ]]; then
 		ewarn "Using Intel Fortran at your own risk"
 		LDFLAGS="$(raw-ldflags)"
 	fi
@@ -51,11 +49,22 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.reference reference
+	ESELECT_PROF=reference
+	eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.reference ${ESELECT_PROF}
 }
 
 pkg_postinst() {
-	[[ -z "$(eselect blas show)" ]] && eselect blas set reference
-	elog "To use BLAS reference implementation, you have to issue (as root):"
-	elog "\t eselect blas set reference"
+	local p=blas
+	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_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/blas-reference/files/Makefile b/sci-libs/blas-reference/files/Makefile
deleted file mode 100644
index 12add987b54d..000000000000
--- a/sci-libs/blas-reference/files/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-OBJS = caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o cgerc.o	\
-       cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o cher2k.o cherk.o	\
-       chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o csscal.o cswap.o	\
-       csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o ctpmv.o ctpsv.o		\
-       ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o daxpy.o dcabs1.o		\
-       dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o dger.o dnrm2.o drot.o	\
-       drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o dspr.o	\
-       dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o dsyr2k.o dsyrk.o	\
-       dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o	\
-       dzasum.o dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o	\
-       sasum.o saxpy.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o	\
-       sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o	\
-       srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o sswap.o ssymm.o	\
-       ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o stbmv.o stbsv.o stpmv.o	\
-       stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o zaxpy.o		\
-       zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o zgemm.o		\
-       zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o zher2.o	\
-       zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o zswap.o	\
-       zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o		\
-       ztrmm.o ztrmv.o ztrsm.o ztrsv.o
-
-# libg2c is part of GNU gcc. It is listed here as a dependency for the F77
-# BLAS libraries in case the user wants to link with the libraries using
-# the Intel Fortran Compiler. The issue is with xerbla.f, which calls the
-# STOP instrinsic. Linking with ifc will result in undefined symbols like
-# e_wsfe and others. These symbols are contained in libg2c. If you are not
-# using gcc, you most likely want to remove the '-lg2c' from libf77blas.so
-# and possibly libptf77blas.so. Of course, you can just remove -lg2c, and
-# specify it explicitly when using ifc.
-libs: $(OBJS)
-	libtool --tag=F77 --mode=link $(FC) $(FFLAGS) -o libblas.la *.lo $(LIBTOOL_FLAGS)
-
-shared: $(OBJS)
-	$(FC) -shared $(FFLAGS) -Wl,-soname,libblas.so.0 -o libblas.so.0.0.0 *.lo $(DEP_LIBS)
-
-static: $(OBJS)
-	ar cru libblas.a $(OBJS)
-	ranlib libblas.a
-
-clean:
-	rm -f *.o libblas*
-
-%.o : %.f
-	libtool --tag=F77 --mode=compile $(FC) $(FFLAGS) -o $@ -c $^
diff --git a/sci-libs/blas-reference/files/blas-reference-19940131-autotool.patch b/sci-libs/blas-reference/files/blas-reference-19940131-autotool.patch
deleted file mode 100644
index a1aa7c3f7d6a..000000000000
--- a/sci-libs/blas-reference/files/blas-reference-19940131-autotool.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -urN configure.ac configure.ac
---- configure.ac	1969-12-31 16:00:00.000000000 -0800
-+++ configure.ac	2006-05-28 16:50:36.000000000 -0700
-@@ -0,0 +1,13 @@
-+#                                               -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ(2.59)
-+AC_INIT(blas, 19940131, lapack@cs.utk.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+
-+# Checks for programs.
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
-diff -urN Makefile.am Makefile.am
---- Makefile.am	1969-12-31 16:00:00.000000000 -0800
-+++ Makefile.am	2006-05-28 16:50:01.000000000 -0700
-@@ -0,0 +1,152 @@
-+lib_LTLIBRARIES = libblas.la
-+
-+libblas_la_SOURCES = \
-+	caxpy.f \
-+	ccopy.f \
-+	cdotc.f \
-+	cdotu.f \
-+	cgbmv.f \
-+	cgemm.f \
-+	cgemv.f \
-+	cgerc.f \
-+	cgeru.f \
-+	chbmv.f \
-+	chemm.f \
-+	chemv.f \
-+	cher2.f \
-+	cher2k.f \
-+	cher.f \
-+	cherk.f \
-+	chpmv.f \
-+	chpr2.f \
-+	chpr.f \
-+	crotg.f \
-+	cscal.f \
-+	csrot.f \
-+	csscal.f \
-+	cswap.f \
-+	csymm.f \
-+	csyr2k.f \
-+	csyrk.f \
-+	ctbmv.f \
-+	ctbsv.f \
-+	ctpmv.f \
-+	ctpsv.f \
-+	ctrmm.f \
-+	ctrmv.f \
-+	ctrsm.f \
-+	ctrsv.f \
-+	dasum.f \
-+	daxpy.f \
-+	dcabs1.f \
-+	dcopy.f \
-+	ddot.f \
-+	dgbmv.f \
-+	dgemm.f \
-+	dgemv.f \
-+	dger.f \
-+	dnrm2.f \
-+	drot.f \
-+	drotg.f \
-+	drotm.f \
-+	drotmg.f \
-+	dsbmv.f \
-+	dscal.f \
-+	dsdot.f \
-+	dspmv.f \
-+	dspr2.f \
-+	dspr.f \
-+	dswap.f \
-+	dsymm.f \
-+	dsymv.f \
-+	dsyr2.f \
-+	dsyr2k.f \
-+	dsyr.f \
-+	dsyrk.f \
-+	dtbmv.f \
-+	dtbsv.f \
-+	dtpmv.f \
-+	dtpsv.f \
-+	dtrmm.f \
-+	dtrmv.f \
-+	dtrsm.f \
-+	dtrsv.f \
-+	dzasum.f \
-+	dznrm2.f \
-+	icamax.f \
-+	idamax.f \
-+	isamax.f \
-+	izamax.f \
-+	lsame.f \
-+	sasum.f \
-+	saxpy.f \
-+	scasum.f \
-+	scnrm2.f \
-+	scopy.f \
-+	sdot.f \
-+	sdsdot.f \
-+	sgbmv.f \
-+	sgemm.f \
-+	sgemv.f \
-+	sger.f \
-+	snrm2.f \
-+	srot.f \
-+	srotg.f \
-+	srotm.f \
-+	srotmg.f \
-+	ssbmv.f \
-+	sscal.f \
-+	sspmv.f \
-+	sspr2.f \
-+	sspr.f \
-+	sswap.f \
-+	ssymm.f \
-+	ssymv.f \
-+	ssyr2.f \
-+	ssyr2k.f \
-+	ssyr.f \
-+	ssyrk.f \
-+	stbmv.f \
-+	stbsv.f \
-+	stpmv.f \
-+	stpsv.f \
-+	strmm.f \
-+	strmv.f \
-+	strsm.f \
-+	strsv.f \
-+	xerbla.f \
-+	zaxpy.f \
-+	zcopy.f \
-+	zdotc.f \
-+	zdotu.f \
-+	zdrot.f \
-+	zdscal.f \
-+	zgbmv.f \
-+	zgemm.f \
-+	zgemv.f \
-+	zgerc.f \
-+	zgeru.f \
-+	zhbmv.f \
-+	zhemm.f \
-+	zhemv.f \
-+	zher2.f \
-+	zher2k.f \
-+	zher.f \
-+	zherk.f \
-+	zhpmv.f \
-+	zhpr2.f \
-+	zhpr.f \
-+	zrotg.f \
-+	zscal.f \
-+	zswap.f \
-+	zsymm.f \
-+	zsyr2k.f \
-+	zsyrk.f \
-+	ztbmv.f \
-+	ztbsv.f \
-+	ztpmv.f \
-+	ztpsv.f \
-+	ztrmm.f \
-+	ztrmv.f \
-+	ztrsm.f \
-+	ztrsv.f
diff --git a/sci-libs/blas-reference/files/digest-blas-reference-19940131-r3 b/sci-libs/blas-reference/files/digest-blas-reference-19940131-r3
deleted file mode 100644
index 357d0835458a..000000000000
--- a/sci-libs/blas-reference/files/digest-blas-reference-19940131-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5811e4b3dffa7a10956abf923cec1bd4 blas.tgz 94981
-RMD160 d2cea3ae6156b6f583fae5e590695ffb306abb80 blas.tgz 94981
-SHA256 bd062a79e35a9a835cfd8eaebe6262bbb195610336cf07435cd2b7df200bf084 blas.tgz 94981
diff --git a/sci-libs/blas-reference/files/digest-blas-reference-19940131-r4 b/sci-libs/blas-reference/files/digest-blas-reference-19940131-r4
deleted file mode 100644
index 357d0835458a..000000000000
--- a/sci-libs/blas-reference/files/digest-blas-reference-19940131-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5811e4b3dffa7a10956abf923cec1bd4 blas.tgz 94981
-RMD160 d2cea3ae6156b6f583fae5e590695ffb306abb80 blas.tgz 94981
-SHA256 bd062a79e35a9a835cfd8eaebe6262bbb195610336cf07435cd2b7df200bf084 blas.tgz 94981
diff --git a/sci-libs/blas-reference/files/eselect-reference b/sci-libs/blas-reference/files/eselect-reference
deleted file mode 100644
index e8a18b336067..000000000000
--- a/sci-libs/blas-reference/files/eselect-reference
+++ /dev/null
@@ -1,3 +0,0 @@
-blas/reference/libblas.so /usr/lib/libblas.so
-blas/reference/libblas.so.0 /usr/lib/libblas.so.0
-blas/reference/libblas.a /usr/lib/libblas.a
diff --git a/sci-libs/blas-reference/files/f77-reference b/sci-libs/blas-reference/files/f77-reference
deleted file mode 100644
index 912d84403cd5..000000000000
--- a/sci-libs/blas-reference/files/f77-reference
+++ /dev/null
@@ -1,14 +0,0 @@
-F77LIBS="-L/usr/lib/blas/reference -lblas"
-
-setup() {
- 
-einfo "/usr/lib/libblas.so -> blas/reference/libblas.so"
-ln -sf blas/reference/libblas.so /usr/lib/libblas.so
-
-einfo "/usr/lib/libblas.so.0 -> blas/reference/libblas.so.0"
-ln -sf blas/reference/libblas.so.0 /usr/lib/libblas.so.0
- 
-einfo "/usr/lib/libblas.a -> blas/reference/libblas.a"
-ln -sf blas/reference/libblas.a /usr/lib/libblas.a
-
-}
diff --git a/sci-libs/cblas-reference/ChangeLog b/sci-libs/cblas-reference/ChangeLog
index dc19325c8857..2405e5782598 100644
--- a/sci-libs/cblas-reference/ChangeLog
+++ b/sci-libs/cblas-reference/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cblas-reference
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.25 2007/10/08 18:30:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.26 2007/10/10 12:31:42 bicatali Exp $
+
+  10 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> -files/c-reference,
+  -files/cblas-gentoo.patch, -files/eselect-reference,
+  -cblas-reference-20030223-r1.ebuild, -cblas-reference-20030223-r3.ebuild,
+  cblas-reference-20030223-r4.ebuild:
+  Removed old versions, workaround for eselect bug #189942.
 
   08 Oct 2007; Markus Rothe <corsair@gentoo.org>
   cblas-reference-20030223-r4.ebuild:
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild
deleted file mode 100644
index 97098eab96e8..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild
+++ /dev/null
@@ -1,54 +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/cblas-reference/cblas-reference-20030223-r1.ebuild,v 1.5 2007/08/21 16:46:48 bicatali Exp $
-
-inherit autotools eutils fortran multilib
-
-MyPN="${PN/-reference/}"
-
-DESCRIPTION="C interface to the BLAS"
-LICENSE="public-domain"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="virtual/blas
-	sci-libs/blas-config"
-DEPEND="${RDEPEND}"
-
-FORTRAN="gfortran g77 ifc"
-
-S="${WORKDIR}/CBLAS"
-
-src_unpack() {
-	unpack ${A}
-	# Must patch before changing to S. Patches that create new files
-	# will happily apply anywhere.
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-}
-
-src_install() {
-	TOP_PATH="${DESTTREE}/$(get_libdir)/blas"
-	RPATH="${TOP_PATH}/reference"
-
-	make DESTDIR="${D}" install || die "install failed"
-
-	# Fix for switching
-	dodir ${RPATH}
-	mv ${D}/usr/$(get_libdir)/libcblas* ${D}/${RPATH}
-
-	dodoc "${S}"/README || die "failed to install docs"
-
-	insinto "${TOP_PATH}"
-	doins "${FILESDIR}"/c-reference || \
-		die "failed to install blas-config file"
-}
-
-pkg_postinst() {
-	blas-config c-reference
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild
deleted file mode 100644
index f6d0bdc68724..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild
+++ /dev/null
@@ -1,56 +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/cblas-reference/cblas-reference-20030223-r3.ebuild,v 1.4 2007/08/21 16:46:48 bicatali Exp $
-
-inherit autotools eutils fortran multilib
-
-MyPN="${PN/-reference/}"
-
-DESCRIPTION="C interface to the BLAS"
-LICENSE="public-domain"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="virtual/blas
-	app-admin/eselect-cblas"
-DEPEND="${RDEPEND}"
-
-FORTRAN="gfortran g77 ifc"
-
-S="${WORKDIR}/CBLAS"
-
-src_unpack() {
-	unpack ${A}
-	# Must patch before changing to S. Patches that create new files
-	# will happily apply anywhere.
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-}
-
-src_install() {
-	TOP_PATH="${DESTTREE}/$(get_libdir)/blas"
-	RPATH="${TOP_PATH}/reference"
-
-	make DESTDIR="${D}" install || die "install failed"
-
-	# Fix for switching
-	dodir ${RPATH}
-	mv ${D}/usr/$(get_libdir)/libcblas* ${D}/${RPATH}
-
-	dodoc "${S}"/README || die "failed to install docs"
-
-	eselect cblas add $(get_libdir) ${FILESDIR}/eselect-reference reference
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect cblas show)" ]]; then
-		eselect cblas set reference
-	fi
-
-	elog "Configuration now uses eselect rather than blas-config."
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild
index 08ed82973789..8f3c3348bf18 100644
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r4.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/cblas-reference/cblas-reference-20030223-r4.ebuild,v 1.7 2007/10/08 18:30:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild,v 1.8 2007/10/10 12:31:42 bicatali Exp $
 
 inherit autotools eutils fortran multilib
 
@@ -41,12 +41,23 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README || die "failed to install docs"
 	insinto /usr/share/doc/${PF}
-	doins cblas_example*c
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.reference reference
+	doins cblas_example*c || die "install examples failed"
+	ESELECT_PROF=reference
+	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.reference ${ESELECT_PROF}
 }
 
 pkg_postinst() {
-	[[ -z "$(eselect cblas show)" ]] && eselect cblas set reference
-	elog "To use CBLAS reference implementation, you have to issue (as root):"
-	elog "\t eselect cblas set reference"
+	local p=cblas
+	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_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/cblas-reference/files/c-reference b/sci-libs/cblas-reference/files/c-reference
deleted file mode 100644
index e43f1d531fb0..000000000000
--- a/sci-libs/cblas-reference/files/c-reference
+++ /dev/null
@@ -1,14 +0,0 @@
-CFLAGS="-I/usr/include/cblas-reference"
-CLIBS="-L/usr/$(get_libdir)/blas/reference -lcblas"
- 
-setup() {
-MY_LIBDIR="$(get_libdir)"
-einfo "/usr/${MY_LIBDIR}/libcblas.so -> reference/libcblas.so"
-ln -sf blas/reference/libcblas.so /usr/${MY_LIBDIR}/libcblas.so
-
-einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> reference/libcblas.so.0"
-ln -sf blas/reference/libcblas.so.0 /usr/${MY_LIBDIR}/libcblas.so.0
- 
-einfo "/usr/${MY_LIBDIR}/libcblas.a -> reference/libcblas.a"
-ln -sf blas/reference/libcblas.a /usr/${MY_LIBDIR}/libcblas.a
-}
diff --git a/sci-libs/cblas-reference/files/cblas-gentoo.patch b/sci-libs/cblas-reference/files/cblas-gentoo.patch
deleted file mode 100644
index 19cda25a7be3..000000000000
--- a/sci-libs/cblas-reference/files/cblas-gentoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- CBLAS/src/Makefile  2006-02-15 15:35:36.000000000 +0100
-+++ CBLAS-gentoo/src/Makefile	2006-02-15 15:36:39.000000000 +0100
-@@ -1,8 +1,8 @@
- # This Makefile compiles the CBLAS routines
- #
--dlvl = ../.
--include $(dlvl)/Makefile.in
--INC = -I$(CBDIR)/src
-+#dlvl = ../.
-+#include $(dlvl)/Makefile.in
-+#INC = -I$(CBDIR)/src
- 
- #
- # Erase all object and archive files
-@@ -232,13 +232,13 @@
- 
- # All levels and precisions
- all: $(alev)  
--	$(ARCH) $(ARCHFLAGS)  $(CBLIB) $(alev) 
--	$(RANLIB) $(CBLIB)
-+#	$(ARCH) $(ARCHFLAGS)  $(CBLIB) $(alev) 
-+#	$(RANLIB) $(CBLIB)
- 
- 
- .SUFFIXES: .o .c .f
- 
- .c.o:
--	$(CC) $(CFLAGS) $(INC) -c $*.c
-+	$(CC) $(CFLAGS) -c $*.c
- .f.o:
- 	$(FC) $(FFLAGS) -c $*.f
diff --git a/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r1 b/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r1
deleted file mode 100644
index 823a069b1666..000000000000
--- a/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 716329646ac933592a7cbdbeae9d3d06 cblas.tgz 197694
-RMD160 77bd5111659f55540c72f9fcd9277d97bd1ea33b cblas.tgz 197694
-SHA256 9b49d7177fda62b6141bf2ca29e475e86f0b12d8f72e0b944058d02b439dd52a cblas.tgz 197694
diff --git a/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r3 b/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r3
deleted file mode 100644
index 823a069b1666..000000000000
--- a/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 716329646ac933592a7cbdbeae9d3d06 cblas.tgz 197694
-RMD160 77bd5111659f55540c72f9fcd9277d97bd1ea33b cblas.tgz 197694
-SHA256 9b49d7177fda62b6141bf2ca29e475e86f0b12d8f72e0b944058d02b439dd52a cblas.tgz 197694
diff --git a/sci-libs/cblas-reference/files/eselect-reference b/sci-libs/cblas-reference/files/eselect-reference
deleted file mode 100644
index 6daf82d8b25d..000000000000
--- a/sci-libs/cblas-reference/files/eselect-reference
+++ /dev/null
@@ -1,3 +0,0 @@
-blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
-blas/reference/libcblas.so.0 /usr/@LIBDIR@/libcblas.so.0
-blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a