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

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     92d6600a996226f07e14c886825151e6b72d4581
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb 23 19:04:51 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 19:04:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=92d6600a

sci-libs/gsl: Fixed gsl-config/pkg-config issues

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/gsl/ChangeLog                      |    6 ++-
 sci-libs/gsl/files/gsl-1.15-cblas.patch     |   88 ++++++++++++++++++++++-----
 sci-libs/gsl/files/gsl-1.15-pkgconfig.patch |   16 -----
 sci-libs/gsl/gsl-1.15-r2.ebuild             |   13 +---
 4 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 20599ae..0f7636d 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/gsl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 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 $
 
+  23 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> gsl-1.15-r2.ebuild,
+  files/gsl-1.15-cblas.patch, -files/gsl-1.15-pkgconfig.patch:
+  Fixed gsl-config/pkg-config issues
+
 *gsl-1.15-r2 (11 Oct 2011)
 
   11 Oct 2011; Justin Lecher <jlec@gentoo.org> -gsl-1.15-r1.ebuild,

diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
index a5d22e4..2ded784 100644
--- a/sci-libs/gsl/files/gsl-1.15-cblas.patch
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -1,17 +1,75 @@
- 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
+diff -Nur gsl-1.15.orig/blas/Makefile.am gsl-1.15/blas/Makefile.am
+--- gsl-1.15.orig/blas/Makefile.am	2010-12-26 17:57:08.000000000 +0000
++++ gsl-1.15/blas/Makefile.am	2012-02-23 17:41:52.000000000 +0000
+@@ -5,7 +5,7 @@
+ INCLUDES = -I$(top_srcdir)
+ 
+ libgslblas_la_SOURCES = blas.c 
+-
++libgslblas_la_LIBADD = $(top_builddir)/cblas/libgslcblas.la
+ #check_PROGRAMS = test
+ #TESTS = test
+ #test_LDADD = libgslblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
+diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
+--- gsl-1.15.orig/gsl-config.in	2010-12-26 17:57:08.000000000 +0000
++++ gsl-1.15/gsl-config.in	2012-02-23 17:47:30.000000000 +0000
+@@ -58,12 +58,11 @@
+ 	;;
+ 
+     --cflags)
+-       	echo @GSL_CFLAGS@ 
++       	echo @GSL_CFLAGS@ $(pkg-config --cflags cblas)
+        	;;
+ 
+     --libs)
+-        : ${GSL_CBLAS_LIB=-lgslcblas}
+-	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
++	echo $(pkg-config --libs gsl) @GSL_LIBM@
+        	;;
+ 
+     --libs-without-cblas)
+diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
+--- gsl-1.15.orig/gsl.pc.in	2011-01-31 16:59:17.000000000 +0000
++++ gsl-1.15/gsl.pc.in	2012-02-23 17:40:12.000000000 +0000
+@@ -2,10 +2,11 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-GSL_CBLAS_LIB=-lgslcblas
+ 
+ Name: GSL
+ Description: GNU Scientific Library
+ Version: @VERSION@
+-Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
++Libs: @GSL_LIBS@ 
++Private: @GSL_LIBM@ @LIBS@
+ Cflags: @GSL_CFLAGS@
++Requires: cblas
+diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
+--- gsl-1.15.orig/Makefile.am	2011-04-14 16:13:48.000000000 +0100
++++ gsl-1.15/Makefile.am	2012-02-23 17:53:10.000000000 +0000
+@@ -25,7 +25,6 @@
  
  MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -35,13 +34,13 @@
+ 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 pkgconfig.test
+-TESTS = test_gsl_histogram.sh pkgconfig.test
++TESTS = test_gsl_histogram.sh
+ 
+ #bin_PROGRAMS = main dummy
+ #dummy_SOURCES = version.c

diff --git a/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch b/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
deleted file mode 100644
index a29f461..0000000
--- a/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gsl.pc.in.orig	2011-05-21 15:14:23.000000000 +0100
-+++ gsl.pc.in	2011-05-21 15:15:03.000000000 +0100
-@@ -2,10 +2,11 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+
- 
- Name: GSL
- Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
-+Libs: @GSL_LIBS@ @GSL_LIBM@ @LIBS@
- Cflags: @GSL_CFLAGS@
-+Requires: cblas

diff --git a/sci-libs/gsl/gsl-1.15-r2.ebuild b/sci-libs/gsl/gsl-1.15-r2.ebuild
index 1367d6c..87fbeeb 100644
--- a/sci-libs/gsl/gsl-1.15-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.15-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
+AUTOTOOLS_AUTORECONF=yes
 inherit eutils autotools-utils alternatives-2
 
 DESCRIPTION="The GNU Scientific Library"
@@ -15,15 +16,7 @@ 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"
 
-PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig.patch"
-	"${FILESDIR}/${P}-cblas.patch"
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-cblas.patch )
 
 src_install() {
 	autotools-utils_src_install