Version bump, removed old versions, added work around eselect bug #189942. Added new cblas use flag to allow use of external cblas library.

Package-Manager: portage-2.1.3.12

12 files changed, 218 insertions, 152 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index c64d78532b5e..6e7743e872ff 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.38 2007/09/16 19:19:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.39 2007/10/10 13:22:40 bicatali Exp $
+
+*gsl-1.10 (10 Oct 2007)
+
+  10 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gsl-cblas.patch, -gsl-1.4.ebuild, -gsl-1.6.ebuild, -gsl-1.7.ebuild,
+  gsl-1.9-r1.ebuild, +gsl-1.10.ebuild:
+  Version bump, removed old versions, added work around eselect bug #189942.
+  Added new cblas use flag to allow use of external cblas library.
 
   16 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
   files/eselect.cblas.gsl, metadata.xml:
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index d0a9597855fa..5a5460b0ad67 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -13,52 +13,40 @@ AUX gsl-1.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b
 MD5 5ca2842635739ffb675ba3eff4d460d9 files/gsl-1.6-deps.diff 418
 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 files/gsl-1.6-deps.diff 418
 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f files/gsl-1.6-deps.diff 418
-DIST gsl-1.4.tar.gz 2211031 RMD160 51daa99c9ab1fe286b4c1da061d63f99ed246604 SHA1 72de214bc3e2466f196aa98d698002faceb7132c SHA256 850b4512fa5e4bbb964c67c215fe8ce64fe6f7e6b704180a783d8c2a04169ccb
-DIST gsl-1.6.tar.gz 2294804 RMD160 3058f95961ee42465680d616df69aca1e7fb378b SHA1 ebf287ee2b7195e557985799857b2aaca7b51148 SHA256 52e097b5228a617fef788d54eba6855c1addc62b8f68a1dfb5895cad25594f1f
-DIST gsl-1.7.tar.gz 2337248 RMD160 6f1c4178ed8021ada55f5195c2c9ec2e25f04fdf SHA1 0915f99c5eca63e6a4d4ed31b6a224789f918200 SHA256 c5f683327221491e42b81850b6c1a8557ac89382cb06b889e2f56b5b9ffcdff3
+AUX gsl-cblas.patch 2857 RMD160 2bc2973635d608cdaf73849ba1a85797bbf7dc74 SHA1 b97d867aa5389d258ec04383a1598ae1fad25446 SHA256 e0286230eff05faf9bf2c5c320a0a3a8855286ba2a5fb163cb07a5386e60c5bf
+MD5 a1165d10cfae7ee7fc928c9c47e4076e files/gsl-cblas.patch 2857
+RMD160 2bc2973635d608cdaf73849ba1a85797bbf7dc74 files/gsl-cblas.patch 2857
+SHA256 e0286230eff05faf9bf2c5c320a0a3a8855286ba2a5fb163cb07a5386e60c5bf files/gsl-cblas.patch 2857
+DIST gsl-1.10.tar.gz 2842422 RMD160 0b6ac2b1aec6a93521941620a824ae78f79adebb SHA1 401d0203d362948e30d0b3c58601a3bc52d0bfd4 SHA256 ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0
 DIST gsl-1.8.tar.gz 2419825 RMD160 f3e7f4622be56635f84c6d889bf8316dbac1edf4 SHA1 0dabdf2d024ae3b29207e485c5413676f3fa136f SHA256 a66a4c5243111f98f11114a9c7e00c316b281e8e383b0d0b8a0b7debdb27d9d6
 DIST gsl-1.9.tar.gz 2574939 RMD160 faca66d02876135c31c2f3585baa1931488e1593 SHA1 7541504ed9864b1a278f9392830ecac9e0146258 SHA256 fcd1c6784997c2312d922d107fcb30462f5be4335ebdfa8e1e0e07568c962250
-EBUILD gsl-1.4.ebuild 749 RMD160 7e696fca2e3245f3cfaa5b64e1404f22ea39db5c SHA1 151f6ee9b343de3ce4fb46268c003485af9c647f SHA256 a42cb931eb12e86e481de15b4c8cf9b2d23ccbadf05494ceb113b768c9b5b48a
-MD5 c34a30af2173d60b18a7491f133e3044 gsl-1.4.ebuild 749
-RMD160 7e696fca2e3245f3cfaa5b64e1404f22ea39db5c gsl-1.4.ebuild 749
-SHA256 a42cb931eb12e86e481de15b4c8cf9b2d23ccbadf05494ceb113b768c9b5b48a gsl-1.4.ebuild 749
-EBUILD gsl-1.6.ebuild 773 RMD160 d70e3f89acf48351a6054c607b78f88bc6a1a0e8 SHA1 212d4ec1d13311bb9581bfc429326b4ad4e9764f SHA256 5ec8fbc3a4177427633f912346225e33d6dc867011486771d9db209692b14cfe
-MD5 97343b0540dc688442a0020ff04f928a gsl-1.6.ebuild 773
-RMD160 d70e3f89acf48351a6054c607b78f88bc6a1a0e8 gsl-1.6.ebuild 773
-SHA256 5ec8fbc3a4177427633f912346225e33d6dc867011486771d9db209692b14cfe gsl-1.6.ebuild 773
-EBUILD gsl-1.7.ebuild 830 RMD160 698e0c7b0667b24621e3e2b605a19a95fa0d4bd4 SHA1 83f9fb66ad360888b3617dc41463029826b5c8ea SHA256 34d0fd6a44499c77cffb624cb7fd17c9bf0e5f7a0bd687f36003e383b0bd7eb0
-MD5 89019e69e3b12b792fa762f49841c8a1 gsl-1.7.ebuild 830
-RMD160 698e0c7b0667b24621e3e2b605a19a95fa0d4bd4 gsl-1.7.ebuild 830
-SHA256 34d0fd6a44499c77cffb624cb7fd17c9bf0e5f7a0bd687f36003e383b0bd7eb0 gsl-1.7.ebuild 830
+EBUILD gsl-1.10.ebuild 2331 RMD160 ee67e88dcf3ccae9801f7bd0219bf44de55507a0 SHA1 5922c1020eb791a00c7af77fc3750db278c03afc SHA256 34b17820a3c7f6ca1fb95f614767c2c7f379afc5e181d936b2d2a95a82487bcb
+MD5 8338ca9c9915bde112b3f6a5dd5c651d gsl-1.10.ebuild 2331
+RMD160 ee67e88dcf3ccae9801f7bd0219bf44de55507a0 gsl-1.10.ebuild 2331
+SHA256 34b17820a3c7f6ca1fb95f614767c2c7f379afc5e181d936b2d2a95a82487bcb gsl-1.10.ebuild 2331
 EBUILD gsl-1.8.ebuild 908 RMD160 f1cca82de4499fed31b1ceb55ce03f37cd960926 SHA1 aeea11f7750262d60de74bcbbbf5e99fe44f4c7b SHA256 5c9cfb936835a1a7f96e16ef1933383ef0df841d865306c17538e0f6d0f65027
 MD5 6adf32fca8c064ca2115443b9ed32384 gsl-1.8.ebuild 908
 RMD160 f1cca82de4499fed31b1ceb55ce03f37cd960926 gsl-1.8.ebuild 908
 SHA256 5c9cfb936835a1a7f96e16ef1933383ef0df841d865306c17538e0f6d0f65027 gsl-1.8.ebuild 908
-EBUILD gsl-1.9-r1.ebuild 1725 RMD160 a9b8f29cb81fd6c69858834be97660674e063adb SHA1 16c4a97bc84e9aed01f0dde9bd819604ea769a31 SHA256 ae30c65a6d40a60fdb80226a125a51fde7080c05e60faa64f6b3f97e77dd8d25
-MD5 145f5bf37c63482c8f3d63ce50e55689 gsl-1.9-r1.ebuild 1725
-RMD160 a9b8f29cb81fd6c69858834be97660674e063adb gsl-1.9-r1.ebuild 1725
-SHA256 ae30c65a6d40a60fdb80226a125a51fde7080c05e60faa64f6b3f97e77dd8d25 gsl-1.9-r1.ebuild 1725
+EBUILD gsl-1.9-r1.ebuild 2148 RMD160 63e1925ec9d852d98f81f8aacdcfe39139dbd473 SHA1 a60634447a3c8dca17528e750316ea34b2161db8 SHA256 724e0798887b5d900535e24e24e1b237b0f4fce9a7f67c5e1e7eae51f87c1bf0
+MD5 9a48578ba69f59703033e843ab8e734d gsl-1.9-r1.ebuild 2148
+RMD160 63e1925ec9d852d98f81f8aacdcfe39139dbd473 gsl-1.9-r1.ebuild 2148
+SHA256 724e0798887b5d900535e24e24e1b237b0f4fce9a7f67c5e1e7eae51f87c1bf0 gsl-1.9-r1.ebuild 2148
 EBUILD gsl-1.9.ebuild 902 RMD160 6e816c633aad0535855c04a62185081c306ef0e6 SHA1 3a3b63990bd38340d7cceb5f4fcacbded5227261 SHA256 5fb3394f666f79d36cd21232c952d5edb7cda347cc65f7558bd820fd74ce8640
 MD5 3e625ed58aecd7e1ee17ddec6a2eefaf gsl-1.9.ebuild 902
 RMD160 6e816c633aad0535855c04a62185081c306ef0e6 gsl-1.9.ebuild 902
 SHA256 5fb3394f666f79d36cd21232c952d5edb7cda347cc65f7558bd820fd74ce8640 gsl-1.9.ebuild 902
-MISC ChangeLog 6643 RMD160 eb58710d91bd70e7c138d162a703e4f271c7a03b SHA1 315bf4f3b30a8f0d6b45b3807855f5a960d11334 SHA256 0efee3f9a6d36dd75c7b5fd162d0cb28afcdb7db643ce4fb6cd0462eeb12e00a
-MD5 330227a5233b407b16e78fd7edfc8140 ChangeLog 6643
-RMD160 eb58710d91bd70e7c138d162a703e4f271c7a03b ChangeLog 6643
-SHA256 0efee3f9a6d36dd75c7b5fd162d0cb28afcdb7db643ce4fb6cd0462eeb12e00a ChangeLog 6643
+MISC ChangeLog 6984 RMD160 0dbc9fc3fa3f6aaefd6e3a64a76f3c1631c5aea4 SHA1 904f7ca338892d7eba57e5a8649c814bd471e9fa SHA256 d1ad423d5935746d93590067b23ffa0953808293cf971a8ab36bd58ef4fe4e15
+MD5 7ad7e5b1fa5a433690c2b8ac30743081 ChangeLog 6984
+RMD160 0dbc9fc3fa3f6aaefd6e3a64a76f3c1631c5aea4 ChangeLog 6984
+SHA256 d1ad423d5935746d93590067b23ffa0953808293cf971a8ab36bd58ef4fe4e15 ChangeLog 6984
 MISC metadata.xml 836 RMD160 b943f54adb51092168df6701a8b609d542294ed2 SHA1 6fa1524e79b23126873585c549946acb69999060 SHA256 5a46124b74c2db07241cec1c43eaf3c7f5882fdf9ce9587383b425443ed9a67c
 MD5 529476866309c697ceae813fad490028 metadata.xml 836
 RMD160 b943f54adb51092168df6701a8b609d542294ed2 metadata.xml 836
 SHA256 5a46124b74c2db07241cec1c43eaf3c7f5882fdf9ce9587383b425443ed9a67c metadata.xml 836
-MD5 2428f105aa658b89ebcd186ca4d1d747 files/digest-gsl-1.4 226
-RMD160 5b126f523a8a7531f85f84d921c8e8063bc168d9 files/digest-gsl-1.4 226
-SHA256 98e2e1c947d3431aa658fd2710a51db5f4650bb3d74fd54337a85f1c15a01862 files/digest-gsl-1.4 226
-MD5 b246042b9ce210d4f16595128b21b74f files/digest-gsl-1.6 226
-RMD160 5113254f56a4788818d651393659aeaf263c4bd0 files/digest-gsl-1.6 226
-SHA256 42771be2889cd93fdb6bc9428b02d17ed260039af17878a6ccd5a54e6b0f0927 files/digest-gsl-1.6 226
-MD5 a75f6fd2f233506235ce7c3e6f4600a8 files/digest-gsl-1.7 226
-RMD160 e641de26fedd00404a1081a38166e4bda213fe13 files/digest-gsl-1.7 226
-SHA256 498d9fcbc20455944b967c87631e84c658958b71d3f6301cc10b5d3a9229c535 files/digest-gsl-1.7 226
+MD5 b700c72ebce59c63bc26115233ef2873 files/digest-gsl-1.10 229
+RMD160 0e0fe6c0cb5f64d212faa5105b545a7054f5b8f5 files/digest-gsl-1.10 229
+SHA256 0cbbd8d5a2163fecec47895c7a73fafcf47e79d3b9930aca339833e08958c8c5 files/digest-gsl-1.10 229
 MD5 404138a529f7028618c4ec23c899c017 files/digest-gsl-1.8 226
 RMD160 92a4bc051c97a04bc5bcae2492195503083d6817 files/digest-gsl-1.8 226
 SHA256 457b15213bec1522c0d6aac9b82d7d9b1ecc0c7a4b3ba150e23c66f25be446ec files/digest-gsl-1.8 226
@@ -71,7 +59,7 @@ SHA256 a9b9438404a6877f83254607c14e41809f06a9143105b00d2fa2f1c92698f279 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG7YHd1ycZbhPLE2ARAr1BAJ9aldLnHbu4+6N3pgXSppSI54LAkwCbBHzU
-tOVBlEH9ql72p5iGjbYw6KQ=
-=ZyQ9
+iD8DBQFHDNIm1ycZbhPLE2ARAgiFAJ9OaM0yVmDv6YXu3pARVQOcxBxPKACeMfAG
+8xM1/XF9Df+0YbdhiXu+zWU=
+=0MDT
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/files/digest-gsl-1.10 b/sci-libs/gsl/files/digest-gsl-1.10
new file mode 100644
index 000000000000..f17e89c7b7ca
--- /dev/null
+++ b/sci-libs/gsl/files/digest-gsl-1.10
@@ -0,0 +1,3 @@
+MD5 d67be4f2e5560d6cf907e18a428becdc gsl-1.10.tar.gz 2842422
+RMD160 0b6ac2b1aec6a93521941620a824ae78f79adebb gsl-1.10.tar.gz 2842422
+SHA256 ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0 gsl-1.10.tar.gz 2842422
diff --git a/sci-libs/gsl/files/digest-gsl-1.4 b/sci-libs/gsl/files/digest-gsl-1.4
deleted file mode 100644
index 1e5992d6c778..000000000000
--- a/sci-libs/gsl/files/digest-gsl-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7513e13525c073dc07e02cc4354294e2 gsl-1.4.tar.gz 2211031
-RMD160 51daa99c9ab1fe286b4c1da061d63f99ed246604 gsl-1.4.tar.gz 2211031
-SHA256 850b4512fa5e4bbb964c67c215fe8ce64fe6f7e6b704180a783d8c2a04169ccb gsl-1.4.tar.gz 2211031
diff --git a/sci-libs/gsl/files/digest-gsl-1.6 b/sci-libs/gsl/files/digest-gsl-1.6
deleted file mode 100644
index 9bd7802a753f..000000000000
--- a/sci-libs/gsl/files/digest-gsl-1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c63ab9b925a7be70a5a5b4e0a95ea03 gsl-1.6.tar.gz 2294804
-RMD160 3058f95961ee42465680d616df69aca1e7fb378b gsl-1.6.tar.gz 2294804
-SHA256 52e097b5228a617fef788d54eba6855c1addc62b8f68a1dfb5895cad25594f1f gsl-1.6.tar.gz 2294804
diff --git a/sci-libs/gsl/files/digest-gsl-1.7 b/sci-libs/gsl/files/digest-gsl-1.7
deleted file mode 100644
index e2cfa26e059a..000000000000
--- a/sci-libs/gsl/files/digest-gsl-1.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 521b9aa094a3dc2cb088f29efca0bda3 gsl-1.7.tar.gz 2337248
-RMD160 6f1c4178ed8021ada55f5195c2c9ec2e25f04fdf gsl-1.7.tar.gz 2337248
-SHA256 c5f683327221491e42b81850b6c1a8557ac89382cb06b889e2f56b5b9ffcdff3 gsl-1.7.tar.gz 2337248
diff --git a/sci-libs/gsl/files/gsl-cblas.patch b/sci-libs/gsl/files/gsl-cblas.patch
new file mode 100644
index 000000000000..3861786a161a
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-cblas.patch
@@ -0,0 +1,90 @@
+--- configure.ac.orig	2007-09-19 13:25:25.644286706 +0100
++++ configure.ac	2007-09-19 15:58:30.963832549 +0100
+@@ -130,6 +130,14 @@
+   AC_CHECK_LIB(m, cos)
+ fi
+ 
++dnl Use alternate cblas if specified by user
++CBLAS_LIBS="-lgslcblas"
++AC_ARG_WITH(cblas,
++	    [AC_HELP_STRING([--with-cblas=<lib>], [use external CBLAS library <lib>])],
++	    [CBLAS_LIBS="$withval"])
++AM_CONDITIONAL(LINK_WITH_CBLAS_EXTERNAL, [ test ! "x$CBLAS_LIBS" = x"-lgslcblas" ])
++AC_SUBST(CBLAS_LIBS)
++
+ dnl Remember to put a definition in acconfig.h for each of these
+ AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
+ #include <fenv.h>]) 
+--- Makefile.am.orig	2007-09-19 13:25:11.299469242 +0100
++++ Makefile.am	2007-09-19 15:53:28.594601509 +0100
+@@ -15,28 +15,29 @@
+ 
+ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS SUPPORT gsl.spec.in gsl.m4 test_gsl_histogram.sh
+ 
+-lib_LTLIBRARIES = libgsl.la
+-libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
+-libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+-noinst_HEADERS = templates_on.h templates_off.h
++lib_LTLIBRARIES = libgsl.la 
+ 
+-MINGW32_HOST = @MINGW32_HOST@
+-if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+-libgsl_la_LDFLAGS += -no-undefined
++if LINK_WITH_CBLAS_EXTERNAL
++gsl_cblas = $(CBLAS_LIBS)
++else
++gsl_cblas = cblas/libgslcblas.la
+ endif
+ 
++libgsl_la_SOURCES = version.c
++libgsl_la_LDFLAGS = -no-undefined -version-info $(GSL_LT_VERSION)
++libgsl_la_LIBADD = $(SUBLIBS) $(gsl_cblas)
++noinst_HEADERS = templates_on.h templates_off.h
++
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = gsl.m4
+ 
+ bin_PROGRAMS = gsl-randist gsl-histogram
+ 
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la $(gsl_cblas)
+ 
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la $(gsl_cblas)
+ 
+ check_SCRIPTS = test_gsl_histogram.sh
+ TESTS = test_gsl_histogram.sh
+--- gsl-config.in.orig	2007-09-19 13:25:39.373069065 +0100
++++ gsl-config.in	2007-09-19 13:01:31.410346928 +0100
+@@ -19,8 +19,7 @@
+   --version		output version information
+ 
+ An external CBLAS library can be specified using the GSL_CBLAS_LIB
+-environment variable. The GSL CBLAS library is used by default.
+-
++environment variable. By default, it will use the one compiled with gsl: @CBLAS_LIBS@.
+ EOF
+ 
+     exit $1
+@@ -62,7 +61,7 @@
+        	;;
+ 
+     --libs)
+-        : ${GSL_CBLAS_LIB=-lgslcblas}
++        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
+        	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
+        	;;
+ 
+--- gsl.pc.in.orig	2007-09-19 13:25:49.477644892 +0100
++++ gsl.pc.in	2007-09-19 13:01:56.355768487 +0100
+@@ -6,5 +6,5 @@
+ Name: GSL
+ Description: GNU Scientific Library
+ Version: @VERSION@
+-Libs: @GSL_LIBS@ -lgslcblas @LIBS@
++Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@
+ Cflags: @GSL_CFLAGS@
diff --git a/sci-libs/gsl/gsl-1.10.ebuild b/sci-libs/gsl/gsl-1.10.ebuild
new file mode 100644
index 000000000000..a646b0593c73
--- /dev/null
+++ b/sci-libs/gsl/gsl-1.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.10.ebuild,v 1.1 2007/10/10 13:22:40 bicatali Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64  ~sparc ~x86 ~x86-fbsd"
+IUSE="cblas"
+
+RDEPEND="app-admin/eselect-cblas
+	cblas? ( virtual/cblas )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	# icc-10.0.026 did not pass rng tests (last check: gsl-1.10)
+	if [[ $(tc-getCC) == icc ]]; then
+		eerror "icc known to fail tests. Revert to safer compiler and re-emerge."
+		die "gsl does not work when compiled with icc"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/gsl-cblas.patch
+	eautoreconf
+}
+
+src_compile() {
+	# could someone check if they are still needed?
+	replace-cpu-flags k6 k6-2 k6-3 i586
+	filter-flags -ffast-math
+	local myconf=
+	use cblas && myconf="--with-cblas=$(pkg-config --libs cblas)"
+	econf "${myconf}"|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed."
+	dodoc AUTHORS BUGS ChangeLog NEWS README SUPPORT \
+		THANKS TODO || die "dodoc failed"
+
+	# take care of pkgconfig file for cblas implementation.
+	sed -e "s/@LIBDIR@/$(get_libdir)/" \
+		-e "s/@PV@/${PV}/" \
+		"${FILESDIR}"/cblas.pc.in > cblas.pc \
+		|| die "sed cblas.pc failed"
+	insinto /usr/$(get_libdir)/blas/gsl
+	doins cblas.pc || die "installing cblas.pc failed"
+	ESELECT_PROF=gsl
+	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	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/gsl/gsl-1.4.ebuild b/sci-libs/gsl/gsl-1.4.ebuild
deleted file mode 100644
index 3ccd902153a3..000000000000
--- a/sci-libs/gsl/gsl-1.4.ebuild
+++ /dev/null
@@ -1,34 +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/gsl/gsl-1.4.ebuild,v 1.3 2006/05/23 20:14:32 corsair Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	filter-flags -ffast-math
-	filter-mfpmath sse
-
-	econf --disable-libtool-lock || die
-	emake || die
-}
-
-src_test() {
-	make check || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS TODO THANKS
-}
diff --git a/sci-libs/gsl/gsl-1.6.ebuild b/sci-libs/gsl/gsl-1.6.ebuild
deleted file mode 100644
index 08d5ece34e30..000000000000
--- a/sci-libs/gsl/gsl-1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.6.ebuild,v 1.1 2005/01/16 14:58:45 ribosome Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~ppc64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	filter-flags -ffast-math
-	filter-mfpmath sse
-
-	econf --disable-libtool-lock || die
-	emake || die
-}
-
-src_test() {
-	make check || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SUPPORT THANKS TODO
-}
diff --git a/sci-libs/gsl/gsl-1.7.ebuild b/sci-libs/gsl/gsl-1.7.ebuild
deleted file mode 100644
index 94fa3cb692ac..000000000000
--- a/sci-libs/gsl/gsl-1.7.ebuild
+++ /dev/null
@@ -1,34 +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/gsl/gsl-1.7.ebuild,v 1.10 2007/03/28 18:15:07 grobian Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	filter-flags -ffast-math
-	filter-mfpmath sse
-
-	econf --disable-libtool-lock || die
-	emake || die 'emake failed.'
-}
-
-src_test() {
-	make check || die 'make check failed.'
-}
-
-src_install() {
-	einstall || die 'einstall failed.'
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SUPPORT THANKS TODO
-}
diff --git a/sci-libs/gsl/gsl-1.9-r1.ebuild b/sci-libs/gsl/gsl-1.9-r1.ebuild
index 45e3b95388b5..33786a689b74 100644
--- a/sci-libs/gsl/gsl-1.9-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.9-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/gsl/gsl-1.9-r1.ebuild,v 1.1 2007/08/21 17:53:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.9-r1.ebuild,v 1.2 2007/10/10 13:22:40 bicatali Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -52,11 +52,22 @@ src_install() {
 		|| die "sed cblas.pc failed"
 	insinto /usr/$(get_libdir)/blas/gsl
 	doins cblas.pc || die "installing cblas.pc failed"
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl gsl
+	ESELECT_PROF=gsl
+	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl ${ESELECT_PROF}
 }
 
 pkg_postinst() {
-	[[ -z "$(eselect cblas show)" ]] && eselect cblas set gsl
-	elog "To use CBLAS gsl implementation, you have to issue (as root):"
-	elog "\t eselect cblas set gsl"
+	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
 }