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

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

[Sebastien Fabbro]

commit:     4ba2188afc2c80a4622caff47e201f4b2ea24dde
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 14:17:35 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat May 21 14:17:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=4ba2188a

bumped gsl

---
 sci-libs/gsl/ChangeLog                             |    7 +++++++
 sci-libs/gsl/Manifest                              |    8 ++++----
 sci-libs/gsl/files/gsl-1.14-pkgconfig.patch        |   10 ----------
 sci-libs/gsl/files/gsl-1.15-pkgconfig.patch        |   16 ++++++++++++++++
 .../gsl/{gsl-1.14-r2.ebuild => gsl-1.15-r1.ebuild} |    0
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 0af61f1..c4477d2 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -2,6 +2,13 @@
 # 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-r1 (21 May 2011)
+
+  21 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -gsl-1.14-r2.ebuild,
+  -files/gsl-1.14-pkgconfig.patch, +gsl-1.15-r1.ebuild,
+  +files/gsl-1.15-pkgconfig.patch:
+  Version bump
+
   23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> gsl-1.14-r2.ebuild:
   Switched to alternatives-2 framework
 

diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 57fb96e..d8cf594 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,5 +1,5 @@
-AUX gsl-1.14-pkgconfig.patch 290 RMD160 16c8eb1e808b2909028eaf2bfd393715db130a36 SHA1 97c2caaaba6d8d46e362c59a0642d678cd66c3dc SHA256 aaab80cc9e6d9f161a6197d365dde41caa072fc5f78dde2e0a04bc6a934f15f6
-DIST gsl-1.14.tar.gz 3128269 RMD160 c89a30a0b38a0c83d73ded19180d52acd56e6a52 SHA1 e1a600e4fe359692e6f0e28b7e12a96681efbe52 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
-EBUILD gsl-1.14-r2.ebuild 1143 RMD160 0249728a9dddfb6f786c872c4f960fb24bd631d6 SHA1 f8bbc663402ff074c8021cd14d5d1090b7f66183 SHA256 454a73af4dfe25ca5547510cd5c6ffa84b5c6683622159778b177686ee1c817d
-MISC ChangeLog 12309 RMD160 5e71ea3e48c14d50bab00dd4cc910d5ab20b6bf8 SHA1 999be490e97c31db3009c7dd89fd5428cd10fbee SHA256 593832b0ca8eb44a324c858b7912c37d3eebbe349a542c2e824af9c9299da9ef
+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 12520 RMD160 3fc445162910591945b455e4dbb2bde4a6826754 SHA1 913a16d1d306e7e437526bc681f6ea5f23e6b037 SHA256 59264180171e0cf50c6a762e1b36c07b9ca39d7dc2cfc68cf4f4e10dfb8aa686
 MISC metadata.xml 858 RMD160 aa5fcc2297d721a8e585bba28cfbe797c91f00a4 SHA1 4aacae953b1c804f9b123c5934093ab8faeac628 SHA256 17013b384e9d03536d612c4b5daef4e5ce6b7990bfe5265bf0303101dec748ed

diff --git a/sci-libs/gsl/files/gsl-1.14-pkgconfig.patch b/sci-libs/gsl/files/gsl-1.14-pkgconfig.patch
deleted file mode 100644
index 1e3520a..0000000
--- a/sci-libs/gsl/files/gsl-1.14-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gsl.pc.in.orig	2010-11-08 22:13:20.000000000 +0000
-+++ gsl.pc.in	2010-11-08 22:18:33.000000000 +0000
-@@ -6,5 +6,6 @@
- Name: GSL
- Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ -lgslcblas @LIBS@
-+Libs: @GSL_LIBS@  @LIBS@
-+Requires: cblas
- Cflags: @GSL_CFLAGS@

diff --git a/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch b/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
new file mode 100644
index 0000000..a29f461
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.15-pkgconfig.patch
@@ -0,0 +1,16 @@
+--- 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.14-r2.ebuild b/sci-libs/gsl/gsl-1.15-r1.ebuild
similarity index 100%
rename from sci-libs/gsl/gsl-1.14-r2.ebuild
rename to sci-libs/gsl/gsl-1.15-r1.ebuild