summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-07-04 09:27:37 +0000
committerJustin Lecher <jlec@gentoo.org>2011-07-04 09:27:37 +0000
commitd89be8292b2a27c96766e718677cf52d96e7b20f (patch)
treeb8a8d265c7079ee4b292e238204f0a452c12392d /sci-chemistry
parentMove versions into slots because they are not compatible and actionpack 3.0.x... (diff)
downloadhistorical-d89be8292b2a27c96766e718677cf52d96e7b20f.tar.gz
historical-d89be8292b2a27c96766e718677cf52d96e7b20f.tar.bz2
historical-d89be8292b2a27c96766e718677cf52d96e7b20f.zip
Fix for blas detection
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/apbs/ChangeLog6
-rw-r--r--sci-chemistry/apbs/Manifest15
-rw-r--r--sci-chemistry/apbs/apbs-1.3-r1.ebuild5
-rw-r--r--sci-chemistry/apbs/files/apbs-1.3-blas.patch16
4 files changed, 37 insertions, 5 deletions
diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index eba59b3182cd..21709882e67d 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/apbs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.49 2011/07/02 08:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.50 2011/07/04 09:27:37 jlec Exp $
+
+ 04 Jul 2011; Justin Lecher <jlec@gentoo.org> apbs-1.3-r1.ebuild,
+ +files/apbs-1.3-blas.patch:
+ Fix for blas detection
02 Jul 2011; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r4.ebuild,
apbs-1.3.ebuild, apbs-1.3-r1.ebuild, metadata.xml:
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 2d080a2c3b77..92d3b6c03a81 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX apbs-1.2.0-contrib.patch 382 RMD160 4c0c75e57fb6a0c298606d87785a5b9daa8db457 SHA1 653295c9ff7ac075613dd82ce332b41b0e2ea37e SHA256 0b2a1c518c66de6010954f101c1622cfd570bbfcc4774d98607174e57e67f1b3
AUX apbs-1.2.0-link.patch 1716 RMD160 904e7123d32f628171aa728a761c9d7fd95e967d SHA1 63265d0c7c636749292d90efe6a989e7e48251b6 SHA256 37faa758d6439f22853aa9d4524e3e8770437d3986e00649a193b0a97f369bba
AUX apbs-1.2.1b-autoconf-2.64.patch 952 RMD160 80ed2f351c52764b1c3221b4f5f0e152652c8637 SHA1 dbe725035299182efe82d6ab4a8dcb721601592c SHA256 d9855b84b5b3ca404c463ad9ada7d75d7076d11a929b53bd61f42ed427be9984
@@ -6,6 +9,7 @@ AUX apbs-1.2.1b-multilib.patch 545 RMD160 c9c103a99c9cedc1e158c4c851b70871e23bf0
AUX apbs-1.2.1b-openmp.patch 1471 RMD160 456d2b1b74a3cb403c7e77814bcb017e7726b578 SHA1 386ffbe0e68398168ede30a33706227e6da64e48 SHA256 ba91c8e780035c884e344c6c84c7bdbd606f3c9919a9aa803ff831d6f41bc905
AUX apbs-1.2.1b-parallelbuild.patch 371 RMD160 22369e3923307f5cc17602a4cab0326131ac3b72 SHA1 d0b775bf826cc96a799bf1ef9273b79de64164d0 SHA256 907caa55463f5dd0bfc3bbc890c0f97f70bab782c3f76938b59b03e34a9e448c
AUX apbs-1.2.1b-shared.patch 2508 RMD160 e122f33b7a64a70ebb17631e93085f982ff48074 SHA1 84d835d823e8fa82bc9aa7e274d63c59a4998a12 SHA256 9d35a22be4ea3cd1a0c821b25fbcaf0c44212a2004581e14a8245af4338d73f8
+AUX apbs-1.3-blas.patch 520 RMD160 257814beec73cf9f95a38997ee4ac75f23a385d7 SHA1 2390f40d74b533f2827d09fdc27f75968b4b4ec1 SHA256 ef48562ca1b547227a63395f18ed09db72dc1dd063f6e869cedf191f91fa6f5a
AUX apbs-1.3-contrib.patch 402 RMD160 18bdf5ef5940e8cb3b610acbc3c855105cb2dca7 SHA1 956fdaebbd0f1b3c1b15f8d3c139ab532109bcf0 SHA256 fdddd8da9a333ae1b96942f3bd4ca0fd6d1be5a888369144d43e836dfdf0b280
AUX apbs-1.3-link.patch 1578 RMD160 e103808470dd500d2077a27906ed4cc1f9ec3aee SHA1 1ea909005bb0ce6976978a93864e976146df381a SHA256 7261cb286599681669ce67b8c4cf376515db177ebece2aa555d730e1dd981284
AUX apbs-1.3-mainroutines.patch 408 RMD160 00493750cfd8fe278fff4389e642277ca2566dd7 SHA1 3f80728313609d8cb12d582d842cd38cd9eeec79 SHA256 967a6682a71643e4a638e389dba188173a50f9efc1b9091d37dab4c676e5bfa1
@@ -16,7 +20,14 @@ AUX apbs-1.3-zlib.patch 1231 RMD160 a0278f6883bf045de59aae921072a756495587b9 SHA
DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be
DIST apbs-1.3-source.tar.gz 48625351 RMD160 c075a747dc28f382f3a383a0944a1b20e0c8a9f1 SHA1 1494f36e35f2e4b1a18d4b22516fad4948c6391f SHA256 5fa5b597f7d5a3d9bb55429ec4fefc69e7d0f918d568c3c4a288088c0fde9ef2
EBUILD apbs-1.2.1b-r4.ebuild 3579 RMD160 2f1b8d4fd9c50f057b2b7e07c1e32f820ca68c00 SHA1 964f517ba628e4f1b4c4fe4e45b18e5e1ab212cb SHA256 b856d41c344abf816461d3b2b2f3faea2fdc9356b59384f206efaf1184ca48f2
-EBUILD apbs-1.3-r1.ebuild 4451 RMD160 4453709cdd54c48c9dc73db89572cbe263a4bdc8 SHA1 1df60c21f4ae5a6925df14f424e74d07166f0443 SHA256 a67ad848433cb80b37f723e001eeaa13bc4265aa171101200a72f11403ce6904
+EBUILD apbs-1.3-r1.ebuild 4485 RMD160 2705856699cdba21a77e1e138f5c733dd47ee104 SHA1 2b586a5db9ca0883019c24df7b7a1e26e152eec2 SHA256 3965d5cfc8e56981dd5c7dbd9a31d1f9694b0883163996bc33dae5dd8534108d
EBUILD apbs-1.3.ebuild 4332 RMD160 d2d599eee21aa0c6714d47366e82d896c7245ff8 SHA1 27c3fd8a30854595099cd8c42e9aba8f0662f1b6 SHA256 702d58033a291a7d41edf296fd6bae66a34716ceaab608ac338d4153e63ff679
-MISC ChangeLog 8443 RMD160 b01db69a00d799d39e21facbb17541f8f1c43811 SHA1 e8b4be0c9efad2e9b526b050384c60cc35da31cc SHA256 702e630410b94ff2ed10a87e6789979ad8ab1ed8de1f4f76b1eb38ff56be8b98
+MISC ChangeLog 8566 RMD160 460cd644b1cffb20ef302c72514eaf0744858cd9 SHA1 594b903756ecb828b024594b9cc160c6be8b202c SHA256 cb5750b2a2ecfe976c10782c1a3dc160bf95572e6ac5d81fe6df2a0b518d8fd1
MISC metadata.xml 968 RMD160 0ce9c8d3336f87b6a4f5e84b910d82429785c94e SHA1 870bd7fdded9a1a172bd6dc87316a98355d45ed1 SHA256 9e8f3ce475c93fc730178ddaedd102aaeb224f9505300c41d045e5970fd436eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk4Rh5MACgkQgAnW8HDreRY5mwCePRLOyGU0ZKO/u0ILHJzGfA2R
+q8wAnj1WDnuPSDmMUen2B9oGjWHtnfUy
+=J3SW
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/apbs/apbs-1.3-r1.ebuild b/sci-chemistry/apbs/apbs-1.3-r1.ebuild
index 894cf101e429..92d0b44e257d 100644
--- a/sci-chemistry/apbs/apbs-1.3-r1.ebuild
+++ b/sci-chemistry/apbs/apbs-1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.6 2011/07/02 08:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.7 2011/07/04 09:27:37 jlec Exp $
EAPI="3"
@@ -65,7 +65,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.2.1b-parallelbuild.patch \
"${FILESDIR}"/${P}-mainroutines.patch \
"${FILESDIR}"/${P}-zlib.patch \
- "${FILESDIR}"/${P}-python.patch
+ "${FILESDIR}"/${P}-python.patch \
+ "${FILESDIR}"/${P}-blas.patch
sed "s:GENTOO_PKG_NAME:${PN}:g" \
-i Makefile.am || die "Cannot correct package name"
# this test is broken
diff --git a/sci-chemistry/apbs/files/apbs-1.3-blas.patch b/sci-chemistry/apbs/files/apbs-1.3-blas.patch
new file mode 100644
index 000000000000..08d99ce6a277
--- /dev/null
+++ b/sci-chemistry/apbs/files/apbs-1.3-blas.patch
@@ -0,0 +1,16 @@
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6020fbf..65dd770 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1021,7 +1021,7 @@ if test x"$with_blas" != "xno" -a -n "$with_blas"; then
+ LDFLAGS_SAVE=${LDFLAGS};
+ CPPFLAGS_SAVE=${CPPFLAGS};
+ LDFLAGS="-L${maloc_lib_path} ${blas_lib}";
+- AC_CHECK_LIB(${blas_name},dscal,
++ AC_CHECK_LIB(m,dscal,
+ [blas_found="yes"],
+ [blas_found=""],
+ [${blas_lib} ${socket_lib} ${nsl_lib} ${math_lib}])