aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-04-22 17:44:57 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-04-22 17:45:41 +0200
commit13ea2ffc0883aaf655e8bf7ca9d66eace7ad663c (patch)
treee98a4bdc514fcb00fa7990a587e01af6e794ec68 /sci-chemistry/apbs
parentversion bump of pdb2pqr (diff)
downloadsci-13ea2ffc0883aaf655e8bf7ca9d66eace7ad663c.tar.gz
sci-13ea2ffc0883aaf655e8bf7ca9d66eace7ad663c.tar.bz2
sci-13ea2ffc0883aaf655e8bf7ca9d66eace7ad663c.zip
apbs checkin
Diffstat (limited to 'sci-chemistry/apbs')
-rw-r--r--sci-chemistry/apbs/Manifest6
-rw-r--r--sci-chemistry/apbs/apbs-1.1.0.ebuild1
-rw-r--r--sci-chemistry/apbs/files/apbs-1.1.0-LDFLAGS.patch2
-rw-r--r--sci-chemistry/apbs/files/apbs-1.1.0-vgrid-maloc.patch2
4 files changed, 6 insertions, 5 deletions
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 2f2edd5f7..f3fe1748e 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,8 +1,8 @@
-AUX apbs-1.1.0-LDFLAGS.patch 1179 RMD160 72192070b5ddd146bdb306bffd14b5dac51276a6 SHA1 1b91e43dd4406b7fbdb6ff4b80190e29ecc462e8 SHA256 efd393a00e2583d6b91c810c9cb79b7c05f2967541f28df7f4cb6e464a69dcac
+AUX apbs-1.1.0-LDFLAGS.patch 1186 RMD160 0c45d0dfde403a5b2755a51ae3ccbf4297da4f86 SHA1 5a91fe04f20ca62fb00a00bcc97cb8aa30146295 SHA256 268ce48a04995027dc71448ecc454ea843c0bf07ea8270ff5ad7316fd83e654a
AUX apbs-1.1.0-automagic.patch 1040 RMD160 a00f3bebcfc7c0bb4754e5d06e3909c34394d977 SHA1 02695c5ce63bdfa37e009e2a35a3ed0b4259d22e SHA256 64b3b68c88bbfcc004fb45bad6905d111f92353f46d020beade342f893a62258
AUX apbs-1.1.0-install-fix.patch 2397 RMD160 8654d19e37cd8ac43ca2416c6255448c1281a0de SHA1 47f6223afbf4eb53df26a367d980c96a549b47d1 SHA256 609f87d5a6e85951a1f560fcfd3e7db5c077ab7a3088f9c3483b7f2956728866
-AUX apbs-1.1.0-vgrid-maloc.patch 1299 RMD160 ca2f58f636d895e68da1590813974269c80446c5 SHA1 95c0b5a8ccd32d5923bf1bd97308dec97996a801 SHA256 d1b65dc3945df6de53125b98e7d36930bda41e490d0afda117d240cb82b038aa
-DIST apbs-1.1.0-source.tar.gz 10582216 RMD160 9f336fd4b041e21375af57781b96a3723c93e552 SHA1 30b9170b1f827ce4a9552b39ce48c33c790abf10 SHA256 90146e81a5b58ba1548a8facd9c75ce754d5cedaa2a52caee885c99c1aba8e9e
+AUX apbs-1.1.0-vgrid-maloc.patch 1306 RMD160 f6932bd7bb16d5bca69840bd7356ef08507a5f00 SHA1 4a7db2cd90084cd68fcef88d4e32ea0d6ce74074 SHA256 241ca937f2ac63bcd13c4b546da7e1f0b1f1ac69c83c6f0cbe1c9740729f0457
+DIST apbs-1.1.0-source.tar.gz 10582742 RMD160 f03c5617067cc33cb43e425acc74a5df3374744f SHA1 7274a3a896da551f2bb689bb32ea5c852cbd32bb SHA256 8c561920a22e314070baf9e200fa324912ad49de4595c0b54c7608ea3a759b45
EBUILD apbs-1.1.0.ebuild 2522 RMD160 2a62caea29aa0cb1f4e808d84811194b958504f7 SHA1 d31554eacabeca656bead67ef8c16d2ed3b9fb03 SHA256 92e9c64fd7b4fd553312e28f4eaf14b899e068d2a6f5b165677487ba61851b3a
MISC ChangeLog 1057 RMD160 bb5db26617e6da01c59216cf1f4b079f58643c92 SHA1 9a2cef1e2aa0c08eb2ef132f43413b2597ba4889 SHA256 84d463e7f5380e6f205ff58cd26fb9cc88e2505f342abfb0c6cb7a61432b023c
MISC metadata.xml 458 RMD160 3f41064ca200d7f85d3f790de6711aada270ac43 SHA1 69d50a5bfb0ed66870727f24f50f828dbc4abedb SHA256 c49607c06b8f41e5b3268d27258ad33b7784e29564f49585f3996d8f03568e17
diff --git a/sci-chemistry/apbs/apbs-1.1.0.ebuild b/sci-chemistry/apbs/apbs-1.1.0.ebuild
index a1cbf7f63..f31bb4f88 100644
--- a/sci-chemistry/apbs/apbs-1.1.0.ebuild
+++ b/sci-chemistry/apbs/apbs-1.1.0.ebuild
@@ -86,4 +86,5 @@ src_install() {
emake DESTDIR="${D}" install || die "make install failed"
dodoc AUTHORS INSTALL README NEWS ChangeLog \
|| die "Failed to install docs"
+ use doc || rm -rf "${D}"/usr/share/${P}/doc
}
diff --git a/sci-chemistry/apbs/files/apbs-1.1.0-LDFLAGS.patch b/sci-chemistry/apbs/files/apbs-1.1.0-LDFLAGS.patch
index 1c284f45b..4fd03d93c 100644
--- a/sci-chemistry/apbs/files/apbs-1.1.0-LDFLAGS.patch
+++ b/sci-chemistry/apbs/files/apbs-1.1.0-LDFLAGS.patch
@@ -6,7 +6,7 @@
_apbslib_so_SOURCES = apbslib.c
-_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
+_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED)
- _apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/lib/libapbsblas.a $(PY_LDFLAGS)
+ _apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS)
--- tools/python/vgrid/Makefile.am 2009-03-17 16:46:00.000000000 +0100
+++ tools/python/vgrid/Makefile.am.new 2009-03-17 16:45:52.000000000 +0100
@@ -15,6 +15,6 @@
diff --git a/sci-chemistry/apbs/files/apbs-1.1.0-vgrid-maloc.patch b/sci-chemistry/apbs/files/apbs-1.1.0-vgrid-maloc.patch
index a0866712b..722cf3665 100644
--- a/sci-chemistry/apbs/files/apbs-1.1.0-vgrid-maloc.patch
+++ b/sci-chemistry/apbs/files/apbs-1.1.0-vgrid-maloc.patch
@@ -14,6 +14,6 @@
noinst_PROGRAMS = _apbslib.so
_apbslib_so_SOURCES = apbslib.c
_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED)
--_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/lib/libapbsblas.a $(PY_LDFLAGS)
+-_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS)
+_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS)