commit: 0ac46aea43d5ac971a71263868ffe2940cc58822
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 12:10:50 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 12:10:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ac46aea
sci-libs/gsl: drop package
present in ::gentoo
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-libs/gsl/files/gsl-1.16-cblas-external.patch | 294 --------------------
sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326 -----------------------
sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 101 -------
sci-libs/gsl/gsl-1.16-r2.ebuild | 64 -----
sci-libs/gsl/gsl-2.1.ebuild | 72 -----
sci-libs/gsl/gsl-2.3.ebuild | 74 -----
sci-libs/gsl/gsl-2.4.ebuild | 78 ------
sci-libs/gsl/gsl-2.5.ebuild | 78 ------
sci-libs/gsl/metadata.xml | 25 --
9 files changed, 1112 deletions(-)
diff --git a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
deleted file mode 100644
index c29ef5294..000000000
--- a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
---- gsl-1.16.orig/ax_cblas.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gsl-1.16/ax_cblas.m4 2013-08-19 15:48:54.376300825 -0700
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+ ext_cblas=no
-+ ext_cblas_libs="-lcblas"
-+ ext_cblas_cflags=""
-+
-+ AC_ARG_WITH(cblas-external,
-+ [AS_HELP_STRING([--with-cblas-external],
-+ [Use external CBLAS library (default is no)])],
-+ [with_ext_cblas=$withval],
-+ [with_ext_cblas=no])
-+
-+ case $with_ext_cblas in
-+ no) ext_cblas=no ;;
-+ yes) ext_cblas=yes ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o)
-+ ext_cblas=yes
-+ ext_cblas_libs="$with_cblas" ;;
-+ *) ext_cblas=yes
-+ ext_cblas_libs="-l$with_cblas" ;;
-+ esac
-+
-+ AC_ARG_WITH(cblas-external-libs,
-+ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+ [External cblas libraries to link with (default is
"$ext_cblas_libs")])],
-+ [ext_cblas_libs=$withval],
-+ [])
-+
-+ AC_ARG_WITH(cblas-external-cflags,
-+ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+ [Pre-processing flags to compile with external cblas
("-I<dir>")])],
-+ [ext_cblas_cflags=$withval],
-+ [])
-+
-+ if test x$ext_cblas != xno; then
-+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$ext_cblas_libs"
-+ fi
-+ if test "x$CBLAS_CFLAGS" = x; then
-+ CBLAS_CFLAGS="$ext_cblas_cflags"
-+ fi
-+
-+ CFLAGS_sav="$CFLAGS"
-+ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+ AC_CHECK_HEADER(cblas.h, ,
-+ [AC_MSG_ERROR([
-+ *** Header file cblas.h not found.
-+ *** If you installed cblas header in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-cflags="-I<include_dir>"])
-+ ])
-+ CFLAGS="$CFLAGS_sav"
-+
-+ LIBS_sav="$LIBS"
-+ LIBS="$LIBS $CBLAS_LIBS -lm"
-+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+ [AC_MSG_ERROR([
-+ *** Linking with cblas with $LIBS failed.
-+ *** If you installed cblas library in a non standard
place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+ ])
-+ AC_MSG_RESULT($ext_cblas)
-+ LIBS="$LIBS_sav"
-+ AC_SUBST([CBLAS_CFLAGS])
-+ AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
---- gsl-1.16.orig/bspline/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/bspline/Makefile.am 2013-08-19 15:25:27.728497742 -0700
-@@ -12,6 +12,6 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../cblas/libgslcblas.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la ../statistics/libgslstatistics.la
-
- test_SOURCES = test.c
-diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac
---- gsl-1.16.orig/configure.ac 2013-07-19 08:14:45.000000000 -0700
-+++ gsl-1.16/configure.ac 2013-08-19 15:28:24.172640793 -0700
-@@ -191,6 +191,16 @@
- AC_CHECK_LIB(m, cos)
- fi
-
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+ CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_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>])
-diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am
---- gsl-1.16.orig/eigen/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/eigen/Makefile.am 2013-08-19 15:25:27.728497742 -0700
-@@ -11,7 +11,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la
../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la
../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la
../rng/libgslrng.la ../sort/libgslsort.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in
---- gsl-1.16.orig/gsl-config.in 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/gsl-config.in 2013-08-19 15:25:27.728497742 -0700
-@@ -58,11 +58,11 @@
- ;;
-
- --cflags)
-- echo @GSL_CFLAGS@
-+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
- ;;
-
- --libs)
-- : ${GSL_CBLAS_LIB=-lgslcblas}
-+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
- ;;
-
-diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in
---- gsl-1.16.orig/gsl.pc.in 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/gsl.pc.in 2013-08-19 15:25:27.728497742 -0700
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
-
- Name: GSL
- Description: GNU Scientific Library
-diff -Nur gsl-1.16.orig/interpolation/Makefile.am
gsl-1.16/interpolation/Makefile.am
---- gsl-1.16.orig/interpolation/Makefile.am 2013-07-17 13:04:26.000000000
-0700
-+++ gsl-1.16/interpolation/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la
../linalg/libgsllinalg.la ../permutation/libgslpermutation.la
../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la
../linalg/libgsllinalg.la ../permutation/libgslpermutation.la
../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am
---- gsl-1.16.orig/linalg/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/linalg/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
-
- check_PROGRAMS = test
-
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
---- gsl-1.16.orig/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -19,13 +19,12 @@
-
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
-+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
-
- MINGW32_HOST = @MINGW32_HOST@
- if MINGW32_HOST
--libgsl_la_LIBADD += cblas/libgslcblas.la
- libgsl_la_LDFLAGS += -no-undefined
- endif
-
-@@ -35,10 +34,10 @@
- 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_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
-
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -57,6 +56,8 @@
- -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@VERSION[@]|$(VERSION)|g'
-
---- gsl-1.16.orig/multifit/Makefile.am 2013-07-18 06:04:26.000000000 +1000
-+++ gsl-1.16/multifit/Makefile.am 2013-11-22 16:57:26.170330257 +1100
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la
../statistics/libgslstatistics.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../utils/libutils.la ../sys/libgslsys.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../sort/libgslsort.la
../statistics/libgslstatistics.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../utils/libutils.la ../sys/libgslsys.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la
../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la
../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../utils/libutils.la ../sys/libgslsys.la
-
-diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
---- gsl-1.16.orig/multimin/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/multimin/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la
../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la
../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la
@CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
-diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am
---- gsl-1.16.orig/multiroots/Makefile.am 2013-07-17 13:04:26.000000000
-0700
-+++ gsl-1.16/multiroots/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -15,5 +15,5 @@
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la
../blas/libgslblas.la ../cblas/libgslcblas.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la
../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la
-
-diff -Nur gsl-1.16.orig/ode-initval/Makefile.am
gsl-1.16/ode-initval/Makefile.am
---- gsl-1.16.orig/ode-initval/Makefile.am 2013-07-17 13:04:26.000000000
-0700
-+++ gsl-1.16/ode-initval/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la
../permutation/libgslpermutation.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la
@CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am
---- gsl-1.16.orig/poly/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/poly/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--check_PROGRAMS = test
-+#check_PROGRAMS = test
-
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la ../sort/libgslsort.la
-diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am
---- gsl-1.16.orig/specfunc/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/specfunc/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
-
- check_PROGRAMS = test
-
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la
../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la
../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c
test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-
-diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am
---- gsl-1.16.orig/wavelet/Makefile.am 2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/wavelet/Makefile.am 2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
diff --git a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
deleted file mode 100644
index 54cc8802c..000000000
--- a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
+++ /dev/null
@@ -1,326 +0,0 @@
- Makefile.am | 8 +++---
- ax_cblas.m4 | 69 +++++++++++++++++++++++++++++++++++++++++++++++
- bspline/Makefile.am | 2 +-
- configure.ac | 10 +++++++
- eigen/Makefile.am | 2 +-
- gsl-config.in | 4 +--
- gsl.pc.in | 2 +-
- interpolation/Makefile.am | 2 +-
- linalg/Makefile.am | 2 +-
- multifit/Makefile.am | 4 +--
- multimin/Makefile.am | 4 +--
- multiroots/Makefile.am | 2 +-
- ode-initval/Makefile.am | 2 +-
- poly/Makefile.am | 2 +-
- specfunc/Makefile.am | 2 +-
- wavelet/Makefile.am | 2 +-
- 16 files changed, 100 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 278dcd9..a75418c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac
THANKS BUGS gsl.spe
-
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
-
-@@ -29,10 +29,10 @@ 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_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
-
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -51,6 +51,8 @@ edit = $(SED) \
- -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@VERSION[@]|$(VERSION)|g'
-
-diff --git a/ax_cblas.m4 b/ax_cblas.m4
-new file mode 100644
-index 0000000..6ef143a
---- /dev/null
-+++ b/ax_cblas.m4
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+ ext_cblas=no
-+ ext_cblas_libs="-lcblas"
-+ ext_cblas_cflags=""
-+
-+ AC_ARG_WITH(cblas-external,
-+ [AS_HELP_STRING([--with-cblas-external],
-+ [Use external CBLAS library (default is no)])],
-+ [with_ext_cblas=$withval],
-+ [with_ext_cblas=no])
-+
-+ case $with_ext_cblas in
-+ no) ext_cblas=no ;;
-+ yes) ext_cblas=yes ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o)
-+ ext_cblas=yes
-+ ext_cblas_libs="$with_cblas" ;;
-+ *) ext_cblas=yes
-+ ext_cblas_libs="-l$with_cblas" ;;
-+ esac
-+
-+ AC_ARG_WITH(cblas-external-libs,
-+ [AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+ [External cblas libraries to link with (default is
"$ext_cblas_libs")])],
-+ [ext_cblas_libs=$withval],
-+ [])
-+
-+ AC_ARG_WITH(cblas-external-cflags,
-+ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+ [Pre-processing flags to compile with external cblas
("-I<dir>")])],
-+ [ext_cblas_cflags=$withval],
-+ [])
-+
-+ if test x$ext_cblas != xno; then
-+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$ext_cblas_libs"
-+ fi
-+ if test "x$CBLAS_CFLAGS" = x; then
-+ CBLAS_CFLAGS="$ext_cblas_cflags"
-+ fi
-+
-+ CFLAGS_sav="$CFLAGS"
-+ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+ AC_CHECK_HEADER(cblas.h, ,
-+ [AC_MSG_ERROR([
-+ *** Header file cblas.h not found.
-+ *** If you installed cblas header in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-cflags="-I<include_dir>"])
-+ ])
-+ CFLAGS="$CFLAGS_sav"
-+
-+ LIBS_sav="$LIBS"
-+ LIBS="$LIBS $CBLAS_LIBS -lm"
-+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+ [AC_MSG_ERROR([
-+ *** Linking with cblas with $LIBS failed.
-+ *** If you installed cblas library in a non standard
place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+ ])
-+ AC_MSG_RESULT($ext_cblas)
-+ LIBS="$LIBS_sav"
-+ AC_SUBST([CBLAS_CFLAGS])
-+ AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff --git a/bspline/Makefile.am b/bspline/Makefile.am
-index 3f4f950..d413036 100644
---- a/bspline/Makefile.am
-+++ b/bspline/Makefile.am
-@@ -12,6 +12,6 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../cblas/libgslcblas.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la ../statistics/libgslstatistics.la
-
- test_SOURCES = test.c
-diff --git a/configure.ac b/configure.ac
-index d6b673f..c642454 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -205,6 +205,16 @@ if test "x$LIBS" = "x" ; then
- AC_CHECK_LIB(m, cos)
- fi
-
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+ CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_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>])
-diff --git a/eigen/Makefile.am b/eigen/Makefile.am
-index c28bfde..14197a4 100644
---- a/eigen/Makefile.am
-+++ b/eigen/Makefile.am
-@@ -11,7 +11,7 @@ noinst_HEADERS = qrstep.c
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la
../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la
../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la
../rng/libgslrng.la ../sort/libgslsort.la
-
- test_SOURCES = test.c
-
-diff --git a/gsl-config.in b/gsl-config.in
-old mode 100755
-new mode 100644
-index 3f3fa61..c9c4262
---- a/gsl-config.in
-+++ b/gsl-config.in
-@@ -58,11 +58,11 @@ while test $# -gt 0; do
- ;;
-
- --cflags)
-- echo @GSL_CFLAGS@
-+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
- ;;
-
- --libs)
-- : ${GSL_CBLAS_LIB=-lgslcblas}
-+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
- ;;
-
-diff --git a/gsl.pc.in b/gsl.pc.in
-index 5e9ef21..5a7a0f3 100644
---- a/gsl.pc.in
-+++ b/gsl.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
-
- Name: GSL
- Description: GNU Scientific Library
-diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
-index 1d80755..e45bd51 100644
---- a/interpolation/Makefile.am
-+++ b/interpolation/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la
../linalg/libgsllinalg.la ../permutation/libgslpermutation.la
../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la
../linalg/libgsllinalg.la ../permutation/libgslpermutation.la
../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/linalg/Makefile.am b/linalg/Makefile.am
-index 8fb6e7c..90d22e0 100644
---- a/linalg/Makefile.am
-+++ b/linalg/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
-
- check_PROGRAMS = test
-
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/multifit/Makefile.am b/multifit/Makefile.am
-index 891964b..b33f71e 100644
---- a/multifit/Makefile.am
-+++ b/multifit/Makefile.am
-@@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la
../statistics/libgslstatistics.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la
../specfunc/libgslspecfunc.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../sort/libgslsort.la
../statistics/libgslstatistics.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la
../specfunc/libgslspecfunc.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la
../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la
../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la
../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../utils/libutils.la ../sys/libgslsys.la
-
-diff --git a/multimin/Makefile.am b/multimin/Makefile.am
-index 7071359..65a488a 100644
---- a/multimin/Makefile.am
-+++ b/multimin/Makefile.am
-@@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la
../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la
../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la
@CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
-diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
-index a351c3f..6178448 100644
---- a/multiroots/Makefile.am
-+++ b/multiroots/Makefile.am
-@@ -15,5 +15,5 @@ check_PROGRAMS = test
- TESTS = $(check_PROGRAMS)
-
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la
../blas/libgslblas.la ../cblas/libgslcblas.la
../permutation/libgslpermutation.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la
../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la
-
-diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
-index 9c774b5..346c381 100644
---- a/ode-initval/Makefile.am
-+++ b/ode-initval/Makefile.am
-@@ -12,7 +12,7 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la
../cblas/libgslcblas.la ../matrix/libgslmatrix.la
../permutation/libgslpermutation.la ../vector/libgslvector.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la
@CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la
../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
-diff --git a/poly/Makefile.am b/poly/Makefile.am
-index f1dae5d..e0f8e83 100644
---- a/poly/Makefile.am
-+++ b/poly/Makefile.am
-@@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
-
- TESTS = $(check_PROGRAMS)
-
--check_PROGRAMS = test
-+#check_PROGRAMS = test
-
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la ../sort/libgslsort.la
-diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
-index 0a7e672..d1361d0 100644
---- a/specfunc/Makefile.am
-+++ b/specfunc/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
-
- check_PROGRAMS = test
-
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la
../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la
../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la
../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../block/libgslblock.la ../complex/libgslcomplex.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c
test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-
-diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
-index 9da20d8..8cdbd77 100644
---- a/wavelet/Makefile.am
-+++ b/wavelet/Makefile.am
-@@ -10,7 +10,7 @@ check_PROGRAMS = test
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la
-
- test_SOURCES = test.c
-
diff --git a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
deleted file mode 100644
index 38b25aacc..000000000
--- a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c522001..4513bc8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac
THANKS BUGS gsl.spe
-
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
-
-@@ -29,10 +29,10 @@ 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_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
-
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -51,6 +51,8 @@ edit = $(SED) \
- -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@VERSION[@]|$(VERSION)|g'
-
-diff --git a/configure.ac b/configure.ac
-index a26fc1e..564d426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -208,6 +208,16 @@ if test "x$LIBS" = "x" ; then
- AC_CHECK_LIB(m, cos)
- fi
-
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+ CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+ CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_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>])
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index f0dcc02..b2f0c0e 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -8,5 +8,5 @@ examples_txt = blas.txt block.txt bspline.txt cblas.txt
cdf.txt cheb.txt combina
-
- dist_noinst_DATA = $(examples_src) $(examples_txt)
-
--LDADD = ../../libgsl.la ../../cblas/libgslcblas.la
-+LDADD = ../../libgsl.la @CBLAS_LINK_LIBS@
- AM_DEFAULT_SOURCE_EXT = .c
-diff --git a/gsl-config.in b/gsl-config.in
-old mode 100755
-new mode 100644
-index 3f3fa61..c9c4262
---- a/gsl-config.in
-+++ b/gsl-config.in
-@@ -58,11 +58,11 @@ while test $# -gt 0; do
- ;;
-
- --cflags)
-- echo @GSL_CFLAGS@
-+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
- ;;
-
- --libs)
-- : ${GSL_CBLAS_LIB=-lgslcblas}
-+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
- ;;
-
-diff --git a/gsl.pc.in b/gsl.pc.in
-index 5e9ef21..5a7a0f3 100644
---- a/gsl.pc.in
-+++ b/gsl.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
-
- Name: GSL
- Description: GNU Scientific Library
-
diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild
deleted file mode 100644
index a28f92b5c..000000000
--- a/sci-libs/gsl/gsl-1.16-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit alternatives-2 autotools-multilib eutils toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- local myeconfargs=(
- $(use_with cblas-external)
- )
- autotools-multilib_src_configure
-}
-
-multilib_src_install() {
- autotools-utils_src_install
- local libname=gslcblas
-
- cat <<-EOF > ${libname}.pc
- prefix=${EPREFIX}/usr
- libdir=\${prefix}/$(get_libdir)
- includedir=\${prefix}/include
- Name: ${libname}
- Description: ${DESCRIPTION} CBLAS implementation
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -l${libname}
- Libs.private: -lm
- Cflags: -I\${includedir}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${libname}.pc
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc
)
-}
-
-multilib_src_install_all() {
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
deleted file mode 100644
index 299a889fc..000000000
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags
cblas)"
- fi
- econf $(use_with cblas-external)
- }
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc
${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
deleted file mode 100644
index 296d8e964..000000000
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-cblas-external.patch
- )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags
cblas)"
- fi
- econf $(use_with cblas-external)
- }
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc
${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
deleted file mode 100644
index f8cb47e0f..000000000
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives-2 autotools flag-o-matic multilib-build numeric
toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-cblas-external.patch
- )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags
cblas)"
- fi
- econf $(use_with cblas-external)
- }
- # fma flags, which can be enabled by -march=native, cause some tests to
fail.
- # https://github.com/gentoo/sci/pull/815
- append-cflags $(test-flags-CC -mno-fma -mno-fma4)
-
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc
${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
deleted file mode 100644
index 3dda7b878..000000000
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives-2 autotools flag-o-matic multilib-build numeric
toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/";
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-cblas-external.patch
- )
-
-src_prepare() {
- default
- eautoreconf
- multilib_copy_sources
-}
-
-src_configure() {
- gsl_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags
cblas)"
- fi
- econf $(use_with cblas-external)
- }
- # fma flags, which can be enabled by -march=native, cause some tests to
fail.
- # https://github.com/gentoo/sci/pull/815
- append-cflags $(test-flags-CC -mno-fma -mno-fma4)
-
- multilib_foreach_abi run_in_build_dir gsl_configure
-}
-
-src_compile() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_test() {
- multilib_foreach_abi run_in_build_dir default
-}
-
-src_install() {
- gsl_install() {
- local libname=gslcblas
-
- create_pkgconfig \
- --name "${libname}" \
- --description "${PN} CBLAS implementation" \
- --libs "-l${libname}" \
- --libs-private "-lm" \
- --cflags "-I\${includedir}/${PN}" \
- --version "${PV}" \
- --url "${HOMEPAGE}" \
- "${libname}"
-
- GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc
${libname}.pc )
-
- default
- }
- multilib_foreach_abi run_in_build_dir gsl_install
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- ${GSL_ALTERNATIVES[@]} \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
deleted file mode 100644
index 06112a27a..000000000
--- a/sci-libs/gsl/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>s...@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
-The GNU Scientific Library (GSL) is a collection of routines for
-numerical analysis. The routines are written from scratch by the GSL
-team in C, and present a modern API for C programmers, while allowing
-wrappers to be written for very high level languages.
-
-GSL includes data types and routines for complex numbers, vectors,
-matrices, basic linear algebra subroutines (BLAS), eigensystems,
-simulated annealing, minimization, root finding, pseudo-random
-numbers, least-squares fitting, fast Fourier transforms (FFT),
-differential equations, quadrature, Monte Carlo integration, special
-functions, physical constants, and much more.
-</longdescription>
- <use>
- <flag name="cblas-external">Link gsl with external cblas
provided by
-(<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
- </use>
-</pkgmetadata>
