mosflm/imosflm: bump to latest.

11 files changed, 299 insertions, 0 deletions

diff --git a/sci-chemistry/imosflm/ChangeLog b/sci-chemistry/imosflm/ChangeLog
new file mode 100644
index 0000000..b16e2ba
--- /dev/null
+++ b/sci-chemistry/imosflm/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-chemistry/imosflm
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.1 2010/02/06 23:22:49 jlec Exp $
+
+*imosflm-1.0.4 (06 Feb 2010)
+
+  06 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> +files/1.0.4-tk.patch,
+  +imosflm-1.0.4.ebuild, +metadata.xml:
+  Splitted imosflm from ccp4
+
diff --git a/sci-chemistry/imosflm/Manifest b/sci-chemistry/imosflm/Manifest
new file mode 100644
index 0000000..f81f7fe
--- /dev/null
+++ b/sci-chemistry/imosflm/Manifest
@@ -0,0 +1,5 @@
+AUX 1.0.4-tk.patch 1797 RMD160 232a7191c914754a4f863af90f5d557f305245b8 SHA1 e6765b7366d88e1eab03514355ec83aff5e35e1c SHA256 01127c8dcfcb52561afa3160a4a4deca26bd8ccd0c88fd706722947cfdb6ec58
+DIST imosflm-1.0.5.zip 1003847 RMD160 a65fae3e2a3bb7f91b8ae22bbe5ccd9829ffd974 SHA1 cf1e149f219dbe59f3873920157787f1c40c23d1 SHA256 cda472f1be4b2e900552644d77705c33356f90c3f3d5763b2b527ccc471c0d5f
+EBUILD imosflm-1.0.5.ebuild 1740 RMD160 175790a3620931eb60490c1e645bbc6d50069641 SHA1 8fbdc84d0092b3bc0b0c7a562c68f21c2b4a2ed6 SHA256 ae7aa27a54bd54ebd582b309544b5893bc9153a3562a4ce94ad8daae20bfb52a
+MISC ChangeLog 390 RMD160 8696e3722772c9eda69d5c16508b2d75829fe2b4 SHA1 ff33c2a58e340760c0f05687c42f521360adf69d SHA256 d5a759665fb19cbb44d0f27cc2db15f88d1d25022136001e42498f7b04a3c28d
+MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-chemistry/imosflm/files/1.0.4-tk.patch b/sci-chemistry/imosflm/files/1.0.4-tk.patch
new file mode 100644
index 0000000..a901751
--- /dev/null
+++ b/sci-chemistry/imosflm/files/1.0.4-tk.patch
@@ -0,0 +1,50 @@
+--- c/tkImageLoad.c	2009-08-14 21:10:19.000000000 +0200
++++ c/tkImageLoad.c.new	2009-08-14 21:10:55.000000000 +0200
+@@ -19,6 +19,7 @@
+ //#define BLOCKED 1
+ //#define UNBLOCKED 1
+ #define IN_BLOCK_FLIP 1
++#define USE_COMPOSITELESS_PHOTO_PUT_BLOCK
+ 
+ /* *********************************************************************/
+ 
+--- c/tkImageLoad.c	2009-08-14 21:13:29.000000000 +0200
++++ c/tkImageLoad.c.new	2009-08-14 21:14:59.000000000 +0200
+@@ -272,9 +272,11 @@
+   }
+   /* put the photo block into the image */
+ #ifdef __alpha
+-  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height);
++  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height,
++  TK_PHOTO_COMPOSITE_OVERLAY);
+ #else
+-  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET);
++  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET,
++  TK_PHOTO_COMPOSITE_OVERLAY);
+ #endif
+ 
+   /* Free the photo block's memory now it is finished with */
+@@ -417,9 +419,11 @@
+ 
+   /* put the photo block back into the image */
+ #ifdef __alpha
+- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
++ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,
++ TK_PHOTO_COMPOSITE_OVERLAY);
+ #else
+- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET);
++ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET,
++ TK_PHOTO_COMPOSITE_OVERLAY);
+ #endif
+   /* Free the photo block's memory now it is finished with */
+   if (block.pixelPtr) {
+--- c/tkImageLoad.c	2009-08-14 21:15:06.000000000 +0200
++++ c/tkImageLoad.c.new	2009-08-14 21:16:53.000000000 +0200
+@@ -9,6 +9,7 @@
+ \************************************************************************/
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <tcl.h>
+ #include <tk.h>
+ #include <assert.h>
diff --git a/sci-chemistry/imosflm/imosflm-1.0.5.ebuild b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
new file mode 100644
index 0000000..d44836b
--- /dev/null
+++ b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild,v 1.1 2010/02/06 23:22:49 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV="$(delete_all_version_separators ${PV})"
+
+DESCRIPTION="A new GUI for the Mosflm crystallographic data processing tool"
+HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/imosflm"
+SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/tcl
+	>=dev-tcltk/itcl-3.3
+	>=dev-tcltk/itk-3.3
+	>=dev-tcltk/iwidgets-4
+	>=dev-tcltk/tdom-0.8
+	>=dev-tcltk/tkimg-1.3
+	>=dev-tcltk/tktreectrl-2.1
+	dev-tcltk/anigif
+	dev-tcltk/combobox
+	dev-tcltk/tablelist
+	~sci-chemistry/mosflm-7.0.7"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.0.4-tk.patch
+}
+
+src_compile() {
+	cd c
+
+	objs="tkImageLoadDLL.o tkImageLoad.o"
+	libs="-ltclstub -ltkstub"
+	config="-fPIC -DUSE_TCL_STUBS -DTK_USE_STUBS"
+	ldextra="-shared"
+
+	for file in ${objs}; do
+		einfo "$(tc-getCC) -c ${CFLAGS} ${config} ${file/.o/.c} -o ${file}"
+		$(tc-getCC) -c ${CFLAGS} ${config} ${file/.o/.c} -o ${file}
+	done
+
+	einfo "$(tc-getCC) ${LDFLAGS} ${ldextra} ${objs} -o tkImageLoad.so ${libs}"
+	$(tc-getCC) ${LDFLAGS} ${ldextra} ${objs} -o tkImageLoad.so ${libs}
+}
+
+src_install(){
+	rm -rf lib/{*.so,anigif,combobox}
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r "${S}"/{src,bitmaps,lib}
+	fperms 775 /usr/$(get_libdir)/${PN}/src/imosflm
+
+	dolib.so c/tkImageLoad.so
+
+	cat >> "${T}"/23imosflm <<- EOF
+	IMOSFLM_VERSION="${PV}"
+	EOF
+
+	doenvd "${T}"/23imosflm
+
+	make_wrapper imosflm /usr/$(get_libdir)/${PN}/src/imosflm
+}
diff --git a/sci-chemistry/imosflm/metadata.xml b/sci-chemistry/imosflm/metadata.xml
new file mode 100644
index 0000000..efb490d
--- /dev/null
+++ b/sci-chemistry/imosflm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
new file mode 100644
index 0000000..afd905d
--- /dev/null
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -0,0 +1,30 @@
+# ChangeLog for sci-chemistry/mosflm
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.6 2010/12/16 13:38:18 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> mosflm-7.0.6-r2.ebuild:
+  Removal of fortran.eclass, #348851
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  mosflm-7.0.6-r2.ebuild:
+  media-libs/jpeg -> virtual/jpeg
+
+*mosflm-7.0.6-r2 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> -mosflm-7.0.6-r1.ebuild,
+  +mosflm-7.0.6-r2.ebuild:
+  Necessary bump
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> mosflm-7.0.6-r1.ebuild:
+  keyworded for linux prefix
+
+  13 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> +mosflm-7.0.6.ebuild:
+  fix for test and don't statically link against jpeg
+
+*mosflm-7.0.6 (06 Feb 2010)
+
+  06 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/7.0.6-Makefile.patch, +files/7.0.6-parallel.patch,
+  +mosflm-7.0.6.ebuild, +metadata.xml:
+  Splitted mosflm from ccp4
+
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
new file mode 100644
index 0000000..976b8b1
--- /dev/null
+++ b/sci-chemistry/mosflm/Manifest
@@ -0,0 +1,6 @@
+AUX 7.0.6-Makefile.patch 352 RMD160 69fd182574615b90bbeb1b633885006051e81683 SHA1 f2964f48bb4bf89880fe47f0af1bff090c59092e SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7
+AUX 7.0.6-parallel.patch 654 RMD160 f28cdb670c3ecfcc4ec194dd44136182fbf9cf7f SHA1 bf6742b58d6e9ce67e76f38e81aeb64f88fae729 SHA256 c821e031a039502364c4ae151fd64886a6a33153e5c746d55838a99050d18c60
+DIST mosflm707.tgz 3401235 RMD160 0301c22df9f0229f8ee5ac5b87c1353a5608fa94 SHA1 6ac29381bbea57ea370d72b31f36660332316d07 SHA256 fb14a02834929423569a23a04800de62ed1da2a02966958b79c157a71b9b6118
+EBUILD mosflm-7.0.7.ebuild 1746 RMD160 e3d45ca92ae3ca0610c35cbe53a174299982a089 SHA1 7fb69f2d02aa01381adac85783afb2de7b4c598e SHA256 473467631f35bfa7f854a7934f7c7d830bbbc49426ba97d3708f94abeb86f7c5
+MISC ChangeLog 1027 RMD160 3428a8684fa2018a7c0eb7f96ae163e910f62620 SHA1 a77e625fbc6e0b124a52ead9273b2a25763d794d SHA256 115a73fd8cb8c486b2bcda980389b37f482fc0e65c7e41d5a8b51749c9e2996b
+MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
diff --git a/sci-chemistry/mosflm/files/7.0.6-Makefile.patch b/sci-chemistry/mosflm/files/7.0.6-Makefile.patch
new file mode 100644
index 0000000..a35232f
--- /dev/null
+++ b/sci-chemistry/mosflm/files/7.0.6-Makefile.patch
@@ -0,0 +1,13 @@
+--- Makefile	2008-10-17 16:15:30.000000000 +0200
++++ Makefile.new	2009-02-20 21:52:34.000000000 +0100
+@@ -22,7 +22,7 @@
+ CBFLIBS = cbf/lib/libcbf.a
+ JPGLIBS = jpg/libjpeg.a
+ 
+-all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
+-	cd mosflm ; make
++all:	dpslibs cbflibs
++	+make -C mosflm
+ 
+ ##########################################################################
+
diff --git a/sci-chemistry/mosflm/files/7.0.6-parallel.patch b/sci-chemistry/mosflm/files/7.0.6-parallel.patch
new file mode 100644
index 0000000..f735c7c
--- /dev/null
+++ b/sci-chemistry/mosflm/files/7.0.6-parallel.patch
@@ -0,0 +1,28 @@
+--- cbf/Makefile	2009-08-31 09:35:06.000000000 +0200
++++ cbf/Makefile.new	2009-08-31 10:44:46.000000000 +0200
+@@ -362,6 +362,8 @@
+              $(EXAMPLES)/img.h               \
+              $(INCLUDE)/md5.h
+ 
++OBJ = $(subst .c,.o,$(SOURCE))
++
+ #
+ # Compile the library and examples
+ #
+@@ -379,11 +381,14 @@
+ $(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/metadata.xml b/sci-chemistry/mosflm/metadata.xml
new file mode 100644
index 0000000..c6856dc
--- /dev/null
+++ b/sci-chemistry/mosflm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>jlec@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/mosflm/mosflm-7.0.7.ebuild b/sci-chemistry/mosflm/mosflm-7.0.7.ebuild
new file mode 100644
index 0000000..f3cc566
--- /dev/null
+++ b/sci-chemistry/mosflm/mosflm-7.0.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 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.3 2010/12/16 13:38:18 jlec Exp $
+
+EAPI="3"
+
+inherit eutils 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	app-shells/tcsh
+	virtual/jpeg
+	sci-libs/ccp4-libs
+	sys-libs/ncurses
+	x11-libs/libxdl_view"
+DEPEND="${RDEPEND}"
+# Needs older version as current, perhaps we can fix that next release
+#	sci-libs/cbflib
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm src/dps/peak_search/dps_peaksearch
+# See DEPEND
+#	sed -e "s:../cbf/lib/libcbf.a:${EPREFIX}/usr/$(get_libdir)/libcbf.a:g" \
+	sed -e "s:../jpg/libjpeg.a:-ljpeg:g" \
+		-i ${PN}/Makefile || die
+
+	epatch \
+		"${FILESDIR}"/7.0.6-Makefile.patch \
+		"${FILESDIR}"/7.0.6-parallel.patch
+	rm test.f || 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}" \
+		CFLAGS="${CFLAGS}" \
+		MOSCFLAGS="${CFLAGS}" \
+		LFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/ccp4/bin/
+	doexe bin/ipmosflm || die
+	dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN}
+}