Version bump, fixing bug 247788

Adding new Viewer as RDEPEND
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 76 insertions, 66 deletions

diff --git a/sci-chemistry/xds-bin/ChangeLog b/sci-chemistry/xds-bin/ChangeLog
index 2f5efbb1ccb8..0e1814b02330 100644
--- a/sci-chemistry/xds-bin/ChangeLog
+++ b/sci-chemistry/xds-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/xds-bin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/ChangeLog,v 1.2 2008/10/17 18:54:41 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/ChangeLog,v 1.3 2010/01/31 23:13:28 jlec Exp $
+
+*xds-bin-20091228 (31 Jan 2010)
+
+  31 Jan 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  -xds-bin-20080602.ebuild, +xds-bin-20091228.ebuild:
+  Version bump, fixing bug 247788
+  Adding new Viewer as RDEPEND
 
   17 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
   smp USE-flag is global now
diff --git a/sci-chemistry/xds-bin/Manifest b/sci-chemistry/xds-bin/Manifest
index b403f64498e5..2c0c12089648 100644
--- a/sci-chemistry/xds-bin/Manifest
+++ b/sci-chemistry/xds-bin/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST XDS-linux_ifc_Intel+AMD-20080602.tar.gz 7098248 RMD160 cec4cc5c9c2f590851465639c3a64ed963fd0e1e SHA1 c364a6fc487bcfdc5f2e6c7b94a52f33c415939d SHA256 eb8141118a599d3a2fd91e5263d7c97754c38dfa0b374b3fdbf6830ac379095c
-DIST XDS_html_doc-20080602.tar.gz 91958 RMD160 ddb5244edaa3629dcf96f8482a9371e9e1d8bfde SHA1 a3e5413f38eeadff94607318953ff538156027f6 SHA256 3ab3a3807c43d4428c2f66709343a9ffed300c99eba2fe04abeb77626b953050
-EBUILD xds-bin-20080602.ebuild 1459 RMD160 a276649caf457da84ced9cbaecd2c2a8bfc33344 SHA1 203dbc94c44cd6d175ee9dbda2494d4cf9877b73 SHA256 8df6bab538f46094f5a1af8948ce08e260ca5f6d9d30cfd11f6ff8e38bcfdb42
-MISC ChangeLog 552 RMD160 1c54131e327a257924ca1e5c9e51fc8fbb28cae2 SHA1 6c53acb7c6e9452d83a1d59d76568c78c63eec05 SHA256 834ce9c4aa1dd1bc03f678d6e0fe2902cbcf656bbcccac0032f265f44d8b8094
+DIST XDS-IA32_Linux_x86-20091228.tar.gz 6022074 RMD160 2be5d7ebb26610f619f7c3cdd2b67229cd831f70 SHA1 0c7b56ad8976d152e19fefee879278f57c7ca3f7 SHA256 cae55323b04d770e5fdfccf332e4c6606e80db3d908d2a1f12a888e63e3c18f8
+DIST XDS-INTEL64_Linux_x86_64-20091228.tar.gz 7496869 RMD160 ce8d10bd94aad238241943fa60d24eda3de50c21 SHA1 1964bdb5f92b70b702503c50acaa6e4b8e3fff19 SHA256 95e0e32d37c599fcf4a85999d36691a625a99945a7451020d0a5a1c9a5771647
+DIST XDS_html_doc-20091228.tar.gz 88362 RMD160 63fbfb96d43db12015d68e3d4334aba9c7a26027 SHA1 a96e34302c4ff121367d36797b5fd44944946393 SHA256 e11b1bec6571209841095ee703c00a6f33d7be2cfd12ba7d5a118c1ac2b22eaf
+EBUILD xds-bin-20091228.ebuild 1688 RMD160 93835545ab2daf00d3625084a8b7dc57615fd08b SHA1 2d3b4fda0158aec15a3c1c3d87849e2277c79ba2 SHA256 b37065b2b01b3fee0d25386eaf90973638c1a7fd92b6158ccb17170c98510904
+MISC ChangeLog 757 RMD160 b27b4e614f4c868afc705bf1b4e694374ad28af6 SHA1 964f292735dfd37c241d7c78a2d2b6750cfc47c3 SHA256 0fc33539fb63a2b3eff369330cf8e4f93ac7b1333558f32d6b680b9c43499275
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkj438oACgkQkKaRLQcq0GL17ACgnOY/DfPac6yUkS/T5XCpEPE0
-nqAAn1nh8Vh0C7u3TNFsXNzF4RQn606s
-=2WzF
+iEYEARECAAYFAktmDp0ACgkQgAnW8HDreRaHQgCfTO8IwJC3HHBSSxeaIiZziIHw
+3xoAn365RrAf+XXy0RlDDD89CB8bv/ks
+=Kbsy
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/xds-bin/xds-bin-20080602.ebuild b/sci-chemistry/xds-bin/xds-bin-20080602.ebuild
deleted file mode 100644
index 148a009974e5..000000000000
--- a/sci-chemistry/xds-bin/xds-bin-20080602.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/xds-bin-20080602.ebuild,v 1.1 2008/08/03 22:29:53 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="X-ray Detector Software for processing single-crystal monochromatic diffraction data."
-SRC_URI="XDS-linux_ifc_Intel+AMD-${PV}.tar.gz
-		 XDS_html_doc-${PV}.tar.gz"
-HOMEPAGE="http://www.mpimf-heidelberg.mpg.de/~kabsch/xds/"
-RESTRICT="fetch"
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="smp X"
-RDEPEND="X? (
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libX11
-	)"
-DEPEND=""
-
-pkg_nofetch(){
-	ewarn "Fetch XDS-linux_ifc_Intel+AMD.tar.gz and XDS_html_doc.tar.gz"
-	ewarn "from ${HOMEPAGE}html_doc/downloading.html"
-	ewarn "rename it to $A and"
-	ewarn "place it in $DISTDIR"
-}
-
-src_install() {
-	exeinto /opt/${PN}
-	doexe XDS-linux_ifc_Intel+AMD/*
-	if use smp; then
-		rm "${D}"/opt/${PN}/{xds,mintegrate,mcolspot,xscale}
-		dosym xds_par /opt/${PN}/xds
-		dosym xscale_par /opt/${PN}/xscale
-		dosym mintegrate_par /opt/${PN}/mintegrate
-		dosym mcolspot_par /opt/${PN}/mcolspot
-	else
-		rm "${D}"/opt/${PN}/*par
-	fi
-	if ! use X; then
-		rm "${D}"/opt/${PN}/VIEW
-	fi
-	dohtml -r XDS_html_doc/*
-	dodoc XDS_html_doc/html_doc/INPUT_templates/*
-
-	cat >> "${T}"/20xds <<- EOF
-	PATH="/opt/${PN}/"
-	EOF
-	doenvd "${T}"/20xds
-}
-
-pkg_postinst(){
-	elog "This package will expire on December 31, 2008"
-}
diff --git a/sci-chemistry/xds-bin/xds-bin-20091228.ebuild b/sci-chemistry/xds-bin/xds-bin-20091228.ebuild
new file mode 100644
index 000000000000..4a02dc368b7f
--- /dev/null
+++ b/sci-chemistry/xds-bin/xds-bin-20091228.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/xds-bin-20091228.ebuild,v 1.1 2010/01/31 23:13:28 jlec Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="X-ray Detector Software for processing single-crystal monochromatic diffraction data."
+HOMEPAGE="http://xds.mpimf-heidelberg.mpg.de/"
+SRC_URI="
+	x86? ( ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-IA32_Linux_x86.tar.gz -> XDS-IA32_Linux_x86-${PV}.tar.gz )
+	amd64? ( ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-INTEL64_Linux_x86_64.tar.gz -> XDS-INTEL64_Linux_x86_64-${PV}.tar.gz )
+	 ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS_html_doc.tar.gz -> XDS_html_doc-${PV}.tar.gz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="smp X"
+
+RDEPEND="X? ( sci-visualization/xds-viewer )"
+DEPEND=""
+
+pkg_setup() {
+	if use x86; then
+		MY_P="XDS-IA32_Linux_x86"
+	elif use amd64; then
+		MY_P="XDS-INTEL64_Linux_x86_64"
+	fi
+
+	S="${WORKDIR}"/${MY_P}
+}
+
+src_install() {
+	exeinto /opt/${PN}
+	doexe * || die
+	if use smp; then
+		rm "${D}"/opt/${PN}/{xds,mintegrate,mcolspot,xscale}
+		dosym xds_par /opt/${PN}/xds || die
+		dosym xscale_par /opt/${PN}/xscale || die
+		dosym mintegrate_par /opt/${PN}/mintegrate || die
+		dosym mcolspot_par /opt/${PN}/mcolspot || die
+	else
+		rm "${D}"/opt/${PN}/*par
+	fi
+	dohtml -r "${WORKDIR}"/XDS_html_doc/* || die
+	insinto /usr/share/${PN}/INPUT_templates
+	doins "${WORKDIR}"/XDS_html_doc/html_doc/INPUT_templates/* || die
+
+	cat >> "${T}"/20xds <<- EOF
+	PATH="/opt/${PN}/"
+	EOF
+	doenvd "${T}"/20xds || die
+}
+
+pkg_postinst() {
+	elog "This package will expire on December 31, 2010"
+}