ccp4-apps which I broke somehow are fixed now

5 files changed, 28 insertions, 7 deletions

diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest
index 0f3623554..9c0723adc 100644
--- a/sci-chemistry/ccp4-apps/Manifest
+++ b/sci-chemistry/ccp4-apps/Manifest
@@ -1,14 +1,15 @@
 AUX 6.1.2-clipper-mmdbold-ggc-4.3.patch 656 RMD160 6b302779b48217a14f5ac9110bc307db3a3b51eb SHA1 f5813d6769fa9dc11605425cdbda85691d3016bc SHA256 982eff0336a6dfaf4e280d51a59cf722fc063ca89d15ca0af46ce83727fb9a8a
 AUX 6.1.2-dont-build-double-and-make-bindir.patch 688 RMD160 f5f93cbec122ce81a1ddb1cf57a852d51fa5e5d6 SHA1 4c924554c5c1991ed691fe3474eeffbd108493a9 SHA256 037a3d9042c784c895083fe5348ed3bde74620c1b6b3b2cd4eea53bdbfe77d53
 AUX 6.1.2-dont-build-libs.patch 1266 RMD160 95d2960fbd2f3d8661187ea9ed7ffc5f2f30e61f SHA1 7b5fa26432f57a11c8bedff79209f687b6bd95cb SHA256 329d29c58e18403105ed06fdd6b012a481b7c2b43af53b86395204b2acea51ed
-AUX 6.1.2-dont-build-scala.patch 2195 RMD160 c09296e33acb2f10d69c8543163606d5867ba15f SHA1 a6bcbc519edeac0cfd47f677d8d6c79aa2a3b02a SHA256 73d4af040eef67e597b11877cc3719f5b15c5e357c3882449dc993a84857c4a3
+AUX 6.1.2-dont-build-molref.patch 559 RMD160 93a81aec6548fa909c67546958878fc27632b392 SHA1 e16dafd552839128f81bc2e8e8f9953258e1c398 SHA256 1ba59db41f93c02494beb7a5d816dea966341009344805df4dfb873ab4e98eca
+AUX 6.1.2-dont-build-scala.patch 2185 RMD160 52b3e962b534664a104fbc74ee4d6bad250977f4 SHA1 a06caefcef89b41efafe976b62832af1c39f3a75 SHA256 a46adfd2cab7c45a2b421c3bfc3f8f0c5a2fba517b76446c572ec3f9519070ae
+AUX 6.1.2-dont-build-xia.patch 712 RMD160 dd3f8bcf309b7d84c31bf4cf829d1d9f95618d4a SHA1 b4e32e245bd8f5fde6a9573777592b3787f5becd SHA256 931bf9027e503d19d1d4446ea3ada2c20044b355d8071756ae58e88159eab75f
 AUX 6.1.2-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.2-fix-setup-bash-incompatibility.patch 422 RMD160 e7e886ab030cf3324302c8fd0c866b48eeb34f8c SHA1 4e549abcd3ced1e6ecf9d3f2bddfed70425d61aa SHA256 109a0e806f9c0e1b8bf5e5f0c58be6f1dae06396b62ee4dae9f579ff7dcb5a01
 AUX 6.1.2-gcc4.4.patch 1006 RMD160 5d66b599da41649b836080f18dcea292917c88eb SHA1 0d7ed670e46f8433555fe63b0b7443fa27f42b0f SHA256 09d0cc3333e75d85ef057ba4f239e2c79ed76623cfa7ecc6e62a813d9bac2423
-AUX 6.1.2-nomolref.patch 559 RMD160 93a81aec6548fa909c67546958878fc27632b392 SHA1 e16dafd552839128f81bc2e8e8f9953258e1c398 SHA256 1ba59db41f93c02494beb7a5d816dea966341009344805df4dfb873ab4e98eca
 AUX 6.1.2-rename-rapper.patch 2856 RMD160 37504bed3cb4e1858d88331305deef6564616b02 SHA1 31f513c987e1408b868f8c9de4aaa9f2c35cb378 SHA256 d9fed1ec65089c4130358aeed771b32c1253e48a73e90f0ce7b92bd0abbb0c2b
 AUX 6.1.2-rename-truncate.patch 1515 RMD160 eff332faa67a1732e0f99cc6cdcb846932eadc87 SHA1 b504542cf710e1b54a684b0fa0e8d73d967c96ac SHA256 50a59a1856867daa3de1f8f53e92bcfe74dea3a6d3c4ba238a9ea83dbcdfbf07
 DIST ccp4-6.1.2-core-src.tar.gz 247203373 RMD160 d2ead65da0a2561a8a256cdaa15a6b1a02b6d49e SHA1 fe94461fcafa7074231e01221760e24bb886d605 SHA256 875137beb74cb385b89fe3e49feeda78330c175861a590ee5f7cdbec26bc0e8a
-EBUILD ccp4-apps-6.1.2.ebuild 10010 RMD160 83994ee0362055614365b9826447b3958bd3152f SHA1 de727c1e2bacec2f428b0e08feec4cd2281e6c85 SHA256 71abc6ff2b5e075117258e3bc51d3c2ff60b39839be2f24fb20d03e96adef81d
+EBUILD ccp4-apps-6.1.2.ebuild 10121 RMD160 01cf489d32b2d6b3bccc0dd90f9e82c0a086a7b8 SHA1 6659522c4fff9a961ef3ba3efa7db1741f9d2c9d SHA256 0115429ee9974452ba35c33cc67148ffaf6c1fbd9a358367cdaf77ccb02125a2
 MISC ChangeLog 5937 RMD160 6edb135e374358d2f4f5c5174d0d142ad0783c90 SHA1 132bd54847a869c0e5e369fec89067718b51858c SHA256 0dd7ab9bccd495d68ba6f8a0777179dfc64202348df20ded040117df0820b580
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild
index 8e5ee5ca4..17e3e3a5d 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild
@@ -94,7 +94,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 	)"
 
-S="${WORKDIR}/${PN/-apps}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
@@ -137,7 +137,10 @@ src_unpack() {
 	mv ./html/rapper.html ./html/rappermc.html || die
 
 	# molref is provided as binary and dynamically linked against icc
-	ccp_patch "${FILESDIR}"/${PV}-nomolref.patch
+	ccp_patch "${FILESDIR}"/${PV}-dont-build-molref.patch
+
+	# no xia
+	ccp_patch "${FILESDIR}"/${PV}-dont-build-xia.patch
 
 	# We build scala ourself
 	ccp_patch "${FILESDIR}"/${PV}-dont-build-scala.patch
@@ -217,6 +220,7 @@ src_compile() {
 	# Default to -O2 if FFLAGS is unset
 	export FC=${FORTRANC}
 	export FOPTIM=${FFLAGS:- -O2}
+	export BINSORT_SCR="${T}"
 
 	# Can't use econf, configure rejects unknown options like --prefix
 	./configure \
@@ -228,6 +232,7 @@ src_compile() {
 		--disable-cctbx \
 		--disable-phaser \
 		--disable-clipper \
+		--disable-mosflm \
 		--disable-mrbump \
 		--tmpdir="${TMPDIR}" \
 		${GENTOO_OSNAME} || die "econf failed"
@@ -377,3 +382,4 @@ pkg_postinst() {
 ccp_patch() {
 	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
 }
+
diff --git a/sci-chemistry/ccp4-apps/files/6.1.2-nomolref.patch b/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-molref.patch
index f16b0ecb9..f16b0ecb9 100644
--- a/sci-chemistry/ccp4-apps/files/6.1.2-nomolref.patch
+++ b/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-molref.patch
diff --git a/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-scala.patch b/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-scala.patch
index 9e7b794bd..af4fd8219 100644
--- a/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-scala.patch
+++ b/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-scala.patch
@@ -4,8 +4,8 @@
  
  # these live in subdirectories and have more than one dependency:
  OTHERS = rsps anglen secstr proclean pplot gfac2pdb tplot mplot probplot rmsdev nb \
--         scala dm dmmulti stereo mapmask maprot ncsmask chef \
-+         dm dmmulti stereo mapmask maprot ncsmask chef \
+-         scala dm dmmulti stereo mapmask maprot ncsmask \
++         dm dmmulti stereo mapmask maprot ncsmask \
           sftools tlsanl tlsextract topp toplist dyndom sc combat mlphare fffear ffjoin \
           anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf doser mat2symop symop2mat 
  
diff --git a/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-xia.patch b/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-xia.patch
new file mode 100644
index 000000000..3af4af503
--- /dev/null
+++ b/sci-chemistry/ccp4-apps/files/6.1.2-dont-build-xia.patch
@@ -0,0 +1,14 @@
+--- src/Makefile.in	2009-07-05 16:50:25.000000000 +0200
++++ src/Makefile.in.new	2009-07-05 19:38:06.000000000 +0200
+@@ -50,9 +50,9 @@
+ 
+ # these live in subdirectories and have more than one dependency:
+ OTHERS = rsps anglen secstr proclean pplot gfac2pdb tplot mplot probplot rmsdev nb \
+-         scala dm dmmulti stereo mapmask maprot ncsmask chef \
++         scala dm dmmulti stereo mapmask maprot ncsmask \
+          sftools tlsanl tlsextract topp toplist dyndom sc combat mlphare fffear ffjoin \
+-         anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf doser mat2symop symop2mat 
++         anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf 
+ 
+ # targets built from .c sources:
+ CSIMPLE = pltdev binsort