xia bump for ccp4-6.1.2

3 files changed, 83 insertions, 1 deletions

diff --git a/sci-chemistry/xia2/ChangeLog b/sci-chemistry/xia2/ChangeLog
index 0325762db..acca53a58 100644
--- a/sci-chemistry/xia2/ChangeLog
+++ b/sci-chemistry/xia2/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +xia2-0.3.0.0-r2.ebuild:
+  bump for ccp4-6.1.2
+
+*xia2-0.3.0.0-r2 (01 Aug 2009)
+
+  01 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +xia2-0.3.0.0-r2.ebuild:
+  change dep for ccp4-> ccp4-apps move
+
 *xia2-0.3.0.0-r1 (06 Jul 2009)
 
   06 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/xia2/Manifest b/sci-chemistry/xia2/Manifest
index 2d9dfe5fa..4920e49f2 100644
--- a/sci-chemistry/xia2/Manifest
+++ b/sci-chemistry/xia2/Manifest
@@ -3,6 +3,7 @@ AUX 0.3.0.0-pointless.patch 629 RMD160 a9822d57c51e687031c1a64c5a9c03a75ba1a04c
 AUX Makefile.chef 760 RMD160 541652e0fa0ded7ec2ab086794b299999dc07dc8 SHA1 115c9fd871dafd1e6eee344e4838e0dd071503d3 SHA256 1f8e61dfab1e96d005bf11b1c6f4b6243727b8e123b15b4acd5fd1a56d3a6231
 DIST xia2-0.3.0.0.tar.bz2 39051902 RMD160 3fbea20bcf0b383b904cad269c80a5a17ff0f3ad SHA1 18b7bb01e1097be0f2e5ef72ac304f1343665c26 SHA256 37520b16c17122f3432a998a3ba938c76d1b4edabd27b278af5d0207b064639d
 EBUILD xia2-0.3.0.0-r1.ebuild 1578 RMD160 bf4a2708abd98cb4e776aade8e1c4f5b812ca788 SHA1 dac73f4251431bac6a0b39664302b66e1880bdea SHA256 9859c87b8cd510e740febbaf1b7d996108730971cb3a8706e8cca350bb20ac6f
+EBUILD xia2-0.3.0.0-r2.ebuild 1580 RMD160 4d8791039770d553867ac3857f6713e671a12406 SHA1 eb8150f4f880c6950418fdfc37ee1737dcb6716b SHA256 39c7713a1956a6648672f0394fcf8824c29d7b72a3cf2d497eed70236dcdc274
 EBUILD xia2-0.3.0.0.ebuild 1534 RMD160 357a0bef74f078631b055b5cf783d658a240d39c SHA1 66b8a7e09142ae1ac48edebcf3d88d5b7782fdcc SHA256 9baa13303644f5011fa4b77f5bee66d4b8c98d0d412030293a2d475d2c0a00fb
-MISC ChangeLog 1006 RMD160 f469d4b912f63344af7f33e2c987ebdf235c8939 SHA1 11e91258a3b233241843c9aa3b7c93d780b68c05 SHA256 f932b36ccebf3d6a7a0eee0c19da401d213a0fb38a532edb5186159e49e31dc1
+MISC ChangeLog 1269 RMD160 80c046074cb435bff68e364b5c9380c0f4d4d226 SHA1 a3eba9fb32de9ab6e7148be61a355a015918d1cb SHA256 926c7c4b85a58881fbebeee917db4f9b16bfa682b802a33598bc706b1f3ceba3
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-chemistry/xia2/xia2-0.3.0.0-r2.ebuild b/sci-chemistry/xia2/xia2-0.3.0.0-r2.ebuild
new file mode 100644
index 000000000..963c917e2
--- /dev/null
+++ b/sci-chemistry/xia2/xia2-0.3.0.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+FORTRANC="g77 gfortran ifc"
+
+inherit eutils python fortran
+
+DESCRIPTION="An automated data reduction system for crystallography"
+HOMEPAGE="http://www.ccp4.ac.uk/xia/"
+SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sci-chemistry/ccp4-apps-6.1.2
+	sci-chemistry/pointless
+	sci-chemistry/mosflm
+	>=sci-libs/ccp4-libs-6.1.1-r7"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	find . -name '*.bat' | xargs rm || die
+
+	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
+	epatch "${FILESDIR}"/${PV}-pointless.patch
+}
+
+src_compile() {
+	cd "${S}"/${P}/binaries/src
+	cp "${FILESDIR}"/Makefile.chef Makefile
+	emake  \
+		FC="${FORTRANC}" || die
+}
+
+src_install() {
+	dobin ${P}/binaries/src/{doser,chef,mat2symop,symop2mat} || die
+
+	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 "${D}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
+	chmod 644 "${D}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
+
+	cat >> "${T}"/23XIA <<- EOF
+	XIA2_HOME=/usr/share/ccp4/XIAROOT
+
+	XIA2CORE_ROOT=/usr/share/ccp4/XIAROOT/xia2core-${PV}
+	XIA2_ROOT=/usr/share/ccp4/XIAROOT/xia2-${PV}
+
+	PATH=/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications
+	EOF
+
+	doenvd "${T}"/23XIA
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/ccp4/XIAROOT
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/ccp4/XIAROOT
+}