sci-libs/gsl: Version bump

Package-Manager: portage-2.2.01.22288-prefix
RepoMan-Options: --force

5 files changed, 110 insertions, 105 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 786abeea6..f35223d33 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
 
+*gsl-1.16-r1 (19 Aug 2013)
+
+  19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gsl-1.16-cblas-external.patch, +gsl-1.16-r1.ebuild,
+  -files/gsl-1.15-cblas.patch, -gsl-1.15-r3.ebuild, metadata.xml:
+  sci-libs/gsl: Version bump
+
   22 Feb 2013; Justin Lecher <jlec@gentoo.org> gsl-1.15-r3.ebuild,
   metadata.xml:
   Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index c29b99c11..9a4cf65c9 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478
+DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa3900006e52e494e9e2fcd34ec06301
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
index dd402f392..7277aa42e 100644
--- a/sci-libs/gsl/files/gsl-1.15-cblas.patch
+++ b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
@@ -1,38 +1,47 @@
-diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
---- gsl-1.15.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gsl-1.15/acx_cblas.m4	2011-07-28 22:16:03.000000000 +0100
-@@ -0,0 +1,60 @@
-+AC_DEFUN([ACX_CBLAS],[
-+  use_cblas=no
-+  use_cblas_libs="-lcblas -lblas"
-+  use_cblas_cflags=""
+diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
+--- gsl-1.16.orig/ax_cblas.m4	1969-12-31 16:00:00.000000000 -0800
++++ gsl-1.16/ax_cblas.m4	2013-08-19 15:48:54.376300825 -0700
+@@ -0,0 +1,69 @@
++AC_DEFUN([AX_CBLAS],[
 +
-+  AC_ARG_WITH(cblas,
-+	[AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
++  ext_cblas=no
++  ext_cblas_libs="-lcblas"
++  ext_cblas_cflags=""
 +
-+  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" ;;
++  AC_ARG_WITH(cblas-external,
++	[AS_HELP_STRING([--with-cblas-external], 
++			[Use external CBLAS library (default is no)])],
++	[with_ext_cblas=$withval],
++	[with_ext_cblas=no])
++
++  case $with_ext_cblas in
++	no) ext_cblas=no ;;
++	yes) ext_cblas=yes ;;
++	-* | */* | *.a | *.so | *.so.* | *.o) 
++	   ext_cblas=yes
++	   ext_cblas_libs="$with_cblas" ;;
++	*) ext_cblas=yes
++	   ext_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-external-libs,
++	[AS_HELP_STRING([--with-cblas-external-libs=<libs>],
++			[External cblas libraries to link with (default is "$ext_cblas_libs")])],
++	[ext_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], [])
++  AC_ARG_WITH(cblas-external-cflags,
++	[AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
++			[Pre-processing flags to compile with external cblas ("-I<dir>")])],
++	[ext_cblas_cflags=$withval],
++	[])
 +
-+  if test x$use_cblas != xno; then
++  if test x$ext_cblas != xno; then
 +	if test "x$CBLAS_LIBS" = x; then
-+		CBLAS_LIBS="$use_cblas_libs"
++	   CBLAS_LIBS="$ext_cblas_libs"
 +     	fi
-+     	if test "x$CBLAS_FLAGS" = x; then
-+       		CBLAS_CFLAGS="$use_cblas_cflags"
++     	if test "x$CBLAS_CFLAGS" = x; then
++       	   CBLAS_CFLAGS="$ext_cblas_cflags"
 +   	fi
 +
 +   	CFLAGS_sav="$CFLAGS"
@@ -42,29 +51,29 @@ diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
 +	   	*** 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>"])
++	   	***  --with-cblas-external-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_TRY_LINK_FUNC(cblas_sgemm, [ext_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>"])
++	    	***  --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
 +	 	])
-+   	AC_MSG_RESULT($use_cblas)
++   	AC_MSG_RESULT($ext_cblas)
 +   	LIBS="$LIBS_sav"
-+	AC_SUBST(CBLAS_CFLAGS)
-+	AC_SUBST(CBLAS_LIBS)
++	AC_SUBST([CBLAS_CFLAGS])
++	AC_SUBST([CBLAS_LIBS])
 + fi
 +])
-diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
---- gsl-1.15.orig/bspline/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/bspline/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
+--- gsl-1.16.orig/bspline/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/bspline/Makefile.am	2013-08-19 15:25:27.728497742 -0700
 @@ -12,6 +12,6 @@
  
  TESTS = $(check_PROGRAMS)
@@ -73,15 +82,15 @@ diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
 +test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
  
  test_SOURCES = test.c
-diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
---- gsl-1.15.orig/configure.ac	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/configure.ac	2011-07-28 22:16:03.000000000 +0100
-@@ -190,6 +190,16 @@
+diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac
+--- gsl-1.16.orig/configure.ac	2013-07-19 08:14:45.000000000 -0700
++++ gsl-1.16/configure.ac	2013-08-19 15:28:24.172640793 -0700
+@@ -191,6 +191,16 @@
    AC_CHECK_LIB(m, cos)
  fi
  
-+sinclude(acx_cblas.m4)
-+ACX_CBLAS
++sinclude(ax_cblas.m4)
++AX_CBLAS
 +if test "x$CBLAS_LIBS" != "x"; then
 +   CBLAS_LINK_LIBS="$CBLAS_LIBS"
 +else
@@ -93,9 +102,9 @@ diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
  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.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
---- gsl-1.15.orig/eigen/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/eigen/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am
+--- gsl-1.16.orig/eigen/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/eigen/Makefile.am	2013-08-19 15:25:27.728497742 -0700
 @@ -11,7 +11,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -105,9 +114,9 @@ diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
---- gsl-1.15.orig/gsl-config.in	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/gsl-config.in	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in
+--- gsl-1.16.orig/gsl-config.in	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/gsl-config.in	2013-08-19 15:25:27.728497742 -0700
 @@ -58,11 +58,11 @@
  	;;
  
@@ -122,9 +131,9 @@ diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
  	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
         	;;
  
-diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
---- gsl-1.15.orig/gsl.pc.in	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/gsl.pc.in	2011-07-28 22:20:14.000000000 +0100
+diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in
+--- gsl-1.16.orig/gsl.pc.in	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/gsl.pc.in	2013-08-19 15:25:27.728497742 -0700
 @@ -2,7 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
@@ -134,9 +143,9 @@ diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
  
  Name: GSL
  Description: GNU Scientific Library
-diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
---- gsl-1.15.orig/interpolation/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/interpolation/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am
+--- gsl-1.16.orig/interpolation/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/interpolation/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -146,9 +155,9 @@ diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefil
  
  test_SOURCES = test.c
  
-diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
---- gsl-1.15.orig/linalg/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/linalg/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am
+--- gsl-1.16.orig/linalg/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/linalg/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -12,7 +12,7 @@
  
  check_PROGRAMS = test
@@ -158,9 +167,9 @@ diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
---- gsl-1.15.orig/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
+--- gsl-1.16.orig/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -19,13 +19,12 @@
  
  lib_LTLIBRARIES = libgsl.la
@@ -198,23 +207,9 @@ diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
  	-e 's|@LIBS[@]|$(LIBS)|g' \
  	-e 's|@VERSION[@]|$(VERSION)|g'
  
-diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
---- gsl-1.15.orig/multifit/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/multifit/Makefile.am	2011-07-28 22:16:03.000000000 +0100
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
- 
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
- 
-diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
---- gsl-1.15.orig/multimin/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/multimin/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
+--- gsl-1.16.orig/multimin/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/multimin/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -13,8 +13,8 @@
  TESTS = $(check_PROGRAMS) 
  
@@ -226,9 +221,9 @@ diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
 -#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.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
---- gsl-1.15.orig/multiroots/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/multiroots/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am
+--- gsl-1.16.orig/multiroots/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/multiroots/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -15,5 +15,5 @@
  TESTS = $(check_PROGRAMS)
  
@@ -236,9 +231,9 @@ diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
 -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.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
---- gsl-1.15.orig/ode-initval/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/ode-initval/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am
+--- gsl-1.16.orig/ode-initval/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/ode-initval/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -12,7 +12,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -248,9 +243,9 @@ diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
---- gsl-1.15.orig/poly/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/poly/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am
+--- gsl-1.16.orig/poly/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/poly/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -259,10 +254,10 @@ diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
 +#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.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
---- gsl-1.15.orig/specfunc/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/specfunc/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
+diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am
+--- gsl-1.16.orig/specfunc/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/specfunc/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -12,7 +12,7 @@
  
  check_PROGRAMS = test
@@ -272,9 +267,9 @@ diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
  
  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.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
---- gsl-1.15.orig/wavelet/Makefile.am	2011-07-28 22:15:49.000000000 +0100
-+++ gsl-1.15/wavelet/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am
+--- gsl-1.16.orig/wavelet/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/wavelet/Makefile.am	2013-08-19 15:25:27.729497736 -0700
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
diff --git a/sci-libs/gsl/gsl-1.15-r3.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild
index 03159bde5..fc676129d 100644
--- a/sci-libs/gsl/gsl-1.15-r3.ebuild
+++ b/sci-libs/gsl/gsl-1.16-r1.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-AUTOTOOLS_AUTORECONF=true
+AUTOTOOLS_AUTORECONF=1
 
 inherit alternatives-2 autotools-utils eutils toolchain-funcs
 
-DESCRIPTION="The GNU Scientific Library"
+DESCRIPTION="GNU Scientific Library"
 HOMEPAGE="http://www.gnu.org/software/gsl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
@@ -21,14 +21,16 @@ RDEPEND="cblas-external? ( virtual/cblas )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-cblas.patch )
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
+PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
 
 src_configure() {
 	if use cblas-external; then
 		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
 		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
 	fi
+	local myeconfargs=(
+		$(use_with cblas-external)
+	)
 	autotools-utils_src_configure
 }
 
@@ -45,6 +47,7 @@ src_install() {
 		Version: ${PV}
 		URL: ${HOMEPAGE}
 		Libs: -L\${libdir} -l${libname}
+		Libs.private: -lm
 		Cflags: -I\${includedir}
 	EOF
 	insinto /usr/$(get_libdir)/pkgconfig
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 7ab2ed03c..9be87cabc 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<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
@@ -15,8 +15,8 @@
   differential equations, quadrature, Monte Carlo integration, special
   functions, physical constants, and much more. 
 </longdescription>
-  <use>
-    <flag name="cblas-external">Link gsl with external cblas provided by
-    (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
-  </use>
+<use>
+  <flag name="cblas-external">Link gsl with external cblas provided by
+  (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
+</use>
 </pkgmetadata>