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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 46 insertions, 331 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/Manifest b/sci-libs/gsl/Manifest
index de96c0596884..d0528e2bce75 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,15 +1,13 @@
 AUX cblas.pc.in 290 RMD160 4fc855a67383ac17b68c29d8f10307178919e217 SHA1 ec23b2092a5498beb602c9b558af8abcf5dd6358 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1
 AUX eselect.cblas.gsl 216 RMD160 b2c3d435952eb73fcd02406fbd087176407c1f76 SHA1 814489871b93c2b4f7195fb9bbef1227e04c36cf SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7
-AUX gsl-1.12-cblas.patch 16856 RMD160 4753e1cbefb13c5bce0d4ac67e282257269a566b SHA1 f5c3a654ef3b1ceb679610b277c0e68327a63b1a SHA256 05cf7ae01be3e7adc8e4c968caaf625e798de04f96e7f756cefba155f1cbaae6
 AUX gsl-1.13-cblas-vars.patch 403 RMD160 f2633cc65627656287909ec37e568e1cd96be138 SHA1 82715bea7524bda9c1bb49e1b9700163795d8b80 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40
 AUX gsl-1.13-cblas.patch 15524 RMD160 294638c284b5b06f12405dd834b329a0755b1edd SHA1 fa0b377a7e40a9ba660909ab369fc3a744b9ae1a SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890
 AUX gsl-1.14-cblas.patch 17218 RMD160 0e168003aa059083463f1f60a8767c920c328bef SHA1 730bedfe54c179984b43a8cee02ce3a6d3ee26b9 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d
-AUX gsl-1.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b03629fad9b09c918ccea6bc328c9b8eb256d351 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f
 DIST gsl-1.13.tar.gz 3014270 RMD160 f71507181ace425df0977a13946f12cae4b65783 SHA1 02db78b9583bc7b2a577da6f45f5dd9f23ef737e SHA256 094648a6e40854cbe006357213fb16fe3e55d048a4a4df675df36a540f8ba2c7
 DIST gsl-1.14.tar.gz 3128269 RMD160 c89a30a0b38a0c83d73ded19180d52acd56e6a52 SHA1 e1a600e4fe359692e6f0e28b7e12a96681efbe52 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
-EBUILD gsl-1.13-r1.ebuild 2437 RMD160 8ffa2930d99a3709738b1a31cde714f40f696678 SHA1 3784388be04ad1161ff69d4daa320f82e8079e9f SHA256 4df7154d88b527d621734151a9510c5de6c62cc5b95b02e899282fef9cee0e58
-EBUILD gsl-1.13-r2.ebuild 2840 RMD160 8226d0b1d2b3f36d7a812a9970746bcc84481859 SHA1 44ffe6996747ab91353736258138857c15598737 SHA256 574c3173cb901eb390f1a46cc6f301bb522523a78e0c71870a49ee64c5a12640
-EBUILD gsl-1.14-r1.ebuild 2873 RMD160 b12670414fa7f01f9feb08d350d8c17d7466fe6f SHA1 c1244c8e4be38e93fbd07919aa5f0cde5fb9186b SHA256 3814169322a34003e2d70f26c47b26a4a34fcd6a8c3b73c10e70ab9491527baa
-EBUILD gsl-1.14.ebuild 2784 RMD160 082db6f84d7e3b895dbafbf75d5efe6baa21b29a SHA1 35beb7f62b5b3e202830321c5c73364f9fe9b52c SHA256 442512c3f53934e0fb7990ccad0f3c3492ec7f257a7a38324c261826e314ce45
-MISC ChangeLog 11440 RMD160 76a5b7a5b7b93010c2832b3fa065bf0ed6718fac SHA1 f5e1f3b4bee6d19aa128ed8f454fa71025d43b50 SHA256 1b004533afb502efc9a5ed5bd0c4e4223391dff4eb6baf47d7d9028745a7255c
-MISC metadata.xml 971 RMD160 a22e325865e4cd1f8a2fb06bbbec4ec87592c816 SHA1 c5bd3fc110d891fd22783bd92d259357672cb89b SHA256 50d67407a84b02c8826cf03a3256b38b588e45b31abffef6d7130883bc5a549b
+EBUILD gsl-1.13-r1.ebuild 2499 RMD160 eac99f47572f42bf5775308d58203c8269dd8266 SHA1 37be548d0af7b3f3c0d9b8f511625f6474179ba2 SHA256 3a852311ca6805fee3e1fd24e2b94e8c7726d97d6e9d80de305f0818e3b1d218
+EBUILD gsl-1.13-r2.ebuild 2895 RMD160 1c0f307ce8db13d392979a9ff42fe8e8d1f9f0f8 SHA1 34f52f512490e4f4e3baf9cdd5e63e420cc7cd7e SHA256 235544a1203786d81cc1dbef0502f4c40d2ce3660315ce71a7074f807807b9f6
+EBUILD gsl-1.14-r1.ebuild 2924 RMD160 d3b625ccfca5b2211d84d9388e4a3c205acf069e SHA1 7b580d3e38352e10558085670d128d2b2371721c SHA256 39907f922d9db2da3e6831f7175b8a83bd90ef4878befe64b47c3469df036bcc
+EBUILD gsl-1.14.ebuild 2837 RMD160 0d2c96da12bd4de9c885b23f5638a6aec79691ea SHA1 b020646d4bf435886cdf6f36ce1ee5775a3f8128 SHA256 320a21ccd946d2bf630905767e72731098371907b8e6462f62724b45884ae37b
+MISC ChangeLog 11762 RMD160 78c735cd265a73d451962fb8a8baa7c02be89384 SHA1 e9015d6c390d59a9dd3b4656a6343129e78a1145 SHA256 0fdf5e56e43402fce8baf22f9140084ea3abaa8444cc9f954433cccef5595ecf
+MISC metadata.xml 1016 RMD160 e7cbe5d4daaf4f4d5eb1c81c4cc090bb3ee807f2 SHA1 d9f77f0a5a0ff8148d3eb27509dde65f1991a034 SHA256 a74ce60d545607bcbd1828028da835f69e19f306b6ea4957ca3555411d9894af
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>