Fix undefined symbols because of missing gslcblas lib during linking

(Portage version: 2.2.0_alpha66/git/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 48 insertions, 8 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 3de2c0133..20599aeb0 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 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.15-r2 (11 Oct 2011)
+
+  11 Oct 2011; Justin Lecher <jlec@gentoo.org> -gsl-1.15-r1.ebuild,
+  +gsl-1.15-r2.ebuild, +files/gsl-1.15-cblas.patch, metadata.xml:
+  Fix undefined symbols because of missing gslcblas lib during linking
+
   22 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +gsl-1.15-r1.ebuild,
   +files/gsl-1.15-pkgconfig.patch, +metadata.xml:
   Imported from bicatali overlay
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 27e9301f8..ff5ac6323 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX gsl-1.15-cblas.patch 590 RMD160 5aca28e2f8b92d71d27c51b2ed8acd2efa4a3bf0 SHA1 5e57d3e32f54ba61216ea782a4482be01f87694e SHA256 2fa59e7526ac384a4697f632ffbebc442eca519c9f8cf41bb849eb11508d9dd5
 AUX gsl-1.15-pkgconfig.patch 418 RMD160 d961090b4ee6a6821d61bc534e7632c8159c5ac0 SHA1 4c4b6f577c5059e5f8cedf93c2638fbc7111b0a4 SHA256 774cc4c10ee447394e65e54a4d7cccbf819b57c20b3f9069d2ffd7b481d0e0ac
 DIST gsl-1.15.tar.gz 3281134 RMD160 f34aa2a6514228f7df42fc94638286bcce5cd94c SHA1 d914f84b39a5274b0a589d9b83a66f44cd17ca8e SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3
-EBUILD gsl-1.15-r1.ebuild 1143 RMD160 0249728a9dddfb6f786c872c4f960fb24bd631d6 SHA1 f8bbc663402ff074c8021cd14d5d1090b7f66183 SHA256 454a73af4dfe25ca5547510cd5c6ffa84b5c6683622159778b177686ee1c817d
-MISC ChangeLog 12680 RMD160 1bfe8a74cc3692041ffd8b7811827f08f30763d5 SHA1 b3e6cc43a6257ac7110db7813099939a54b3f1f4 SHA256 02530c556b43d2219d70226f3353d52a264ca984186d5b4089bb93f1864bc4e2
-MISC metadata.xml 858 RMD160 aa5fcc2297d721a8e585bba28cfbe797c91f00a4 SHA1 4aacae953b1c804f9b123c5934093ab8faeac628 SHA256 17013b384e9d03536d612c4b5daef4e5ce6b7990bfe5265bf0303101dec748ed
+EBUILD gsl-1.15-r2.ebuild 1207 RMD160 75a065efffe42438f64b526cd861d1afe3763fed SHA1 fb74239dfd5863b4725cfc0a0c3c6bc26b79c0db SHA256 37398d24c631632d0add95a65d35f1db3e7d9fc2240e3cc4f7cf16f3afbb840f
+MISC ChangeLog 12914 RMD160 36ed3fc798193f986d37854cb63a5da167dbd4d7 SHA1 c6c8d2ebcb62d876e6d1d8d45b505d184c456d7e SHA256 b0d1c278cea5a4c6459b579b98e311e4a0321ebd4abec5db72eceb6afab921a1
+MISC metadata.xml 860 RMD160 91cad78aa73e0f526dae88d2e3741d3f646d4d83 SHA1 83155861505f2e955f7b9fc36d2825dfff65f1ef SHA256 e0c95d0854329481c9903735fe7dc880bc95f7061f2aef5a2b8088e063877c60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk6UrAMACgkQgAnW8HDreRaXsQCgr0B40qOTzxMQzuTlhFQQNf4f
+eBsAn1feIDBhYRswaO72utMkzYwonaGf
+=ReIZ
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
new file mode 100644
index 000000000..a5d22e421
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -0,0 +1,17 @@
+ Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 327d2f3..acae2a3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,9 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+ libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
++libgsl_la_LDFLAGS += -no-undefined
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
diff --git a/sci-libs/gsl/gsl-1.15-r1.ebuild b/sci-libs/gsl/gsl-1.15-r2.ebuild
index 9d167808c..1367d6cdd 100644
--- a/sci-libs/gsl/gsl-1.15-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.15-r2.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI=4
+
 inherit eutils autotools-utils alternatives-2
 
 DESCRIPTION="The GNU Scientific Library"
@@ -14,10 +15,15 @@ SLOT="0"
 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="static-libs"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig.patch"
+	"${FILESDIR}/${P}-cblas.patch"
+	)
 
-PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
 
 src_install() {
 	autotools-utils_src_install
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 54ab246fb..7c2d3ccaf 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