[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/

["Justin Lecher" <jlec@gentoo.org>]

commit:     968c82e279a16e35c0b246ad7a161716a2f7dbe0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 20:50:11 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 20:50:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=968c82e2

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)

---
 sci-libs/gsl/ChangeLog                             |    6 ++++++
 sci-libs/gsl/files/gsl-1.15-cblas.patch            |   17 +++++++++++++++++
 .../gsl/{gsl-1.15-r1.ebuild => gsl-1.15-r2.ebuild} |   12 +++++++++---
 sci-libs/gsl/metadata.xml                          |    4 ++--
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 3de2c01..20599ae 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/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
new file mode 100644
index 0000000..a5d22e4
--- /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
similarity index 88%
rename from sci-libs/gsl/gsl-1.15-r1.ebuild
rename to sci-libs/gsl/gsl-1.15-r2.ebuild
index 9d16780..1367d6c 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 54ab246..7c2d3cc 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