Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

4 files changed, 142 insertions, 2 deletions

diff --git a/sci-chemistry/imosflm/ChangeLog b/sci-chemistry/imosflm/ChangeLog
index 7c577eaa0..50695bd2a 100644
--- a/sci-chemistry/imosflm/ChangeLog
+++ b/sci-chemistry/imosflm/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-chemistry/imosflm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*imosflm-1.0.4 (30 Jan 2010)
+
+  30 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/1.0.4-tk.patch, +imosflm-1.0.4.ebuild:
+  Version Bump
+
 *imosflm-1.0.3-r1 (15 Aug 2009)
 
   15 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/imosflm/Manifest b/sci-chemistry/imosflm/Manifest
index 3cfd8cb21..dd563a568 100644
--- a/sci-chemistry/imosflm/Manifest
+++ b/sci-chemistry/imosflm/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.3-tk.patch 1797 RMD160 232a7191c914754a4f863af90f5d557f305245b8 SHA1 e6765b7366d88e1eab03514355ec83aff5e35e1c SHA256 01127c8dcfcb52561afa3160a4a4deca26bd8ccd0c88fd706722947cfdb6ec58
+AUX 1.0.4-tk.patch 1797 RMD160 232a7191c914754a4f863af90f5d557f305245b8 SHA1 e6765b7366d88e1eab03514355ec83aff5e35e1c SHA256 01127c8dcfcb52561afa3160a4a4deca26bd8ccd0c88fd706722947cfdb6ec58
 DIST imosflm-1.0.0.tar.gz 1061762 RMD160 5e943c1f9dc48aad55eb6f7bb7f6dd7b09088509 SHA1 6ed3c6d7f05fcfcc0e254ced66133fc19b34394e SHA256 142eeb1771c477fb5ec121edd36f6acc95791fcb402d5233c315b1bf141a4dd4
 DIST imosflm-1.0.3.zip 977024 RMD160 6ea9d2c38c778b8ef4cc939a2eedce553c0471d5 SHA1 9b9d19a171d26680d116729a5f2b0b5644848b21 SHA256 a1e8fa4f7c5b199a0c72d3431f71cc4f54dc26bb775ae7b7c9199e82df422c12
+DIST imosflm-1.0.4.zip 961175 RMD160 6aaca4e52bd28fe54a7ed62536fde94040c540be SHA1 0b09e7fc33ee153633919ff994dae5994a6931f9 SHA256 02ac07dbb8f571cda3b068ac2c7a391be692c76ff0c6212879aecc822f597c3c
 EBUILD imosflm-1.0.0.ebuild 995 RMD160 e895028c1bfc9c1e62b1e9e1fb23e2d474406720 SHA1 74dbe516a17667285365b579115f0ad362744e86 SHA256 5320759b2cb3b273ce2b3105476e8f97ea4cdf432e41ff4ea734770d834ce4f1
 EBUILD imosflm-1.0.3-r1.ebuild 1606 RMD160 a8279ce191a1ed24e28ca92fc82827e0b99a5d92 SHA1 a361ee38d62a486744a974854410531fef2e9abe SHA256 a89d6ee2bb57f3aa854f9f99b290eb5ab968b83ffc6c2729d0538d03198dcf44
-MISC ChangeLog 817 RMD160 cfa89dcc1d5e4baa417d83efaee6fcb53a30054d SHA1 a0feb47e2f6f19ae9567f5e453fac75df570e1e0 SHA256 9ee99e03b26aa3651784df102c5002c18d488b80d77a11aa8ca64d9ea16d2f06
+EBUILD imosflm-1.0.4.ebuild 1676 RMD160 4a8d147cde35327b4d9e618f0a3da8d84f47159f SHA1 178dca08a6eef5f265cb6e5e99fd6aecd6bc6426 SHA256 278e761ff280d3e1bd0eec2a32b8e766aecc44bd2fc54f9e317a0afcab053e38
+MISC ChangeLog 968 RMD160 aa62cb7f41c9afa77528526e3270e33d489c2799 SHA1 4dab32bc1550c88d75f8818c24e492480f65d4ed SHA256 4d05f4b3430c7b6b83c0a96c9ebe0ee7505f4ad8632ff7279279c34b78f3fa63
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktkP18ACgkQgAnW8HDreRYwBwCfeROpHq1f9HC8DGC+8rmLLqpa
+xNgAn3t5/Rl19KTEpyo/ldW2kUA/Sh7z
+=3I6M
+-----END PGP SIGNATURE-----
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 000000000..a90175194
--- /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.4.ebuild b/sci-chemistry/imosflm/imosflm-1.0.4.ebuild
new file mode 100644
index 000000000..51b869b0e
--- /dev/null
+++ b/sci-chemistry/imosflm/imosflm-1.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit base 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"
+SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${P}.zip"
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND=">=dev-tcltk/itcl-3.3
+	>=dev-tcltk/itk-3.3
+	>=dev-tcltk/iwidgets-4
+	>=dev-tcltk/tkimg-1.3
+	>=dev-tcltk/tdom-0.8
+	dev-tcltk/tablelist
+	dev-tcltk/anigif
+	dev-tcltk/combobox
+	>=dev-tcltk/tktreectrl-2.1
+	>=sci-chemistry/mosflm-7.0.4
+	dev-lang/tcl"
+DEPEND=""
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-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
+}