[gentoo-commits] repo/gentoo:master commit in: sci-libs/gsl/files/, sci-libs/gsl/

["Justin Lecher" <jlec@gentoo.org>]

commit:     5f6fff9d6aff0ec74992e720b59652c8e65f7e60
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 19:49:31 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 16:24:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6fff9d

sci-libs/gsl: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/gsl/Manifest                   |   1 -
 sci-libs/gsl/files/gsl-1.14-cblas.patch | 285 --------------------------------
 sci-libs/gsl/gsl-1.14.ebuild            |  91 ----------
 sci-libs/gsl/metadata.xml               |   2 +-
 4 files changed, 1 insertion(+), 378 deletions(-)

diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index e8d4f65..3cc474c 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,4 +1,3 @@
-DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb SHA512 ac8d9ba4d6e3f5d698e86130af4b4218d36b22525e966ba5d7b47d44f7ad1bef19287efa05f6ad63a81e676179bd3a0bd19461f8383e85a4d674835ff69fcc42 WHIRLPOOL ddc6637b95ad5b2c3943f067f9979fc3070204a04a85e82365c8fd6aec6685a2827bea7056138139893f7bb6cc449318797d235dfe5fee525b1b519927148b0b
 DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa3900006e52e494e9e2fcd34ec06301
 DIST gsl-2.1.tar.gz 3827265 SHA256 59ad06837397617f698975c494fe7b2b698739a59e2fcf830b776428938a0c66 SHA512 d63660fdfae9c9ec9f4fd1894b0af705297cefb6169973ef10faacd0b8a3d52f537508e9c07f4f9f4253138cc48e5570bb10ef303538226d7febd92e8fd184b0 WHIRLPOOL 60aa8ea8d19bc88ace49fcb807f63877d3bd32ff5c9bbca0db9d45b55b3929bba93756f82ce8777be852ca9b015e425540b33091a58ea7edac0d74560cbe39a5
 DIST gsl-2.3.tar.gz 4510731 SHA256 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb SHA512 ada622079f4ac667d95f74b38aa368726fc1b18fd34555bcefe90920d3da93a9289ebff966be43325af806107001bc8973daf9f8418e6c97b866be2296b566ff WHIRLPOOL f6c597f88ccc4b98002f3887a0268f4964c2c6243196e1fd862f3c7360798900a8cfa4d739b9876b13b71481d175904d1577b6b059a31aa16156fe9fc3848ea5

diff --git a/sci-libs/gsl/files/gsl-1.14-cblas.patch b/sci-libs/gsl/files/gsl-1.14-cblas.patch
deleted file mode 100644
index b8d9fb7..00000000
--- a/sci-libs/gsl/files/gsl-1.14-cblas.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-diff -Nur gsl-1.14.orig/acx_cblas.m4 gsl-1.14/acx_cblas.m4
---- gsl-1.14.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gsl-1.14/acx_cblas.m4	2010-04-09 02:19:59.000000000 +0100
-@@ -0,0 +1,60 @@
-+AC_DEFUN([ACX_CBLAS],[
-+  use_cblas=no
-+  use_cblas_libs="-lcblas -lblas"
-+  use_cblas_cflags=""
-+
-+  AC_ARG_WITH(cblas,
-+	[AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
-+
-+  case $with_cblas in
-+	yes) use_cblas=yes ;;
-+	no | "" ) use_cblas=no ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;;
-+	*) use_cblas_libs="-l$with_cblas" ;;
-+  esac
-+
-+  AC_ARG_WITH(cblas-libs,
-+	[AS_HELP_STRING([--with-cblas-libs=<libs>],
-+	 [external cblas libraries to link with (default is "$use_cblas_libs")])],
-+	[use_cblas_libs=$withval], [])
-+
-+  AC_ARG_WITH(cblas-cflags,
-+	[AS_HELP_STRING([--with-cblas-cflags=<flags>],
-+	 [extra cflags to compile with external cblas ("-I<dir>")])],
-+	[use_cblas_cflags=$withval], [])
-+
-+  if test x$use_cblas != xno; then
-+	if test "x$CBLAS_LIBS" = x; then
-+		CBLAS_LIBS="$use_cblas_libs"
-+     	fi
-+     	if test "x$CBLAS_FLAGS" = x; then
-+       		CBLAS_CFLAGS="$use_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-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, [use_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-libs="-L<lib_dir> -l<lib>"])
-+	 	])
-+   	AC_MSG_RESULT($use_cblas)
-+   	LIBS="$LIBS_sav"
-+	AC_SUBST(CBLAS_CFLAGS)
-+	AC_SUBST(CBLAS_LIBS)
-+ fi
-+])
-diff -Nur gsl-1.14.orig/bspline/Makefile.am gsl-1.14/bspline/Makefile.am
---- gsl-1.14.orig/bspline/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/bspline/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/configure.ac gsl-1.14/configure.ac
---- gsl-1.14.orig/configure.ac	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/configure.ac	2010-04-09 02:19:59.000000000 +0100
-@@ -185,6 +185,16 @@
-   AC_CHECK_LIB(m, cos)
- fi
- 
-+sinclude(acx_cblas.m4)
-+ACX_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.14.orig/eigen/Makefile.am gsl-1.14/eigen/Makefile.am
---- gsl-1.14.orig/eigen/Makefile.am	2010-04-09 02:04:46.000000000 +0100
-+++ gsl-1.14/eigen/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/gsl-config.in gsl-1.14/gsl-config.in
---- gsl-1.14.orig/gsl-config.in	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/gsl-config.in	2010-04-09 02:19:59.000000000 +0100
-@@ -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 -lm
-        	;;
- 
-diff -Nur gsl-1.14.orig/gsl.pc.in gsl-1.14/gsl.pc.in
---- gsl-1.14.orig/gsl.pc.in	2010-04-09 02:04:46.000000000 +0100
-+++ gsl-1.14/gsl.pc.in	2010-04-09 02:19:59.000000000 +0100
-@@ -6,5 +6,5 @@
- Name: GSL
- Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ -lgslcblas @LIBS@
--Cflags: @GSL_CFLAGS@
-+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@
-+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
-diff -Nur gsl-1.14.orig/interpolation/Makefile.am gsl-1.14/interpolation/Makefile.am
---- gsl-1.14.orig/interpolation/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/interpolation/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/linalg/Makefile.am gsl-1.14/linalg/Makefile.am
---- gsl-1.14.orig/linalg/Makefile.am	2010-04-09 02:04:46.000000000 +0100
-+++ gsl-1.14/linalg/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/Makefile.am gsl-1.14/Makefile.am
---- gsl-1.14.orig/Makefile.am	2010-04-09 02:04:46.000000000 +0100
-+++ gsl-1.14/Makefile.am	2010-04-09 02:20:13.000000000 +0100
-@@ -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
- TESTS = test_gsl_histogram.sh
-@@ -56,6 +55,8 @@
- 	-e 's|@includedir[@]|$(includedir)|g' \
- 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|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 -Nur gsl-1.14.orig/multifit/Makefile.am gsl-1.14/multifit/Makefile.am
---- gsl-1.14.orig/multifit/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/multifit/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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 ../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 ../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.14.orig/multimin/Makefile.am gsl-1.14/multimin/Makefile.am
---- gsl-1.14.orig/multimin/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/multimin/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/multiroots/Makefile.am gsl-1.14/multiroots/Makefile.am
---- gsl-1.14.orig/multiroots/Makefile.am	2010-04-09 02:04:46.000000000 +0100
-+++ gsl-1.14/multiroots/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/ode-initval/Makefile.am gsl-1.14/ode-initval/Makefile.am
---- gsl-1.14.orig/ode-initval/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/ode-initval/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/poly/Makefile.am gsl-1.14/poly/Makefile.am
---- gsl-1.14.orig/poly/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/poly/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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
-diff -Nur gsl-1.14.orig/specfunc/Makefile.am gsl-1.14/specfunc/Makefile.am
---- gsl-1.14.orig/specfunc/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/specfunc/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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.14.orig/wavelet/Makefile.am gsl-1.14/wavelet/Makefile.am
---- gsl-1.14.orig/wavelet/Makefile.am	2010-04-09 02:04:47.000000000 +0100
-+++ gsl-1.14/wavelet/Makefile.am	2010-04-09 02:19:59.000000000 +0100
-@@ -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/gsl-1.14.ebuild b/sci-libs/gsl/gsl-1.14.ebuild
deleted file mode 100644
index b113094..00000000
--- a/sci-libs/gsl/gsl-1.14.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-pkg_setup() {
-	ESELECT_PROF="gsl"
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib=$(eselect cblas show | cut -d' ' -f2)
-	if use cblas-external && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-		ewarn "However the current selected external cblas is gsl."
-		ewarn "Please install and/or eselect another cblas"
-		die "Circular gsl dependency"
-	fi
-}
-
-src_prepare() {
-	filter-flags -ffast-math
-	epatch "${FILESDIR}"/${P}-cblas.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_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 cblas)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-
-	# take care of pkgconfig file for cblas implementation.
-	sed -e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${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 cblas add $(get_libdir) "${T}"/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="${EROOT}"/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
-		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
-}
-
-src_test() {
-	emake -j1 check || die
-}

diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index eb06cc2..4a8296b 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -21,6 +21,6 @@
   <use>
     <flag name="cblas-external">Link gsl with external cblas provided by
     (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
-   <flag name="deprecated">Enable deprecated functions</flag>
+    <flag name="deprecated">Enable deprecated functions</flag>
   </use>
 </pkgmetadata>