Version Bump

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

4 files changed, 113 insertions, 6 deletions

diff --git a/sci-chemistry/xia2/ChangeLog b/sci-chemistry/xia2/ChangeLog
index 1562455c6438..7216bb878cda 100644
--- a/sci-chemistry/xia2/ChangeLog
+++ b/sci-chemistry/xia2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/xia2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xia2/ChangeLog,v 1.7 2011/07/23 13:17:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xia2/ChangeLog,v 1.8 2011/10/04 15:09:07 jlec Exp $
+
+*xia2-0.3.3.3 (04 Oct 2011)
+
+  04 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/0.3.3.3-fix-syntax.patch,
+  +xia2-0.3.3.3.ebuild:
+  Version Bump
 
   23 Jul 2011; Justin Lecher <jlec@gentoo.org> xia2-0.3.3.1.ebuild:
   Added pstins msg
diff --git a/sci-chemistry/xia2/Manifest b/sci-chemistry/xia2/Manifest
index f9c481039ba9..78ff3a35c660 100644
--- a/sci-chemistry/xia2/Manifest
+++ b/sci-chemistry/xia2/Manifest
@@ -5,20 +5,23 @@ AUX 0.3.1.0-fix-syntax.patch 2586 RMD160 23e70c32e9052ff3a12740b71a02a66a5053b8d
 AUX 0.3.1.6-fix-syntax.patch 2586 RMD160 184341967258e0734a5614830bfbc97f9381c05e SHA1 5247bb4af94c89c2e3023764a8e5470605964135 SHA256 035cb4b757c1769b277fad57515b47473b425f24c5b07e41973f44b83586ab2a
 AUX 0.3.1.7-fix-syntax.patch 2586 RMD160 2a4e777b3f2329cb7cf00f30cea7e48187b37efb SHA1 29d6306e958f94c85859e560ac2d74b891043d6b SHA256 e6205f5b4576fd15129081e9730d35d1cb8e88a27c57df18d2ef93b37c43550c
 AUX 0.3.3.1-fix-syntax.patch 2586 RMD160 84e78d31b120c8d046229547207931af6f23a9cb SHA1 185b3a14a6d83f7a5838a8798f4d0b1b930b8076 SHA256 9d86fa8c210180d857b5cbf56226f1260ab8071e6ea9b69850da0e4357b7a7c1
+AUX 0.3.3.3-fix-syntax.patch 1210 RMD160 6cf2fd9231af3fe8b2466a387b17c12daeda7c50 SHA1 f5f528c72e8e7675cdd76025bb565ce5f850cf8f SHA256 dbfdf5eec43a00134fe5d66de92deb5add6194a4287aca4cb75aa33b26d8db6b
 DIST xia2-0.3.1.0.tar.bz2 3389906 RMD160 da2b84535e418c266c316a6fce40dd57b1fb6adc SHA1 ded8f83026af9d44053cb17c91fc6130d63d6777 SHA256 32f1866bc17b093cbf157ec7bc217e47d059957104b20c88ed1b5c3706fc7e28
 DIST xia2-0.3.1.6.tar.bz2 3464982 RMD160 960e61db2d832e9fa930ec975b7a642674b8b5a3 SHA1 878854f593671468f67e96b97438bbe701683505 SHA256 fde814a763e6666a1618d01569c19d574f1bf71d754dc3960beeb13c35dd201f
 DIST xia2-0.3.1.7.tar.bz2 3650285 RMD160 1cf5c3bb0fa452092b2244885a3822dabe7caf08 SHA1 0934def0fad457e6b7e91fe7cef0eb7bdf80bee7 SHA256 54beb26396c4b6ecb343544c777c2505238385f2127482d035d2c47b24a7fcf1
 DIST xia2-0.3.3.1.tar.bz2 3074989 RMD160 3254833b3c74d223bd28d609daef048d842f1631 SHA1 6351dfd20756986e91aa4503733f990094859495 SHA256 f1bf94cd9305f768fea1b541ac53d66917126e92620263a96f9c23923ec829c4
+DIST xia2-0.3.3.3.tar.bz2 2919316 RMD160 d598b18137bfcfd626d0525ba8f49b0d452ebb5f SHA1 aba16bf870206d121b0ca0e20a380bcb58fdba1b SHA256 3cf09fcf9d2c0ea6d6cb8cf66a3c5af752b4345af6a882e2d398424cf3b4b0d3
 EBUILD xia2-0.3.1.0.ebuild 1472 RMD160 8d067c6e63f57450c915cbfebb06cb0a760535cb SHA1 a4d46b065857aacdf31bbe31cbc1a7424a15407e SHA256 4ee091c07ff6581d10c7616d6c2bfc192f3d1a11e4427da22b306e582ea5df15
 EBUILD xia2-0.3.1.6.ebuild 1610 RMD160 8efc646fab2d780edf7f5a27a47a80c6276874c7 SHA1 acd7737087e69aea0a214bcfc7e195c851e107eb SHA256 4e5419fbe010169049c95809907a11ce55eb080aae73dafe093274f005b63f14
 EBUILD xia2-0.3.1.7.ebuild 1615 RMD160 3acf9c7d16a3f8afbab1a3a18d3201ae8231edd6 SHA1 dd6cdae475851a7e9364d1d9ecbcebc080bdab19 SHA256 5047947052acf654637ebe1d2a1e0ce32f1df329381e2cc9d21e840a82fe35bb
 EBUILD xia2-0.3.3.1.ebuild 1721 RMD160 43969a2e3ad19b001b3cadeb021cbfc7c3277869 SHA1 4f781d7ef6f415d03f87694b7605ae46fd6c8353 SHA256 f56cba2aef0a9f2a15ac57920b47c1c7f34c52785cd4bedca86907d0b059171a
-MISC ChangeLog 1237 RMD160 d3f907621e10c237e1aeaaeb1efb069ffed12517 SHA1 f5311e5c3d65f4016d5e8848a8364a8361d32c4e SHA256 be755b6fdf44a9c49dab1505ace0f9ed1b03792e984d47e9799e2a6379c74cf6
+EBUILD xia2-0.3.3.3.ebuild 1721 RMD160 5a6e500cdd918fa7a421c4e3a7cd7dd580b81379 SHA1 1da0bfa1e3fe4b77b5ca2ab51cee59f322b8ef56 SHA256 481606c5c3460396271e3b8b1cf7a0ba7a532911932070625c4b30545fedc674
+MISC ChangeLog 1386 RMD160 3c76ce152f6a6d845932a51389d215c475063bbb SHA1 4e5b016ceeaa29bb0f8f8b1aaf5c838b6bc23bd0 SHA256 b65c6d0dc522d2d0b5edc6f249e71417a426cbd0a54bf45268f45626c4e6e85f
 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)
 
-iEYEAREKAAYFAk4qyf0ACgkQgAnW8HDreRakRACgwef9uET7zYJGoeOp9ZtCl9MG
-S1wAoLENEi8+cPUKidHUF7ctWctUWT+6
-=n/WJ
+iEYEAREKAAYFAk6LIZYACgkQgAnW8HDreRY90ACeKIfKiD3K6RgHkx9vPKQKoo8x
+aWsAnRhF/mow2LrK/z5CaO9hBq7+PQQn
+=AxQ8
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch
new file mode 100644
index 000000000000..53cacbb5c681
--- /dev/null
+++ b/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch
@@ -0,0 +1,28 @@
+diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py
+index 1a3b0e2..e0b8a1e 100755
+--- a/xia2-0.3.3.3/Applications/xia2find.py
++++ b/xia2-0.3.3.3/Applications/xia2find.py
+@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
+ from Experts.FindImages import image2template_directory
+ 
+ known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
+-                          'osc', 'cbf', 'mar2000']]
++                          'osc', 'cbf', 'mar2000']
+ known_sweeps = { }
+ 
+ def is_image_name(file):
+diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py
+index 88f9218..5fb6f2a 100644
+--- a/xia2core-0.3.3.3/Python/Examples/CCP4/Cad.py
++++ b/xia2core-0.3.3.3/Python/Examples/CCP4/Cad.py
+@@ -49,8 +49,8 @@ def Cad(DriverType = None):
+             self.add_command_line(hklin)
+ 
+             self.set_task('Rewriting reflections %s => %s' % 
+-                      `   (os.path.split(hklin)[-1],
+-                       `   os.path.split(self.getHklout())[-1]))
++                         (os.path.split(hklin)[-1],
++                          os.path.split(self.getHklout())[-1]))
+ 
+             self.start()
+ 
diff --git a/sci-chemistry/xia2/xia2-0.3.3.3.ebuild b/sci-chemistry/xia2/xia2-0.3.3.3.ebuild
new file mode 100644
index 000000000000..333d5003aa57
--- /dev/null
+++ b/sci-chemistry/xia2/xia2-0.3.3.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xia2/xia2-0.3.3.3.ebuild,v 1.1 2011/10/04 15:09:07 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="An automated data reduction system for crystallography"
+HOMEPAGE="http://www.ccp4.ac.uk/xia/"
+SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=sci-chemistry/ccp4-apps-6.1.2
+	sci-chemistry/mosflm
+	sci-chemistry/pointless
+	>=sci-libs/ccp4-libs-6.1.2
+	sci-libs/cctbx"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	find . -name '*.bat' -delete || die
+
+	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
+	python_convert_shebangs -r $(python_get_version) .
+}
+
+src_install() {
+	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
+
+	insinto /usr/share/ccp4/XIAROOT/
+	doins -r * || die
+
+	# Set programs executable
+# fperms cannot handle wildcards
+	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
+	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
+
+	cat >> "${T}"/23XIA <<- EOF
+	XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT"
+	XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}"
+	XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}"
+	PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications"
+	EOF
+
+	doenvd "${T}"/23XIA
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/ccp4/XIAROOT
+	echo ""
+	elog "In order to use the package, you need to"
+	elog "\t source ${EPREFIX}/etc/profile"
+	echo ""
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/ccp4/XIAROOT
+}