Version Bump, #349409; keyworded *-linux

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

5 files changed, 97 insertions, 24 deletions

diff --git a/sci-chemistry/imosflm/ChangeLog b/sci-chemistry/imosflm/ChangeLog
index 5d87d1d6d93c..c9334237a74f 100644
--- a/sci-chemistry/imosflm/ChangeLog
+++ b/sci-chemistry/imosflm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/imosflm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.4 2011/01/27 10:53:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.5 2011/09/07 15:27:34 jlec Exp $
+
+*imosflm-1.0.5 (07 Sep 2011)
+
+  07 Sep 2011; Justin Lecher <jlec@gentoo.org> imosflm-1.0.4.ebuild,
+  +imosflm-1.0.5.ebuild, metadata.xml:
+  Version Bump, #349409; keyworded *-linux
 
   27 Jan 2011; Markos Chandras <hwoarang@gentoo.org> imosflm-1.0.4.ebuild:
   Stable on amd64 wrt bug #352051
diff --git a/sci-chemistry/imosflm/Manifest b/sci-chemistry/imosflm/Manifest
index e300e793121e..222949cca852 100644
--- a/sci-chemistry/imosflm/Manifest
+++ b/sci-chemistry/imosflm/Manifest
@@ -4,23 +4,15 @@ Hash: SHA512
 AUX 1.0.4-impl-dec.patch 277 RMD160 15baf3f3e40bde337dcc664cd1b4d9c148fe0e0f SHA1 05d32b5e9d783e500278417fe23900f8cdca2cb7 SHA256 061dd0d4faa772916ba4cd966da1ef49bc240c5254c9180237efac711d23108b
 AUX 1.0.4-tk.patch 1797 RMD160 232a7191c914754a4f863af90f5d557f305245b8 SHA1 e6765b7366d88e1eab03514355ec83aff5e35e1c SHA256 01127c8dcfcb52561afa3160a4a4deca26bd8ccd0c88fd706722947cfdb6ec58
 DIST imosflm-1.0.4.zip 985118 RMD160 5b3c791c9cf39e56380c50d1f546920da6061089 SHA1 4294b4572455b685a79ffa73d982c6879b27a7f9 SHA256 93d99229158615ddb2c97b59bb3514d6ffe13dd8327cc412cd65139bda687517
-EBUILD imosflm-1.0.4.ebuild 1792 RMD160 0247c043973840364e1b768969180759dcb09705 SHA1 7f03f3367cb87a62191a06843616a6310ea68dab SHA256 793bdbdf3032c4f6b797413cdf69dd996c48edfec55b74891fec2e9c7944a35e
-MISC ChangeLog 738 RMD160 b627fa320674e45535ca7f743f433471f30bedcf SHA1 66588be41412126b65b5bb8eba86853f07d6c291 SHA256 fa7f6756bfb1776e3ef6a7d40f59578029f69503a4cfddd7a33f4b5de210486f
-MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+DIST imosflm-1.0.5.zip 1003847 RMD160 a65fae3e2a3bb7f91b8ae22bbe5ccd9829ffd974 SHA1 cf1e149f219dbe59f3873920157787f1c40c23d1 SHA256 cda472f1be4b2e900552644d77705c33356f90c3f3d5763b2b527ccc471c0d5f
+EBUILD imosflm-1.0.4.ebuild 1812 RMD160 e1200445359b44fe44551fe042434d93a757fe77 SHA1 2171b57d2ab6a0ecb93b32fbc8e586da2ed822d9 SHA256 12c72ae484c542eddd33ec981d817ed768b1c185a8669164499e91bc8a9a6c95
+EBUILD imosflm-1.0.5.ebuild 1811 RMD160 f1ea931459b8c1dc02d801d5490659959978f73c SHA1 9684815a22ddc5cbb773d65f71209f3244620605 SHA256 140f300ebcad5707a1183e84c88164691f7a751ff6fa427553c5c3644c8b0fae
+MISC ChangeLog 916 RMD160 c297a6b05a449c876e49efcc456f060842d6d75e SHA1 75fa4a4d64564c943b76232d0335f8ec87e36c0b SHA256 5ef9ef2a4e18061364bd0867ce807c84db89a4404db00c6a0095cec5b92a11d9
+MISC metadata.xml 218 RMD160 5dcdfc9ffbff78c3625f6ee6cd8242c0130bba48 SHA1 e7d6721263f31430e0dd04b17f16c27ebac78a89 SHA256 45420c665fb7a061ce85d5300ea7ed5a034a812dc286e2c87540b90d1388d79d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNQU5XAAoJEPqDWhW0r/LCoWwP/3FwjeB3kqyw0fpOwwilic/O
-KURyuwCOXw/jMF+5WfvylPkbotFQeb96Sp4rfc9w7elDhAEw3mIC8OhC4a8R80uE
-scUEEf18opF30U5phptPpOVPjUoSsqlWpqM7ZLltDR+td9g5w01KrBHmHI7buSRs
-KUDYjsTVKFhmBLPps0NSEIit+3JJlbgtg3l70f/UkRpMZEHPsZxcO25lg2MxQUSQ
-cxzdwf0s+XmbF+Bizpf1rnW+t8F99iME9TdpYqRX4k081II9vHkLuE6I6FtrjXoL
-cL+asBCQw85MP/McI9nJBba7gWnJ7H4q0saSS4f0aK1W2RRJKxckThXcwMzoSUdk
-nh2rKaItaw0tRD6cmcgM1qap4hnSfDV7tV5UTBzdnIAlJhG/NTkJqEl20baYWfQw
-8YQK0pei4jUL718W2VzH/83FEj+WhnEcKred0cMxAQGFk/J5p+Wy9F8KYFT3jG3O
-ezlfC0xJM+GKvBrv6WBr6ywYT+ZaLan1hh/9bCaI33x68rHZgSsnjoHYKqvmwzj4
-xTpBl7Si1SKJDzTILeUOpPLYWE61lzGjo3t/qorKEUCiQnDJLJQRyBWzcQzaLYh0
-BAnHfcMxw6rQsRORRW9n52rc/Eo7tI3u/8cBUFt/IqIJCL8yIbRBtAZgulThqMhr
-x/67dXt2n1xEO93ubw5y
-=MqPA
+iEYEAREKAAYFAk5njWcACgkQgAnW8HDreRaprACfdOUJDyxsj9yEGN0PT2DyrWnm
+vMIAmwctcbpFWNCBHCFaRMy1pztBMh6Y
+=KYVC
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/imosflm/imosflm-1.0.4.ebuild b/sci-chemistry/imosflm/imosflm-1.0.4.ebuild
index f1a153a52fae..334a01bd855d 100644
--- a/sci-chemistry/imosflm/imosflm-1.0.4.ebuild
+++ b/sci-chemistry/imosflm/imosflm-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.4 2011/01/27 10:53:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild,v 1.5 2011/09/07 15:27:34 jlec Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
 
 LICENSE="ccp4"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
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 000000000000..b97f81638900
--- /dev/null
+++ b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild,v 1.1 2011/09/07 15:27:34 jlec Exp $
+
+EAPI=4
+
+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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+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.4"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/1.0.4-tk.patch \
+		"${FILESDIR}"/1.0.4-impl-dec.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
index efb490d78817..d747d72a25b4 100644
--- a/sci-chemistry/imosflm/metadata.xml
+++ b/sci-chemistry/imosflm/metadata.xml
@@ -1,8 +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>
+	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>