Version bump. cblas patch adapted and added a check on the external cblas lib not to be gsl itself

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

5 files changed, 332 insertions, 46 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index d941bddeff73..629e9864ba93 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gsl
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.49 2008/11/09 16:46:11 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.50 2009/01/19 19:22:30 bicatali Exp $
+
+*gsl-1.12 (19 Jan 2009)
+
+  19 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gsl-1.12-cblas.patch, -gsl-1.10.ebuild, +gsl-1.12.ebuild:
+  Version bump. cblas patch adapted and added a check on the external
+  cblas lib not to be gsl itself.
 
   09 Nov 2008; Raúl Porcel <armin76@gentoo.org> gsl-1.11.ebuild:
   alpha/ia64 stable wrt #245838
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 261f34190d26..4c92a3aefb11 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -3,21 +3,22 @@ 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.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b03629fad9b09c918ccea6bc328c9b8eb256d351 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f
 AUX gsl-cblas.patch 2857 RMD160 2bc2973635d608cdaf73849ba1a85797bbf7dc74 SHA1 b97d867aa5389d258ec04383a1598ae1fad25446 SHA256 e0286230eff05faf9bf2c5c320a0a3a8855286ba2a5fb163cb07a5386e60c5bf
-DIST gsl-1.10.tar.gz 2842422 RMD160 0b6ac2b1aec6a93521941620a824ae78f79adebb SHA1 401d0203d362948e30d0b3c58601a3bc52d0bfd4 SHA256 ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0
 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.9.tar.gz 2574939 RMD160 faca66d02876135c31c2f3585baa1931488e1593 SHA1 7541504ed9864b1a278f9392830ecac9e0146258 SHA256 fcd1c6784997c2312d922d107fcb30462f5be4335ebdfa8e1e0e07568c962250
-EBUILD gsl-1.10.ebuild 2347 RMD160 6ec32d6b73c51cec8133c0ee2ef6cda16632bf36 SHA1 15b3ac42ddf83ce68e4a1e40f38bc534552ea81b SHA256 56fba8eced78c7a596c52a71cb550e5bfedd17fdd820cfbf2e7e8a89628b7692
 EBUILD gsl-1.11.ebuild 2362 RMD160 422bcdd009079e4963e1a6a59da976f07fc95e86 SHA1 5bb738ccbcf335e16de2b46bd414a824a79c8691 SHA256 68ae8c7825609364d8d2e188f848e87017faf34e20909b9671a321e927ed1f3b
+EBUILD gsl-1.12.ebuild 2466 RMD160 03a9c71733d5164cb826858f6271aa593efac14b SHA1 d4d8931ea1cf031c06428e8c9ce37dfc109c07d0 SHA256 76d98472288719e4daf296e0c78651bd833dcb148626ae16708c619b98837b18
 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 8159 RMD160 89f19d5299b421870b2380b70f349b5a225d51bf SHA1 2fc94b9e73c2c3192e4f33e6deadc2e431c8ed3e SHA256 bdc83a89ef8cc02ff906efc9b77d80307d0725138447cb65f7bebfce97366f39
-MISC metadata.xml 949 RMD160 80438c4bd95dd87c16a8fe336c89b32c0c381c8a SHA1 201714282b4353f08cfaf7c066f8770f923a814c SHA256 22fac0a31aee7802e6fb229d39e0c823c72616c727736d7a4a0775e4432ed246
+MISC ChangeLog 8412 RMD160 cc555ca71ae278195bb48a5da9347c8b68fc0693 SHA1 9cd92afd9151a9276c80e1008450ef698ad6f978 SHA256 643f5bed3122fd05fad31cf5e39a19500be1d9dc515b914c2a7412e17715e097
+MISC metadata.xml 971 RMD160 a22e325865e4cd1f8a2fb06bbbec4ec87592c816 SHA1 c5bd3fc110d891fd22783bd92d259357672cb89b SHA256 50d67407a84b02c8826cf03a3256b38b588e45b31abffef6d7130883bc5a549b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk8GFAACgkQ67wieSYcaxf1xACfeV3T1dfLr5k/fzhGH7tEVYKc
-KgMAn1xtF+3j9FS9QqElXZZNWTEGdrcc
-=OW3S
+iEYEARECAAYFAkl00y8ACgkQ1ycZbhPLE2CYkQCeL6KZq/Gbfl4Fi8l+nW47yVxW
+T/AAnityGlEswiTxB+SgpHZ0q53tx/v+
+=Oojs
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/files/gsl-1.12-cblas.patch b/sci-libs/gsl/files/gsl-1.12-cblas.patch
new file mode 100644
index 000000000000..945db891d8d7
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.12-cblas.patch
@@ -0,0 +1,276 @@
+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/gsl-1.10.ebuild b/sci-libs/gsl/gsl-1.12.ebuild
index d663fd845ce8..83ffb31421d5 100644
--- a/sci-libs/gsl/gsl-1.10.ebuild
+++ b/sci-libs/gsl/gsl-1.12.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.10.ebuild,v 1.4 2008/01/09 16:15:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.12.ebuild,v 1.1 2009/01/19 19:22:30 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,38 +11,39 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
+	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
+	replace-cpu-flags k6 k6-2 k6-3 i586
+	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() {
@@ -56,8 +58,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/metadata.xml b/sci-libs/gsl/metadata.xml
index 094cccf58494..72f4dcdce254 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -3,20 +3,20 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-The GNU Scientific Library (GSL) is a collection of routines for
-numerical analysis. The routines are written from scratch by the GSL
-team in C, and present a modern API for C programmers, while allowing
-wrappers to be written for very high level languages.
-
-GSL includes data types and routines for complex numbers, vectors,
-matrices, basic linear algebra subroutines (BLAS), eigensystems,
-simulated annealing, minimization, root finding, pseudo-random
-numbers, least-squares fitting, fast Fourier transforms (FFT),
-differential equations, quadrature, Monte Carlo integration, special
-functions, physical constants, and much more. 
+  The GNU Scientific Library (GSL) is a collection of routines for
+  numerical analysis. The routines are written from scratch by the GSL
+  team in C, and present a modern API for C programmers, while allowing
+  wrappers to be written for very high level languages.
+  
+  GSL includes data types and routines for complex numbers, vectors,
+  matrices, basic linear algebra subroutines (BLAS), eigensystems,
+  simulated annealing, minimization, root finding, pseudo-random
+  numbers, least-squares fitting, fast Fourier transforms (FFT),
+  differential equations, quadrature, Monte Carlo integration, special
+  functions, physical constants, and much more. 
 </longdescription>
 <use>
-  <flag name='cblas'>Build gsl with external cblas by default
+  <flag name='cblas'>Link gsl with external cblas provided by
     (<pkg>virtual/cblas</pkg>)</flag>
 </use>
 </pkgmetadata>