Renamed cblas to cblas-external wrt bug 330251. Dropped ~ppc-macos due to unsolved deps. Remove old patches.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

8 files changed, 40 insertions, 323 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index c4a8d632d198..1ad4e86f0f91 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.76 2010/07/18 13:57:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+
+  09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/gsl-1.6-deps.diff, -files/gsl-1.12-cblas.patch, gsl-1.13-r1.ebuild,
+  gsl-1.13-r2.ebuild, gsl-1.14.ebuild, gsl-1.14-r1.ebuild, metadata.xml:
+  Renamed cblas to cblas-external wrt bug 330251. Dropped ~ppc-macos due to
+  unsolved deps. Remove old patches.
 
   18 Jul 2010; <nixnut@gentoo.org> gsl-1.14.ebuild:
   ppc stable #325179
diff --git a/sci-libs/gsl/files/gsl-1.12-cblas.patch b/sci-libs/gsl/files/gsl-1.12-cblas.patch
deleted file mode 100644
index 945db891d8d7..000000000000
--- a/sci-libs/gsl/files/gsl-1.12-cblas.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff -Nur gsl-1.12.orig/acx_cblas.m4 gsl-1.12/acx_cblas.m4
---- gsl-1.12.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gsl-1.12/acx_cblas.m4	2009-01-19 15:45:43.319918648 +0000
-@@ -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.12.orig/bspline/Makefile.am gsl-1.12/bspline/Makefile.am
---- gsl-1.12.orig/bspline/Makefile.am	2008-12-08 20:42:50.000000000 +0000
-+++ gsl-1.12/bspline/Makefile.am	2009-01-19 15:46:59.967091996 +0000
-@@ -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
-+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
- 
- test_SOURCES = test.c
-diff -Nur gsl-1.12.orig/configure.ac gsl-1.12/configure.ac
---- gsl-1.12.orig/configure.ac	2008-12-15 14:52:45.000000000 +0000
-+++ gsl-1.12/configure.ac	2009-01-19 15:45:36.267801871 +0000
-@@ -169,6 +169,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.12.orig/eigen/Makefile.am gsl-1.12/eigen/Makefile.am
---- gsl-1.12.orig/eigen/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/eigen/Makefile.am	2009-01-19 15:46:59.999090878 +0000
-@@ -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.12.orig/gsl-config.in gsl-1.12/gsl-config.in
---- gsl-1.12.orig/gsl-config.in	2008-02-05 13:22:10.000000000 +0000
-+++ gsl-1.12/gsl-config.in	2009-01-19 15:45:06.176046040 +0000
-@@ -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.12.orig/gsl.pc.in gsl-1.12/gsl.pc.in
---- gsl-1.12.orig/gsl.pc.in	2008-11-19 09:13:46.000000000 +0000
-+++ gsl-1.12/gsl.pc.in	2009-01-19 15:45:15.227937645 +0000
-@@ -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.12.orig/interpolation/Makefile.am gsl-1.12/interpolation/Makefile.am
---- gsl-1.12.orig/interpolation/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/interpolation/Makefile.am	2009-01-19 15:47:00.019091996 +0000
-@@ -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.12.orig/linalg/Makefile.am gsl-1.12/linalg/Makefile.am
---- gsl-1.12.orig/linalg/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/linalg/Makefile.am	2009-01-19 15:47:00.023091716 +0000
-@@ -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.12.orig/Makefile.am gsl-1.12/Makefile.am
---- gsl-1.12.orig/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/Makefile.am	2009-01-19 15:45:50.463861656 +0000
-@@ -17,13 +17,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
- 
-@@ -33,10 +32,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
-diff -Nur gsl-1.12.orig/multifit/Makefile.am gsl-1.12/multifit/Makefile.am
---- gsl-1.12.orig/multifit/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/multifit/Makefile.am	2009-01-19 15:47:00.031091716 +0000
-@@ -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.12.orig/multimin/Makefile.am gsl-1.12/multimin/Makefile.am
---- gsl-1.12.orig/multimin/Makefile.am	2008-11-29 17:51:18.000000000 +0000
-+++ gsl-1.12/multimin/Makefile.am	2009-01-19 15:47:00.035091996 +0000
-@@ -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.12.orig/multiroots/Makefile.am gsl-1.12/multiroots/Makefile.am
---- gsl-1.12.orig/multiroots/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/multiroots/Makefile.am	2009-01-19 15:47:00.035091996 +0000
-@@ -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.12.orig/ode-initval/Makefile.am gsl-1.12/ode-initval/Makefile.am
---- gsl-1.12.orig/ode-initval/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/ode-initval/Makefile.am	2009-01-19 15:47:00.039090878 +0000
-@@ -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.12.orig/poly/Makefile.am gsl-1.12/poly/Makefile.am
---- gsl-1.12.orig/poly/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/poly/Makefile.am	2009-01-19 15:47:00.047090599 +0000
-@@ -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.12.orig/specfunc/Makefile.am gsl-1.12/specfunc/Makefile.am
---- gsl-1.12.orig/specfunc/Makefile.am	2008-11-27 20:03:28.000000000 +0000
-+++ gsl-1.12/specfunc/Makefile.am	2009-01-19 15:47:00.063090599 +0000
-@@ -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.12.orig/wavelet/Makefile.am gsl-1.12/wavelet/Makefile.am
---- gsl-1.12.orig/wavelet/Makefile.am	2008-11-27 20:03:29.000000000 +0000
-+++ gsl-1.12/wavelet/Makefile.am	2009-01-19 15:47:00.163091437 +0000
-@@ -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-1.6-deps.diff b/sci-libs/gsl/files/gsl-1.6-deps.diff
deleted file mode 100644
index f6460e0b512a..000000000000
--- a/sci-libs/gsl/files/gsl-1.6-deps.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.am
-+++ Makefile.am	2005/04/25 13:12:35
-@@ -17,8 +17,8 @@
- 
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
--libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
-+libgsl_la_LIBADD = $(SUBLIBS) cblas/libgslcblas.la
-+libgsl_la_LDFLAGS = -no-undefined -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h
- 
- m4datadir = $(datadir)/aclocal
diff --git a/sci-libs/gsl/gsl-1.13-r1.ebuild b/sci-libs/gsl/gsl-1.13-r1.ebuild
index 59a4577cd05f..4ee4641b80d3 100644
--- a/sci-libs/gsl/gsl-1.13-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r1.ebuild,v 1.7 2010/04/09 08:48:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r1.ebuild,v 1.8 2010/08/09 09:32:55 xarthisius Exp $
 
 EAPI=2
 inherit eutils flag-o-matic autotools
@@ -12,9 +12,9 @@ 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"
-IUSE="cblas"
+IUSE="cblas-external"
 
-RDEPEND="cblas? ( virtual/cblas )"
+RDEPEND="cblas-external? ( virtual/cblas )"
 DEPEND="${RDEPEND}
 	app-admin/eselect-cblas
 	dev-util/pkgconfig"
@@ -23,8 +23,8 @@ 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 && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas is set: linking gsl with an external cblas."
+	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"
@@ -39,11 +39,11 @@ src_prepare() {
 }
 
 src_configure() {
-	if use cblas; then
+	if use cblas-external; then
 		export CBLAS_LIBS="$(pkg-config --libs cblas)"
 		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
 	fi
-	econf $(use_with cblas)
+	econf $(use_with cblas-external cblas)
 }
 
 src_install() {
diff --git a/sci-libs/gsl/gsl-1.13-r2.ebuild b/sci-libs/gsl/gsl-1.13-r2.ebuild
index a679d0007a6f..77e16969a219 100644
--- a/sci-libs/gsl/gsl-1.13-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r2.ebuild,v 1.1 2010/03/07 19:26:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r2.ebuild,v 1.2 2010/08/09 09:32:55 xarthisius Exp $
 
 EAPI="3"
 
@@ -12,10 +12,10 @@ 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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas"
+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? ( virtual/cblas )"
+RDEPEND="cblas-external? ( virtual/cblas )"
 DEPEND="${RDEPEND}
 	app-admin/eselect-cblas
 	dev-util/pkgconfig"
@@ -24,8 +24,8 @@ 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 && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas is set: linking gsl with an external cblas."
+	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"
@@ -47,11 +47,11 @@ src_prepare() {
 }
 
 src_configure() {
-	if use cblas; then
+	if use cblas-external; then
 		export CBLAS_LIBS="$(pkg-config --libs cblas)"
 		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
 	fi
-	econf $(use_with cblas)
+	econf $(use_with cblas-external cblas)
 }
 
 src_install() {
diff --git a/sci-libs/gsl/gsl-1.14-r1.ebuild b/sci-libs/gsl/gsl-1.14-r1.ebuild
index 24ee52d9da5b..783bd0a496da 100644
--- a/sci-libs/gsl/gsl-1.14-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.2 2010/06/25 17:21:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.3 2010/08/09 09:32:55 xarthisius Exp $
 
 EAPI="3"
 
@@ -12,10 +12,10 @@ 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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas static-libs"
+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 static-libs"
 
-RDEPEND="cblas? ( virtual/cblas )"
+RDEPEND="cblas-external? ( virtual/cblas )"
 DEPEND="${RDEPEND}
 	app-admin/eselect-cblas
 	dev-util/pkgconfig"
@@ -24,8 +24,8 @@ 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 && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas is set: linking gsl with an external cblas."
+	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"
@@ -46,13 +46,13 @@ src_prepare() {
 }
 
 src_configure() {
-	if use cblas; then
+	if use cblas-external; then
 		export CBLAS_LIBS="$(pkg-config --libs cblas)"
 		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
 	fi
 	econf \
 		--enable-shared \
-		$(use_with cblas) \
+		$(use_with cblas-external cblas) \
 		$(use_enable static-libs static)
 }
 
diff --git a/sci-libs/gsl/gsl-1.14.ebuild b/sci-libs/gsl/gsl-1.14.ebuild
index 9591cfdc70db..d076d62cbe81 100644
--- a/sci-libs/gsl/gsl-1.14.ebuild
+++ b/sci-libs/gsl/gsl-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14.ebuild,v 1.7 2010/07/18 13:57:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14.ebuild,v 1.8 2010/08/09 09:32:55 xarthisius Exp $
 
 EAPI="3"
 
@@ -12,10 +12,10 @@ 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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas"
+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? ( virtual/cblas )"
+RDEPEND="cblas-external? ( virtual/cblas )"
 DEPEND="${RDEPEND}
 	app-admin/eselect-cblas
 	dev-util/pkgconfig"
@@ -24,8 +24,8 @@ 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 && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas is set: linking gsl with an external cblas."
+	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"
@@ -46,11 +46,11 @@ src_prepare() {
 }
 
 src_configure() {
-	if use cblas; then
+	if use cblas-external; then
 		export CBLAS_LIBS="$(pkg-config --libs cblas)"
 		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
 	fi
-	econf $(use_with cblas)
+	econf $(use_with cblas-external cblas)
 }
 
 src_install() {
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 72f4dcdce254..a0c38aac7918 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -16,7 +16,7 @@
   functions, physical constants, and much more. 
 </longdescription>
 <use>
-  <flag name='cblas'>Link gsl with external cblas provided by
-    (<pkg>virtual/cblas</pkg>)</flag>
+  <flag name='cblas-external'>Link gsl with external cblas provided by
+    (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
 </use>
 </pkgmetadata>