summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-06-28 04:48:15 +0000
committerJustin Lecher <jlec@gentoo.org>2010-06-28 04:48:15 +0000
commitf5f505093eec6f6982275cf48ed20a1224336df2 (patch)
tree38c49f5cdf078d685ab601ec7130b7973b491555 /sci-chemistry/refmac
parentOld. (diff)
downloadgentoo-2-f5f505093eec6f6982275cf48ed20a1224336df2.tar.gz
gentoo-2-f5f505093eec6f6982275cf48ed20a1224336df2.tar.bz2
gentoo-2-f5f505093eec6f6982275cf48ed20a1224336df2.zip
Version Bump
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/refmac')
-rw-r--r--sci-chemistry/refmac/ChangeLog9
-rw-r--r--sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch82
-rw-r--r--sci-chemistry/refmac/refmac-5.6.0078.ebuild (renamed from sci-chemistry/refmac/refmac-5.6.0076.ebuild)4
3 files changed, 92 insertions, 3 deletions
diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog
index 5a3284c1bff4..fb31944790a7 100644
--- a/sci-chemistry/refmac/ChangeLog
+++ b/sci-chemistry/refmac/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-chemistry/refmac
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.10 2010/06/16 14:27:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.11 2010/06/28 04:48:15 jlec Exp $
+
+*refmac-5.6.0078 (28 Jun 2010)
+
+ 28 Jun 2010; Justin Lecher <jlec@gentoo.org>
+ +files/5.6.0078-allow-dynamic-linking.patch, -refmac-5.6.0076.ebuild,
+ +refmac-5.6.0078.ebuild:
+ Version Bump
16 Jun 2010; Justin Lecher <jlec@gentoo.org> refmac-5.5.0109.ebuild,
refmac-5.5.0110.ebuild, refmac-5.5.0110-r1.ebuild, refmac-5.6.0076.ebuild,
diff --git a/sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch
new file mode 100644
index 000000000000..b1d74de4bbb5
--- /dev/null
+++ b/sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch
@@ -0,0 +1,82 @@
+diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1
+index 3f858c8..8b32cab 100644
+--- a/makefile_refmac.inc1
++++ b/makefile_refmac.inc1
+@@ -89,9 +89,7 @@ messy_pdb.o \
+ bridge.o \
+ i0.o \
+ i1.o \
+-chbevl.o \
+-$(LLIBCIF) \
+-$(LLIBLAPACK)
++chbevl.o
+
+
+ SUBL = \
+@@ -124,9 +122,7 @@ cell_symm_subrs.o \
+ iheap_sort.o \
+ linalgebra.o \
+ math_refmac.o \
+-subnumrec.o \
+-$(LLIBLAPACK) \
+-$(LLIBCCP)
++subnumrec.o
+
+ #--------------------------------------------------------------------------------
+
+@@ -150,7 +146,7 @@ twin77mod.o: twin77mod.f
+ $(FC) $(FFLAGS) -c twin77mod.f
+
+
+-optimise_solvent_all.o: optimise_solvent_all.f90
++optimise_solvent_all.o: optimise_solvent_all.f90 atomf77mod.o
+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90
+
+ ncs_rest.o: ncs_ncs_generate.f90 ncs_rest.f
+@@ -178,7 +174,7 @@ align_refmac.o: align_refmac.f90
+ $(FC) $(FFLAGS) -c align_refmac.f90
+
+
+-hkon_secder_tch.o: hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90
++hkon_secder_tch.o: hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 optimise_solvent_all.o
+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 hkon_secder_tch.f
+
+ oppro_allocate.o: oppro_allocate.f filter_params.f90 optimise_solvent_all.f90
+@@ -220,8 +216,8 @@ refall_twin.o: refall_twin.f optimise_solvent_all.f90
+ rharvest.o: rharvest.f optimise_solvent_all.f90
+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 rharvest.f
+
+-solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90
+- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 solvent_contr_mask.f
++solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 atomf77mod.o
++ $(FC) $(FFLAGS) -c atomf77mod.f optimise_solvent_all.f90 solvent_contr_mask.f
+
+ subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90
+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 subag_scale_hessian.f
+@@ -229,7 +225,7 @@ subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90
+ subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90
+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 subcf_scale1.f
+
+-refmac_xml.o: refmac_xml.f optimise_solvent_all.f90
++refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 optimise_solvent_all.o
+ $(FC) $(FFLAGS) -c optimise_solvent_all.f90 refmac_xml.f
+
+ hkl_pack.o: hkl_pack.f90
+@@ -239,7 +235,7 @@ subvag.o: subvag.f hkl_pack.f90
+ $(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f
+
+ refmac: $(SUBR)
+- $(FC) $(FFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP)
++ $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
+
+ mol2_file.o: mol2_file.f odb_files.f90
+ $(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f
+@@ -260,7 +256,7 @@ libcheck.o: libcheck.f elements_module.f90 pdb2libcheck.f90
+ $(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f
+
+ libcheck: $(SUBL)
+- $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL)
++ $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
+
+ clean:
+ /bin/rm *.o
diff --git a/sci-chemistry/refmac/refmac-5.6.0076.ebuild b/sci-chemistry/refmac/refmac-5.6.0078.ebuild
index 05e673f0a506..057fbe9d5c91 100644
--- a/sci-chemistry/refmac/refmac-5.6.0076.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0078.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0076.ebuild,v 1.2 2010/06/16 14:27:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0078.ebuild,v 1.1 2010/06/28 04:48:15 jlec Exp $
EAPI="2"
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}"
PATCHES=(
- "${FILESDIR}"/5.6.0075-allow-dynamic-linking.patch
+ "${FILESDIR}"/${PV}-allow-dynamic-linking.patch
)
src_prepare() {