(#134063) Fix for --as-needed.

Package-Manager: portage-2.1.1_pre1

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index e1c526c67c2a095462f4026b1e638942477fd671..efdc2824e0f2521383ffc1d73f837d684fa6b4de 100644 (file)
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.14 2006/06/16 20:47:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.15 2006/06/17 01:34:52 spyderous Exp $
+
+  17 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/gsl-1.6-deps.diff, gsl-1.8.ebuild:
+  (#134063) Fix for --as-needed.
 
   16 Jun 2006; Markus Rothe <corsair@gentoo.org> gsl-1.7.ebuild:
   Stable on ppc64

diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index dd1807a187c5f43dbad5556ecf3bf31a36a121a0..8071cede890137e709828075a079ab288257725b 100644 (file)
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,7 +1,11 @@
+AUX gsl-1.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b03629fad9b09c918ccea6bc328c9b8eb256d351 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f
+MD5 5ca2842635739ffb675ba3eff4d460d9 files/gsl-1.6-deps.diff 418
+RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 files/gsl-1.6-deps.diff 418
+SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f files/gsl-1.6-deps.diff 418
 DIST gsl-1.4.tar.gz 2211031
 DIST gsl-1.6.tar.gz 2294804
 DIST gsl-1.7.tar.gz 2337248
-DIST gsl-1.8.tar.gz 2419825 RMD160 f3e7f4622be56635f84c6d889bf8316dbac1edf4 SHA256 a66a4c5243111f98f11114a9c7e00c316b281e8e383b0d0b8a0b7debdb27d9d6
+DIST gsl-1.8.tar.gz 2419825 RMD160 f3e7f4622be56635f84c6d889bf8316dbac1edf4 SHA1 0dabdf2d024ae3b29207e485c5413676f3fa136f SHA256 a66a4c5243111f98f11114a9c7e00c316b281e8e383b0d0b8a0b7debdb27d9d6
 EBUILD gsl-1.4.ebuild 749 RMD160 7e696fca2e3245f3cfaa5b64e1404f22ea39db5c SHA1 151f6ee9b343de3ce4fb46268c003485af9c647f SHA256 a42cb931eb12e86e481de15b4c8cf9b2d23ccbadf05494ceb113b768c9b5b48a
 MD5 c34a30af2173d60b18a7491f133e3044 gsl-1.4.ebuild 749
 RMD160 7e696fca2e3245f3cfaa5b64e1404f22ea39db5c gsl-1.4.ebuild 749
@@ -14,14 +18,14 @@ EBUILD gsl-1.7.ebuild 834 RMD160 4f6b9c0401620ad91c3240fc8b9c4dd2fe02aed1 SHA1 6
 MD5 82e04711bb943b0cdf2f2e575da7ea95 gsl-1.7.ebuild 834
 RMD160 4f6b9c0401620ad91c3240fc8b9c4dd2fe02aed1 gsl-1.7.ebuild 834
 SHA256 32ca41fc5d681225547f1ea3df053db8331cc1dc637e01e54af32425a5450008 gsl-1.7.ebuild 834
-EBUILD gsl-1.8.ebuild 838 RMD160 b59d3aaaf3f879772372057185066d314d9dfdb5 SHA1 ba35d9bd47267c3d01927a622d7a4fa4a7cb49b6 SHA256 81b4cede8a658543548cdfabbab229377a9b83a504311234bfe8af77f9c5347e
-MD5 30b4e65343c6c54317a8fdd2ee10563c gsl-1.8.ebuild 838
-RMD160 b59d3aaaf3f879772372057185066d314d9dfdb5 gsl-1.8.ebuild 838
-SHA256 81b4cede8a658543548cdfabbab229377a9b83a504311234bfe8af77f9c5347e gsl-1.8.ebuild 838
-MISC ChangeLog 3753 RMD160 d160926363875599ab5067ac2e99ac7afc90248f SHA1 5bfdc7022f18c40dff40e6923fae11f8d0c6ca60 SHA256 348ae07c4226bd694a1faf06bad89e93e4f6124ebb341731a76616263ddcba0b
-MD5 5a9c71a333c9985e752c3a64a01e6f9c ChangeLog 3753
-RMD160 d160926363875599ab5067ac2e99ac7afc90248f ChangeLog 3753
-SHA256 348ae07c4226bd694a1faf06bad89e93e4f6124ebb341731a76616263ddcba0b ChangeLog 3753
+EBUILD gsl-1.8.ebuild 951 RMD160 a6f2b02613bc5504a2b95dd083c688a9a0c054e7 SHA1 6862c324ba05f2926ece3dca141b203ea89317a9 SHA256 eec82e52fed209a2dc6ab9f0ed449217e083889ba0f9717158817b5cbf6bfc86
+MD5 52cbf2d57a95cdaa1656ebfdebdc7dab gsl-1.8.ebuild 951
+RMD160 a6f2b02613bc5504a2b95dd083c688a9a0c054e7 gsl-1.8.ebuild 951
+SHA256 eec82e52fed209a2dc6ab9f0ed449217e083889ba0f9717158817b5cbf6bfc86 gsl-1.8.ebuild 951
+MISC ChangeLog 3888 RMD160 f4aa61ef39057851c6604ed3566a069b1855e827 SHA1 e9a36e941cc0953067775866b8a174b1d76e205e SHA256 c513e2cf57492cf5420aeba1fd3d5c7491731e564b0fa4da305ba9f620ae3500
+MD5 f59fd4a7c694a388b7dec04c1b423565 ChangeLog 3888
+RMD160 f4aa61ef39057851c6604ed3566a069b1855e827 ChangeLog 3888
+SHA256 c513e2cf57492cf5420aeba1fd3d5c7491731e564b0fa4da305ba9f620ae3500 ChangeLog 3888
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156

diff --git a/sci-libs/gsl/files/gsl-1.6-deps.diff b/sci-libs/gsl/files/gsl-1.6-deps.diff
new file mode 100644 (file)
index 0000000..f6460e0
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.6-deps.diff
@@ -0,0 +1,13 @@
+--- Makefile.am
++++ Makefile.am        2005/04/25 13:12:35
+@@ -17,8 +17,8 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
+-libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
++libgsl_la_LIBADD = $(SUBLIBS) cblas/libgslcblas.la
++libgsl_la_LDFLAGS = -no-undefined -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h
+ 
+ m4datadir = $(datadir)/aclocal

diff --git a/sci-libs/gsl/gsl-1.8.ebuild b/sci-libs/gsl/gsl-1.8.ebuild
index 089951fc533f892fce259599933ac5782cd0dbd2..102324d36fa48d2e1f281f09fddaa44c0fc492a8 100644 (file)
--- a/sci-libs/gsl/gsl-1.8.ebuild
+++ b/sci-libs/gsl/gsl-1.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.8.ebuild,v 1.1 2006/04/11 15:02:48 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.8.ebuild,v 1.2 2006/06/17 01:34:52 spyderous Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="The GNU Scientific Library"
 HOMEPAGE="http://www.gnu.org/software/gsl/"
@@ -15,6 +15,13 @@ IUSE=""
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch ${FILESDIR}/gsl-1.6-deps.diff
+       eautoreconf
+}
+
 src_compile() {
        replace-cpu-flags k6 k6-2 k6-3 i586
        filter-flags -ffast-math