Version bump, removed old. Note gsl-1.9-r1 is kept for GPL-2 compat until we close bug #199451

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

6 files changed, 314 insertions, 163 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index fff3b3d2ba34..4bb452f77f74 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gsl
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.57 2009/04/23 13:23:11 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.58 2009/09/17 22:13:22 bicatali Exp $
+
+*gsl-1.13 (17 Sep 2009)
+
+  17 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -gsl-1.9.ebuild,
+  -gsl-1.11.ebuild, +gsl-1.13.ebuild, +files/gsl-1.13-cblas.patch,
+  -files/gsl-cblas.patch:
+  Version bump, removed old. Note gsl-1.9-r1 is kept for GPL-2 compat until
+  we close bug #199451
 
   23 Apr 2009; Raúl Porcel <armin76@gentoo.org> gsl-1.12.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #265339
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index a48540c4abee..fb94b4a57295 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,14 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.patch 15524 RMD160 294638c284b5b06f12405dd834b329a0755b1edd SHA1 fa0b377a7e40a9ba660909ab369fc3a744b9ae1a SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890
 AUX gsl-1.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b03629fad9b09c918ccea6bc328c9b8eb256d351 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f
-AUX gsl-cblas.patch 2857 RMD160 2bc2973635d608cdaf73849ba1a85797bbf7dc74 SHA1 b97d867aa5389d258ec04383a1598ae1fad25446 SHA256 e0286230eff05faf9bf2c5c320a0a3a8855286ba2a5fb163cb07a5386e60c5bf
-DIST gsl-1.11.tar.gz 2700307 RMD160 b69e38e217084fa2aff386b42aadb6f9efc5b1ec SHA1 5a154d1cc66ac479197d25dd93a56da12a034c49 SHA256 7611e507aef1657ccf5e099c9d3873c49cd49a746bc8a00046dcd437fd9211b1
 DIST gsl-1.12.tar.gz 2924732 RMD160 07c9d6a1e1fc1efb43dcc883fd15a2ca5d312da0 SHA1 3b5cba13f4b90e1473f693a5dc7efdcaae55fc46 SHA256 22019188d24c769acafc250ddc247105eb9cab099529b627078cbd8012c7b7b9
+DIST gsl-1.13.tar.gz 3014270 RMD160 f71507181ace425df0977a13946f12cae4b65783 SHA1 02db78b9583bc7b2a577da6f45f5dd9f23ef737e SHA256 094648a6e40854cbe006357213fb16fe3e55d048a4a4df675df36a540f8ba2c7
 DIST gsl-1.9.tar.gz 2574939 RMD160 faca66d02876135c31c2f3585baa1931488e1593 SHA1 7541504ed9864b1a278f9392830ecac9e0146258 SHA256 fcd1c6784997c2312d922d107fcb30462f5be4335ebdfa8e1e0e07568c962250
-EBUILD gsl-1.11.ebuild 2362 RMD160 422bcdd009079e4963e1a6a59da976f07fc95e86 SHA1 5bb738ccbcf335e16de2b46bd414a824a79c8691 SHA256 68ae8c7825609364d8d2e188f848e87017faf34e20909b9671a321e927ed1f3b
 EBUILD gsl-1.12.ebuild 2460 RMD160 d9de6caa9b4aceb3c7696c9160352c364d2008b1 SHA1 e16a3cd809fbd06a6849576c6d1e26ca5e043f58 SHA256 7dbbb3962dec568868e28f1aa6a3f61688be8f40708bec912f3194c5f090e9ac
+EBUILD gsl-1.13.ebuild 2401 RMD160 e45235c161cc2c48c65c127fa7a68d4c0eaf02ad SHA1 132259d50fcd81dc5a1a102da4f80b786197ca19 SHA256 c063639b5f67d82543b3ca0ceb334e4fa27f4e15d7fe715c39a320856007de12
 EBUILD gsl-1.9-r1.ebuild 2158 RMD160 c8aad89ccf83c72d1d7e649b836ead81c8e88c94 SHA1 73df32e6af7d7d8f144d352918c9b5c47ff10746 SHA256 cf2ae1ff43e463f2fb58cb29cc1815a72650cb66106499ca9f2b6cc64adb9fab
-EBUILD gsl-1.9.ebuild 902 RMD160 6e816c633aad0535855c04a62185081c306ef0e6 SHA1 3a3b63990bd38340d7cceb5f4fcacbded5227261 SHA256 5fb3394f666f79d36cd21232c952d5edb7cda347cc65f7558bd820fd74ce8640
-MISC ChangeLog 9089 RMD160 68d84602d1e8408d4a08541b45a89b9dd1f468be SHA1 cfe0431dc797015dc28674b4bfa0cfd7e130df98 SHA256 518a52306eabeb3529de93a29d50f561cbaf07ab2b1b5fdb78725c851cf94f77
+MISC ChangeLog 9380 RMD160 f79bb350267dab302ad1dbeef281c9126e74790d SHA1 9456242ef0a449a0bc2d2e977fe6af8e48c24068 SHA256 773d061af49ed854ec67caf9e4f29b17dd1d1ebd09f7a5300091925721ab3f73
 MISC metadata.xml 971 RMD160 a22e325865e4cd1f8a2fb06bbbec4ec87592c816 SHA1 c5bd3fc110d891fd22783bd92d259357672cb89b SHA256 50d67407a84b02c8826cf03a3256b38b588e45b31abffef6d7130883bc5a549b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqytIsACgkQ1ycZbhPLE2CPpQCdElQimLPGZFdTAeyO8Frn7rYS
+zg4An2tnVvxuMYGyQW+DfZH9O7HvBurR
+=loy8
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/files/gsl-1.13-cblas.patch b/sci-libs/gsl/files/gsl-1.13-cblas.patch
new file mode 100644
index 000000000000..be86c3a9e9f2
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.13-cblas.patch
@@ -0,0 +1,260 @@
+--- acx_cblas.m4.orig	1970-01-01 01:00:00.000000000 +0100
++++ 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
++])
+--- bspline/Makefile.am.orig	2009-06-29 13:30:17.000000000 +0100
++++ bspline/Makefile.am	2009-09-17 22:31:53.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
+--- configure.ac.orig	2008-12-15 14:52:45.000000000 +0000
++++ 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>]) 
+--- eigen/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+ 
+--- gsl-config.in.orig	2008-02-05 13:22:10.000000000 +0000
++++ 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
+        	;;
+ 
+--- gsl.pc.in.orig	2008-11-19 09:13:46.000000000 +0000
++++ 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@
+--- interpolation/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+ 
+--- linalg/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+ 
+--- Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+--- multifit/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+ 
+--- multimin/Makefile.am.orig	2008-11-29 17:51:18.000000000 +0000
++++ 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
+ 
+--- multiroots/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+ 
+--- ode-initval/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+ 
+--- poly/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+--- specfunc/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ 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
+   
+--- wavelet/Makefile.am.orig	2008-11-27 20:03:29.000000000 +0000
++++ 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-cblas.patch b/sci-libs/gsl/files/gsl-cblas.patch
deleted file mode 100644
index 3861786a161a..000000000000
--- a/sci-libs/gsl/files/gsl-cblas.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- configure.ac.orig	2007-09-19 13:25:25.644286706 +0100
-+++ configure.ac	2007-09-19 15:58:30.963832549 +0100
-@@ -130,6 +130,14 @@
-   AC_CHECK_LIB(m, cos)
- fi
- 
-+dnl Use alternate cblas if specified by user
-+CBLAS_LIBS="-lgslcblas"
-+AC_ARG_WITH(cblas,
-+	    [AC_HELP_STRING([--with-cblas=<lib>], [use external CBLAS library <lib>])],
-+	    [CBLAS_LIBS="$withval"])
-+AM_CONDITIONAL(LINK_WITH_CBLAS_EXTERNAL, [ test ! "x$CBLAS_LIBS" = x"-lgslcblas" ])
-+AC_SUBST(CBLAS_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>]) 
---- Makefile.am.orig	2007-09-19 13:25:11.299469242 +0100
-+++ Makefile.am	2007-09-19 15:53:28.594601509 +0100
-@@ -15,28 +15,29 @@
- 
- EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS SUPPORT gsl.spec.in gsl.m4 test_gsl_histogram.sh
- 
--lib_LTLIBRARIES = libgsl.la
--libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
--libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
--noinst_HEADERS = templates_on.h templates_off.h
-+lib_LTLIBRARIES = libgsl.la 
- 
--MINGW32_HOST = @MINGW32_HOST@
--if MINGW32_HOST
--libgsl_la_LIBADD += cblas/libgslcblas.la
--libgsl_la_LDFLAGS += -no-undefined
-+if LINK_WITH_CBLAS_EXTERNAL
-+gsl_cblas = $(CBLAS_LIBS)
-+else
-+gsl_cblas = cblas/libgslcblas.la
- endif
- 
-+libgsl_la_SOURCES = version.c
-+libgsl_la_LDFLAGS = -no-undefined -version-info $(GSL_LT_VERSION)
-+libgsl_la_LIBADD = $(SUBLIBS) $(gsl_cblas)
-+noinst_HEADERS = templates_on.h templates_off.h
-+
- m4datadir = $(datadir)/aclocal
- m4data_DATA = gsl.m4
- 
- bin_PROGRAMS = gsl-randist gsl-histogram
- 
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la $(gsl_cblas)
- 
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la $(gsl_cblas)
- 
- check_SCRIPTS = test_gsl_histogram.sh
- TESTS = test_gsl_histogram.sh
---- gsl-config.in.orig	2007-09-19 13:25:39.373069065 +0100
-+++ gsl-config.in	2007-09-19 13:01:31.410346928 +0100
-@@ -19,8 +19,7 @@
-   --version		output version information
- 
- An external CBLAS library can be specified using the GSL_CBLAS_LIB
--environment variable. The GSL CBLAS library is used by default.
--
-+environment variable. By default, it will use the one compiled with gsl: @CBLAS_LIBS@.
- EOF
- 
-     exit $1
-@@ -62,7 +61,7 @@
-        	;;
- 
-     --libs)
--        : ${GSL_CBLAS_LIB=-lgslcblas}
-+        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
-        	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
-        	;;
- 
---- gsl.pc.in.orig	2007-09-19 13:25:49.477644892 +0100
-+++ gsl.pc.in	2007-09-19 13:01:56.355768487 +0100
-@@ -6,5 +6,5 @@
- Name: GSL
- Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ -lgslcblas @LIBS@
-+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@
- Cflags: @GSL_CFLAGS@
diff --git a/sci-libs/gsl/gsl-1.11.ebuild b/sci-libs/gsl/gsl-1.13.ebuild
index c48339956ce8..7574e6e4289c 100644
--- a/sci-libs/gsl/gsl-1.11.ebuild
+++ b/sci-libs/gsl/gsl-1.13.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.11.ebuild,v 1.7 2008/12/07 18:39:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13.ebuild,v 1.1 2009/09/17 22:13:22 bicatali Exp $
 
-inherit eutils flag-o-matic toolchain-funcs autotools
+EAPI=2
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="The GNU Scientific Library"
 HOMEPAGE="http://www.gnu.org/software/gsl/"
@@ -10,44 +11,43 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="cblas"
 
-RDEPEND="app-admin/eselect-cblas
-	cblas? ( virtual/cblas )"
-
+RDEPEND="cblas? ( virtual/cblas )"
 DEPEND="${RDEPEND}
+	app-admin/eselect-cblas
 	dev-util/pkgconfig"
 
-#pkg_setup() {
-#	# icc-10.0.026 did not pass rng tests (last check: gsl-1.10)
-#	if [[ $(tc-getCC) == icc ]]; then
-#		eerror "icc known to fail tests. Revert to safer compiler and re-emerge."
-#		die "gsl does not work when compiled with icc"
-#	fi
-#}
+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."
+		ewarn "However the current selected external cblas is gsl."
+		ewarn "Please install and/or eselect another cblas"
+		die "Circular gsl dependency"
+	fi
+}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gsl-cblas.patch
+src_prepare() {
+	filter-flags -ffast-math
+	epatch "${FILESDIR}"/${P}-cblas.patch
 	eautoreconf
 }
 
-src_compile() {
-	# could someone check if they are still needed?
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	filter-flags -ffast-math
-	local myconf=
-	use cblas && myconf="--with-cblas=$(pkg-config --libs cblas)"
-	econf "${myconf}"|| die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	if use cblas; then
+		export CBLAS_LIBS="$(pkg-config --libs cblas)"
+		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
+	fi
+	econf $(use_with cblas)
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog NEWS README SUPPORT \
-		THANKS TODO || die "dodoc failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 
 	# take care of pkgconfig file for cblas implementation.
 	sed -e "s/@LIBDIR@/$(get_libdir)/" \
@@ -56,8 +56,8 @@ src_install() {
 		|| die "sed cblas.pc failed"
 	insinto /usr/$(get_libdir)/blas/gsl
 	doins cblas.pc || die "installing cblas.pc failed"
-	ESELECT_PROF=gsl
-	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl ${ESELECT_PROF}
+	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl \
+		${ESELECT_PROF}
 }
 
 pkg_postinst() {
diff --git a/sci-libs/gsl/gsl-1.9.ebuild b/sci-libs/gsl/gsl-1.9.ebuild
deleted file mode 100644
index 4a0476b266ad..000000000000
--- a/sci-libs/gsl/gsl-1.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.9.ebuild,v 1.12 2007/08/25 14:28:25 vapier Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gsl-1.6-deps.diff
-	eautoreconf
-}
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	filter-flags -ffast-math
-
-	econf --disable-libtool-lock || die "configure failed"
-	emake || die 'emake failed.'
-}
-
-src_install() {
-	make install DESTDIR=${D} || die 'install failed.'
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SUPPORT THANKS TODO
-}