sci-chemistry/mosflm: Unbundle licbf and libjpeg, fix parallel build, Drop stable ppc keyword due to broken deps

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 188 insertions, 17 deletions

diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index 0d6f80964915..df08f5734cd9 100644
--- a/sci-chemistry/ccp4i/Manifest
+++ b/sci-chemistry/ccp4i/Manifest
@@ -8,14 +8,13 @@ AUX 6.1.3-rename-truncate.patch 3849 RMD160 44d48f59abbe603940bd21780ace955dd1ac
 DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f87 SHA1 7667aca14d28cec01bfa7d2eee9cbce11624f4fa SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
 DIST ccp4i-6.1.3-arpwarp.patch.bz2 58498 RMD160 3bf65f26a8635194e69ff9f33a457f9ff7e050d0 SHA1 0172a35d539ed3020228f20f0ddfa82540790cf0 SHA256 297e6f75354f3a1932302f7039bf449484c95eb41b8634ae96d93c754b47c687
-EBUILD ccp4i-6.1.3-r2.ebuild 2139 RMD160 3ee5efdce5b2373bc76139714cfe6cecf9878c52 SHA1 656f97dc6d3c9c40f010a24329e1357f855671f6 SHA256 3b9e0a3a7ff225c70df2889af731504e3b62bd5a25557fd8e50db9b646c43969
 EBUILD ccp4i-6.1.3-r3.ebuild 2402 RMD160 590cab222da4cc1482c9002bfb6a71a44300853a SHA1 79f8daae9b73fac44ca0d13f02399ecf38ae30db SHA256 2187cc5b711a56c77331aeefd55e3260a0688eb1fd670bbdf16d0d4005361994
-MISC ChangeLog 1772 RMD160 e30b9feef9a0fbeeffc1aa2913cf3262a2bba489 SHA1 7ae7ed2ec9a663d7ec45da873c3c3eabd50435bd SHA256 56e1be82714d3f948a9719e1fc534a6338c51642e775aaad79d9e1085f7454a7
+MISC ChangeLog 1855 RMD160 1a5372f8ab28141e320cb0ab169ef01bf382be43 SHA1 e24a125dd6a496495e3c57f1b2b9a6f8c63a7e0e SHA256 4a62d25893f29460a90f3e515efb87dc4ea8d52ef2c03342063271abffb2635c
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk5nqMUACgkQgAnW8HDreRbyCACfdb5bfmovgJPMSG29l/0UC5lF
-nBEAoICsOczht5NJcomdG7cJTwLbMgFk
-=fqZp
+iEYEAREKAAYFAk+bo3UACgkQgAnW8HDreRbEpwCfTyI8aP5WCv/H84oat1qzlFoE
+DIYAn1Xa5uRX7AHvlAp6VNT2jWTDHU2c
+=7L5j
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index 791e4d640c42..26d7e29e257b 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/mosflm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.14 2011/09/07 15:21:32 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.15 2012/04/28 07:58:26 jlec Exp $
+
+*mosflm-7.0.7-r1 (28 Apr 2012)
+
+  28 Apr 2012; Justin Lecher <jlec@gentoo.org> +files/7.0.7-parallel.patch,
+  mosflm-7.0.6-r2.ebuild, +mosflm-7.0.7-r1.ebuild:
+  Unbundle licbf and libjpeg, fix parallel build, Drop stable ppc keyword due
+  to broken deps
 
 *mosflm-7.0.7 (07 Sep 2011)
 
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
index 7ba804253cca..8f4243915ccb 100644
--- a/sci-chemistry/mosflm/Manifest
+++ b/sci-chemistry/mosflm/Manifest
@@ -4,16 +4,18 @@ Hash: SHA512
 AUX 7.0.6-Makefile.patch 352 RMD160 69fd182574615b90bbeb1b633885006051e81683 SHA1 f2964f48bb4bf89880fe47f0af1bff090c59092e SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7
 AUX 7.0.6-impl-dec.patch 949 RMD160 e2dc1b8236a1ac72836af911d19a1ce5e1d048bf SHA1 5f51546471f5ab3530f56d0e7bbdeb6a977f91be SHA256 7c39b9d37ea4ea01668dd16ccf1b31e288bca37eaef497c5b0c725d42ebeb8b2
 AUX 7.0.6-parallel.patch 654 RMD160 f28cdb670c3ecfcc4ec194dd44136182fbf9cf7f SHA1 bf6742b58d6e9ce67e76f38e81aeb64f88fae729 SHA256 c821e031a039502364c4ae151fd64886a6a33153e5c746d55838a99050d18c60
+AUX 7.0.7-parallel.patch 2482 RMD160 2aa7e34342fa46b7d7a55726f06e30b156d846a1 SHA1 3db79b77ba765eebcc2f1aa8b69d4ae3b39413c7 SHA256 7bb2636833a5332472c5c60a0736e5c75cd04691909784a5e363da64c3e254bb
 DIST mosflm706.tgz 3468405 RMD160 fb0b7e51ed9845d4d17aa804cb1424e5aa0f24b8 SHA1 f9a771c3991c7ad3125a7e39d5c59b3049784f4f SHA256 5e26a49fd37749a14e7a1d1e867c1c0333db3bbcc01376fb7a516d4a67b1ebb0
 DIST mosflm707.tgz 3401235 RMD160 0301c22df9f0229f8ee5ac5b87c1353a5608fa94 SHA1 6ac29381bbea57ea370d72b31f36660332316d07 SHA256 fb14a02834929423569a23a04800de62ed1da2a02966958b79c157a71b9b6118
-EBUILD mosflm-7.0.6-r2.ebuild 1779 RMD160 2af1c2870a86d5e306ec30545355c736816a7aa6 SHA1 a99997333e1209e48dcfa5fc16b245a4bcce5186 SHA256 1f9413660dda2ff593c13e5edf131a1d81c911b93819edb67472301054274d0f
+EBUILD mosflm-7.0.6-r2.ebuild 1778 RMD160 60cded72308c2158ac369cbcbed817a7baf99aaf SHA1 29729ca74b23d2de8b20dac9aeea56271ad476b7 SHA256 269b94ae627bc4d053a60ab6915273f76338d3187cfbd7f71ae6521df0646e84
+EBUILD mosflm-7.0.7-r1.ebuild 1703 RMD160 ed97fe6cf13ca41c6db3b4062156322f2bfcf69c SHA1 9a73cbb5c1c5b3fb596db020f02b078426987ddf SHA256 441ea84a02997badf6eb42ca1765950a9c0fa2b45f8fb8f65669bfe8563c8865
 EBUILD mosflm-7.0.7.ebuild 1764 RMD160 7b8fff5a5841aa8b894233d8e9d15b212c69d148 SHA1 e6abc3d4a04deb86ea07dbcbbad2014962e01a6c SHA256 92449bc206253b5ae3ce06f261f225fb479a188c3f21f36bf120fb776c8fd7c1
-MISC ChangeLog 1950 RMD160 477c651abadd4c42b026f05a3993a10f61997ca3 SHA1 6e8d781a200a5b0f13edb25e01604afdcf7f9710 SHA256 be19a83d6e99553706d1aae1529a64889d850a423ba2793d7f318a81bb2c11b6
+MISC ChangeLog 2205 RMD160 ff800e3394bad1442096b2c1a13b4c34a44b5af0 SHA1 3ea82c4b65be5a827ae93c75f3a52857d52ba2f8 SHA256 a7483cc9fec6a13dcf5c44ae79fffdb3638951b3a54102f0b57b47643586ddcb
 MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk5ni/wACgkQgAnW8HDreRY4gACfVSp19J7M3ZbgkAT8JI4sDM7I
-rdYAoLgNfSm2oB72w1Xrrwnz0wuauwOi
-=ceC/
+iEYEAREKAAYFAk+boygACgkQgAnW8HDreRZ63gCfdSaXH6xWb1RpGRxaXEX7KYJ9
+fasAnAuY2Ck/DYPOzPyxqTrRerGemji5
+=nV8O
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mosflm/files/7.0.7-parallel.patch b/sci-chemistry/mosflm/files/7.0.7-parallel.patch
new file mode 100644
index 000000000000..df0a8b63273a
--- /dev/null
+++ b/sci-chemistry/mosflm/files/7.0.7-parallel.patch
@@ -0,0 +1,92 @@
+ Makefile     |   21 ++++++++++-----------
+ cbf/Makefile |    9 +++++++--
+ 2 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 37f4c7e..51d4164 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a
+ CBFLIBS = cbf/lib/libcbf.a
+ JPGLIBS = jpg/libjpeg.a
+ 
+-all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
+-	cd mosflm ; make
++all:	$(DPSLIBS)
++	$(MAKE) -C mosflm
+ 
+ ##########################################################################
+ #                                                                        #
+@@ -47,22 +47,21 @@ dpslibs:
+ 
+ cbflibs: 
+ 	rm -f `find ./cbf -name "*.a" -print`
+-	cd cbf ; make all ; if [ -f $(RANLIB) ]; \
+-	then $(RANLIB) lib/libcbf.a; fi
++	$(MAKE) -C cbf all
+ 
+ jpglibs: 
+-	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a
++	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a
+ 
+ ${DPSLIBS}:
+-	make dpslibs
++	$(MAKE) dpslibs
+ 
+ ${CBFLIBS}:
+-	make cbflibs
++	$(MAKE) cbflibs
+ 
+ ${JPGLIBS}:
+-	make jpglibs
++	$(MAKE) jpglibs
+ 
+-libs:	${DPSLIBS} ${CBFLIBS} ${JPGLIBS}
++libs:	${DPSLIBS} ${CBFLIBS}
+ 	@echo "****************************************************************"
+ 	@echo "             Making libraries for system ${HOSTTYPE}"
+ 	@echo "****************************************************************"
+@@ -71,11 +70,11 @@ ipmosflm: libs
+ 	@echo "****************************************************************"
+ 	@echo "           Making IPMOSFLM for system ${HOSTTYPE}"
+ 	@echo "****************************************************************"
+-	cd mosflm ; make ipmosflm
++	$(MAKE) -C mosflm ipmosflm
+ 
+ force:
+ 	rm bin/ipmosflm
+-	make ipmosflm
++	$(MAKE) ipmosflm
+ 
+ install:
+ 	@echo "the executable is in ${MOSHOME}/bin/ipmosflm"
+diff --git a/cbf/Makefile b/cbf/Makefile
+index e61497c..c3c94ac 100644
+--- a/cbf/Makefile
++++ b/cbf/Makefile
+@@ -362,6 +362,8 @@ HEADERS   =  $(INCLUDE)/cbf.h                  \
+              $(EXAMPLES)/img.h               \
+              $(INCLUDE)/md5.h
+ 
++OBJ = $(subst .c,.o,$(SOURCE))
++
+ #
+ # Compile the library and examples
+ #
+@@ -379,11 +381,14 @@ $(INSTALLDIR):
+ $(LIB):
+ 	mkdir $(LIB)
+ 
++
++.c.o: $(SOURCE) $(HEADERS)
++	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $<
++
+ #
+ # CBF library
+ #
+-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP)
+-	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
++$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP)
+ 	$(AR) cr $@ *.o
+ 	rm *.o
+ 	if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi
diff --git a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
index f97143e7fce1..647fdc9a986c 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild,v 1.10 2011/07/19 19:45:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild,v 1.11 2012/04/28 07:58:26 jlec Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
 
 LICENSE="ccp4"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-chemistry/mosflm/mosflm-7.0.7-r1.ebuild b/sci-chemistry/mosflm/mosflm-7.0.7-r1.ebuild
new file mode 100644
index 000000000000..bb6f9f3b70dc
--- /dev/null
+++ b/sci-chemistry/mosflm/mosflm-7.0.7-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.7-r1.ebuild,v 1.1 2012/04/28 07:58:26 jlec Exp $
+
+EAPI=4
+
+inherit eutils fortran-2 toolchain-funcs versionator
+
+MY_PV="$(delete_all_version_separators)"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="A program for integrating single crystal diffraction data from area detectors"
+HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/"
+SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	virtual/fortran
+	app-shells/tcsh
+	virtual/jpeg
+	sci-libs/cbflib
+	sci-libs/ccp4-libs
+	sys-libs/ncurses
+	x11-libs/libxdl_view"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed \
+		-e "s:../cbf/lib/libcbf.a:-lcbf -limg:g" \
+		-e "s:../jpg/libjpeg.a:-ljpeg:g" \
+		-i ${PN}/Makefile || die
+
+	sed \
+		-e '/jinclude.h/d' \
+		-i mosflm/mosflm_jpeg.c || die
+
+	epatch \
+		"${FILESDIR}"/${PV}-parallel.patch \
+		"${FILESDIR}"/7.0.6-impl-dec.patch
+
+	rm -rf test.f {cbf,jpg}/*.{h,c} || die
+}
+
+src_compile() {
+	emake \
+		MOSHOME="${S}" \
+		DPS="${S}" \
+		FC=$(tc-getFC) \
+		FLINK=$(tc-getFC) \
+		CC=$(tc-getCC) \
+		AR_FLAGS=vru \
+		MOSLIBS='-lccp4f -lccp4c -lxdl_view -lcurses -lXt -lmmdb -lccif -lstdc++' \
+		MCFLAGS="-O0 -fno-second-underscore" \
+		MOSFLAGS="${FFLAGS} -fno-second-underscore" \
+		FFLAGS="${FFLAGS:- -O2} -fno-second-underscore" \
+		CFLAGS="${CFLAGS}" \
+		MOSCFLAGS="${CFLAGS}" \
+		LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/libexec/ccp4/bin/
+	doexe bin/ipmosflm
+	dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN}
+}