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

5 files changed, 93 insertions, 9 deletions

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@