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

(Portage version: 2.1.3.12)

9 files changed, 24 insertions, 171 deletions

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