Fixed improper link path for libapbsblas.a (fixes bug #205310).

Package-Manager: portage-2.1.4_rc14

4 files changed, 27 insertions, 20 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index dfa3fb3fe686..af3879b88b65 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/apbs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.15 2007/07/31 22:23:46 je_fro Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.16 2008/01/12 13:44:08 markusle Exp $
+
+  12 Jan 2008; Markus Dittrich <markusle@gentoo.org> apbs-0.5.1.ebuild:
+  Fixed improper link path for libapbsblas.a (fixes bug #205310).
 
   31 Jul 2007; Jeff Gardner <je_fro@gentoo.org> -apbs-0.4.0.ebuild:
   Removing unused version/files.
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 19cba57fac44..5d724216524f 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -8,18 +8,18 @@ RMD160 88138dc27c2fa17e558dc3a5c8c41e52bd2f0309 files/apbs-gcc4-gentoo.patch 108
 SHA256 9077f4ffc41a2af28eed4193a2e56d20b668e2bc280ca2740d3a8803e28c48d6 files/apbs-gcc4-gentoo.patch 1080
 DIST apbs-0.5.0-source-2.tar.gz 10171621 RMD160 31a00f89052cc32d0fdf3272c214f2145ac62067 SHA1 4d3376a62169e3965a2d3b49a2b4b1014bf7721e SHA256 5f99cc6141d34800cf9e93e0e23215b3f740f6e208318698e7011602e1630a08
 DIST apbs-0.5.1-source.tgz 10952600 RMD160 d738f88252193dff64ca692d895d1359445d5eda SHA1 50d88392f4cf2cadf1627828aeffeb165ef49f0e SHA256 28828a56d474d644f1e0940b9f232c92ccf2bc123ae402bd70976cf018564903
-EBUILD apbs-0.5.0.ebuild 1757 RMD160 19f32781d4ee7dcc4d33d7f031c7ee65b434d2dc SHA1 1da670491ad35339d77d25595c0c2f849915726b SHA256 88d84d01c9a12a9bcd3f5c389fb03e817de84b90a8d2e076de4e6c0c00d49aa6
-MD5 a4147a49a6e42a04656373dc991ebaba apbs-0.5.0.ebuild 1757
-RMD160 19f32781d4ee7dcc4d33d7f031c7ee65b434d2dc apbs-0.5.0.ebuild 1757
-SHA256 88d84d01c9a12a9bcd3f5c389fb03e817de84b90a8d2e076de4e6c0c00d49aa6 apbs-0.5.0.ebuild 1757
-EBUILD apbs-0.5.1.ebuild 1752 RMD160 bc5a3eb8ee7e58eca861dd1925675aa53fa769c1 SHA1 6fbad898f518f6c08492178d4bec98fe82ec4734 SHA256 aaae3b73a567d0ff8ee36900a12864990fe71cedd55529df2d9e4cbb6053c5ea
-MD5 85caafffbe070f9a3058e690a7fa3b8a apbs-0.5.1.ebuild 1752
-RMD160 bc5a3eb8ee7e58eca861dd1925675aa53fa769c1 apbs-0.5.1.ebuild 1752
-SHA256 aaae3b73a567d0ff8ee36900a12864990fe71cedd55529df2d9e4cbb6053c5ea apbs-0.5.1.ebuild 1752
-MISC ChangeLog 2108 RMD160 8744bc18e818e3091f593dd4152c670a50af16af SHA1 162c86f4891773a2d807c480deeeecffb4df3250 SHA256 4f57d34d5a8ba25675ffa88198134349bd21e4f5ca2db5890d4e7138a0fed58a
-MD5 e4db3605b8499af260fc4b5916b0ab77 ChangeLog 2108
-RMD160 8744bc18e818e3091f593dd4152c670a50af16af ChangeLog 2108
-SHA256 4f57d34d5a8ba25675ffa88198134349bd21e4f5ca2db5890d4e7138a0fed58a ChangeLog 2108
+EBUILD apbs-0.5.0.ebuild 1761 RMD160 d680a39910bbacb86dfd1829f244da763539f5b0 SHA1 d2622fafd3ae540f3bc3a8350e7e20dbbecf165b SHA256 2820f64797fb4955b632be053bda14aa78d837cc94dc9f239d8be0d4dd780e16
+MD5 e31e0fee8723bc8cc0d1c7d04a685801 apbs-0.5.0.ebuild 1761
+RMD160 d680a39910bbacb86dfd1829f244da763539f5b0 apbs-0.5.0.ebuild 1761
+SHA256 2820f64797fb4955b632be053bda14aa78d837cc94dc9f239d8be0d4dd780e16 apbs-0.5.0.ebuild 1761
+EBUILD apbs-0.5.1.ebuild 1906 RMD160 78da03680c19c9ef98949e42e91ee28e01fa2ab5 SHA1 9bbea4acab12682564232b004f0ba9632ef89001 SHA256 47e7f0a86abd37806d9613d3c4c707d2a1637b79a3158bff63437a3b749c49df
+MD5 28a12a39dcfc81139c2bd13b9cfcd45b apbs-0.5.1.ebuild 1906
+RMD160 78da03680c19c9ef98949e42e91ee28e01fa2ab5 apbs-0.5.1.ebuild 1906
+SHA256 47e7f0a86abd37806d9613d3c4c707d2a1637b79a3158bff63437a3b749c49df apbs-0.5.1.ebuild 1906
+MISC ChangeLog 2249 RMD160 fed5bd28963369dc214d24585387820210435314 SHA1 8fac93411ad3f427e6a90e6bdea89898f86719ed SHA256 0d94c32c5b99e440e57c3fc8fc781ef62b331b492d33ef63befcadddd68f4841
+MD5 44ade9cbdde8003043ab0d62f77afb4e ChangeLog 2249
+RMD160 fed5bd28963369dc214d24585387820210435314 ChangeLog 2249
+SHA256 0d94c32c5b99e440e57c3fc8fc781ef62b331b492d33ef63befcadddd68f4841 ChangeLog 2249
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
 MD5 cf7436fe44a27481d1001082eb06326e metadata.xml 282
 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 metadata.xml 282
diff --git a/sci-chemistry/apbs/apbs-0.5.0.ebuild b/sci-chemistry/apbs/apbs-0.5.0.ebuild
index e4afe84b17fb..897d5ca5a4fc 100644
--- a/sci-chemistry/apbs/apbs-0.5.0.ebuild
+++ b/sci-chemistry/apbs/apbs-0.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-0.5.0.ebuild,v 1.2 2007/02/24 18:39:08 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-0.5.0.ebuild,v 1.3 2008/01/12 13:44:08 markusle Exp $
 
 inherit eutils fortran
 
@@ -38,7 +38,7 @@ src_compile() {
 	econf ${myconf} || die "configure failed"
 
 	# build
-	make DESTDIR=${D} || die "make failed"
+	make DESTDIR="${D}" || die "make failed"
 }
 
 src_install() {
diff --git a/sci-chemistry/apbs/apbs-0.5.1.ebuild b/sci-chemistry/apbs/apbs-0.5.1.ebuild
index 0580109c9490..253981b9b917 100644
--- a/sci-chemistry/apbs/apbs-0.5.1.ebuild
+++ b/sci-chemistry/apbs/apbs-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-0.5.1.ebuild,v 1.1 2007/07/18 17:37:48 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-0.5.1.ebuild,v 1.2 2008/01/12 13:44:08 markusle Exp $
 
 inherit eutils fortran
 
@@ -29,6 +29,10 @@ pkg_setup() {
 }
 
 src_compile() {
+	# fix apbsblas
+	sed -e "s:-L\${prefix}/lib -lapbsblas:${S}//contrib/blas/.libs/libapbsblas.a:" \
+		-i configure \
+		|| die "failed to fix configure"
 
 	# use blas
 	use blas && local myconf="--with-blas=-lblas"
@@ -38,7 +42,7 @@ src_compile() {
 	econf ${myconf} || die "configure failed"
 
 	# build
-	make DESTDIR=${D} || die "make failed"
+	make DESTDIR="${D}" || die "make failed"
 }
 
 src_install() {