fixed lib->get_libdir for eselect bug workaround. Removed PROVIDE for older buggy versions and added warning

(Portage version: 2.1.3.12)

7 files changed, 41 insertions, 28 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 1f83e63bd5bf..43ef71db5cc5 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/blas-atlas
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.66 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.67 2007/10/11 17:03:20 bicatali Exp $
+
+  11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  blas-atlas-3.6.0-r1.ebuild, blas-atlas-3.6.0-r2.ebuild,
+  blas-atlas-3.7.11.ebuild, blas-atlas-3.7.11-r1.ebuild,
+  blas-atlas-3.7.34.ebuild, blas-atlas-3.7.39.ebuild:
+  fixed lib->get_libdir for eselect bug workaround. Removed PROVIDE for older
+  buggy versions and added a warning to bump for latest.
 
 *blas-atlas-3.7.39 (09 Oct 2007)
 
diff --git a/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild
index 4a8013495686..782d29e5ee93 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-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/blas-atlas/blas-atlas-3.6.0-r1.ebuild,v 1.14 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild,v 1.15 2007/10/11 17:03:20 bicatali Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,9 +20,7 @@ DEPEND="sci-libs/blas-config
 
 RDEPEND=""
 
-PROVIDE="virtual/blas"
-
-S=${WORKDIR}/ATLAS
+S="${WORKDIR}/ATLAS"
 
 # Libraries will be installed in ${RPATH}/atlas
 # and ${RPATH}/threaded-atlas:
@@ -34,6 +32,10 @@ pkg_setup() {
 		eerror "Please add fortran to your USE flags and reemerge gcc!"
 		die
 	fi
+	ewarn "You probably want to go for testing ${PN}, this version"
+	ewarn "is particurlaly buggy, does not provide virtuals, and will go away soon."
+	ewarn "Try ${PN} >= 3.7.39 for a working blas/cblas"
+	epause 5
 }
 
 src_unpack() {
diff --git a/sci-libs/blas-atlas/blas-atlas-3.6.0-r2.ebuild b/sci-libs/blas-atlas/blas-atlas-3.6.0-r2.ebuild
index b61bd5be2dce..858a3e7b9abc 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.6.0-r2.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.6.0-r2.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-atlas/blas-atlas-3.6.0-r2.ebuild,v 1.9 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.6.0-r2.ebuild,v 1.10 2007/10/11 17:03:20 bicatali Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,9 +20,7 @@ RDEPEND="app-admin/eselect-blas
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5"
 
-PROVIDE="virtual/blas"
-
-S=${WORKDIR}/ATLAS
+S="${WORKDIR}/ATLAS"
 
 # Libraries will be installed in ${RPATH}/atlas
 # and ${RPATH}/threaded-atlas:
@@ -34,6 +32,10 @@ pkg_setup() {
 		eerror "Please add fortran to your USE flags and reemerge gcc!"
 		die
 	fi
+	ewarn "You probably want to go for testing ${PN}, this version"
+	ewarn "is particurlaly buggy, does not provide virtuals, and will go away soon."
+	ewarn "Try ${PN}  >= 3.7.39 for a working blas/cblas"
+	epause 5
 }
 
 src_unpack() {
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.11-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.11-r1.ebuild
index 30c0b7a6e7ed..068b7fbe5946 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.11-r1.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.11-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/blas-atlas/blas-atlas-3.7.11-r1.ebuild,v 1.15 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11-r1.ebuild,v 1.16 2007/10/11 17:03:20 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -20,12 +20,19 @@ RDEPEND="app-admin/eselect-blas
 	app-admin/eselect-cblas"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5"
-PROVIDE="virtual/blas"
 
 S="${WORKDIR}/ATLAS"
 RPATH="${DESTTREE}/$(get_libdir)/blas"
 FORTRAN="g77 gfortran"
 
+pkg_setup() {
+	ewarn "You probably want to go for testing ${PN}, this version"
+	ewarn "is particurlaly buggy, does not provide virtuals, and will go away soon."
+	ewarn "Try ${PN} >= 3.7.39 for a working blas/cblas"
+	epause 5
+	fortran_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
index 212f2791ea6a..321153d1a066 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.11.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-atlas/blas-atlas-3.7.11.ebuild,v 1.20 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.21 2007/10/11 17:03:20 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -19,7 +19,6 @@ IUSE="doc"
 RDEPEND="sci-libs/blas-config"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5"
-PROVIDE="virtual/blas"
 
 S="${WORKDIR}/ATLAS"
 RPATH="${DESTTREE}/$(get_libdir)/blas"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.34.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.34.ebuild
index f6fd250d83a7..3afc69971ad1 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.34.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.34.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-atlas/blas-atlas-3.7.34.ebuild,v 1.2 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.34.ebuild,v 1.3 2007/10/11 17:03:20 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -19,7 +19,6 @@ RDEPEND="app-admin/eselect-blas
 	app-admin/eselect-cblas"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5"
-PROVIDE="virtual/blas"
 
 S="${WORKDIR}/ATLAS"
 BLD_DIR="${S}/gentoo-build"
@@ -27,6 +26,11 @@ RPATH="${DESTTREE}/$(get_libdir)/blas"
 FORTRAN="g77 gfortran"
 
 pkg_setup() {
+	ewarn "You probably want to go for testing ${PN}, this version"
+	ewarn "is particurlaly buggy, does not provide virtuals, and will go away soon."
+	ewarn "Try ${PN}  >= 3.7.39 for a working blas/cblas"
+	epause 5
+
 	fortran_pkg_setup
 	echo
 	ewarn "Please make sure to disable CPU throttling completely"
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild
index bc2cdf7a5ad8..fc55512eb3c6 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.39.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-atlas/blas-atlas-3.7.39.ebuild,v 1.1 2007/10/10 10:02:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild,v 1.2 2007/10/11 17:03:20 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran multilib
 
@@ -201,20 +201,12 @@ src_install () {
 pkg_postinst() {
 	for p in blas cblas; 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
 		# this snippet works around the eselect bug #189942 and makes
-		# sure that users upgrading from a previous blas-atlas 
+		# sure that users upgrading from a previous blas-atlas
 		# version pick up the new pkg-config files
-		if [[ ${current_p} == atlas || ${current_p} == threaded-atlas ]]; then
-			local configfile="${ROOT}"/etc/env.d/${p}/lib/config
-			if [[ -e ${configfile} ]]; then
-				rm -f ${configfile}
-				eselect ${p} set ${ESELECT_PROF}
-			fi
-		fi
-
-		if [[ -z ${current_p} ]]; then
+		if [[ ${current_p} == ${ESELECT_PROF} || -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