sci-chemistry/xds-bin: Version bump to 20170430

Gentoo-bug: 596294
* EAPI=6

Package-Manager: portage-2.3.1

2 files changed, 17 insertions, 19 deletions

diff --git a/sci-chemistry/xds-bin/Manifest b/sci-chemistry/xds-bin/Manifest
index a31e09a4f250..cbac65ee1b01 100644
--- a/sci-chemistry/xds-bin/Manifest
+++ b/sci-chemistry/xds-bin/Manifest
@@ -1,2 +1,2 @@
-DIST XDS-INTEL64_Linux_x86_64-20151019.tar.gz 9568869 SHA256 dd033f9199faeea9df3639f56442ad0c5c1113840aed1f03babb0f60a3481c5d SHA512 d8faece7bde17a17deb381301824d08054cef71e2f3a20507a09baf78c0081eb6c472e62421eb5e55c9df79f257ebd0456c6991d8dfbfae5a7922b7a8608ff15 WHIRLPOOL 6ccfe67c9b3e21ba8d2ae2304d7297b25e0ef9947838dd834ddb540f8cb664857a198d60a959ce560915775168ae0c9d001a83198de63784cc2b9790b0856406
-DIST XDS_html_doc-20151019.tar.gz 113923 SHA256 b7609ed2f0353eb296c8778d75c6d1bb0afa8264a9890fed406c8448374857de SHA512 a78e9abf4698c1184e11034e8e54123c44f85a82cc6c94071ad44d7be339939883dd11cf1695670899d691fa55c285b35817e904456f93d3c4fb73c9779c9164 WHIRLPOOL 57421c72e4e2959a6717895a0c349bd30fc9f74f0743a4a82b1c86491528e6186c3fea4062d381741a7ff265afbe39b2d928603ef7b02d56e1fba3c202076186
+DIST XDS-INTEL64_Linux_x86_64-20170430.tar.gz 9404391 SHA256 8ca48f2d62d49609dc36c298992fc0b640b4f336d1305fa2769ea16e1e271a9a SHA512 d307fa509a8f465c5006fe9d9713a763a7534bfb6cd702861081e48fb24030dc7b2fc99c56adbf7a2599f312e49d7ca0d4c0b41f6d75ac47c5eca42819a58d0b WHIRLPOOL 9660a3d4c340fa4305f6787c51c11b2166e56dba19699a169c0bd30bc0cd011e396cce6323872ca1e6ec1f630bdb88d96951e2097bd39edd780a805253ff39a3
+DIST XDS_html_doc-20170430.tar.gz 115424 SHA256 f52740fdafe04d18e7e0dd76c97d58fa47b565c1d82bcbfda9bfb7fd9bc32456 SHA512 efc45ca2a3114667298b27e2b75312ae1579b6ed214acd2c9e069462eda317d8f2b46f771e56d629c078195fe7b0e8fda18a2b27e7dc6ba2d73784ae1e7eb7fc WHIRLPOOL d6a87b1c5c5503e43eabb8d168016440e6923b3c536c1422e9123d2192217444e0e56e6812f3fd2784513dfa50dde13f93f827eade28e3848d8f1014d1aba2cb
diff --git a/sci-chemistry/xds-bin/xds-bin-20151019.ebuild b/sci-chemistry/xds-bin/xds-bin-20170430.ebuild
index 4b5e61d6ce0e..79a011fd9133 100644
--- a/sci-chemistry/xds-bin/xds-bin-20151019.ebuild
+++ b/sci-chemistry/xds-bin/xds-bin-20170430.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils
-
-DESCRIPTION="X-ray Detector Software for processing single-crystal monochromatic diffraction data"
+DESCRIPTION="Software for processing single-crystal X-ray monochromatic diffraction data"
 HOMEPAGE="http://xds.mpimf-heidelberg.mpg.de/"
 SRC_URI="
 	ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-INTEL64_Linux_x86_64.tar.gz -> XDS-INTEL64_Linux_x86_64-${PV}.tar.gz
@@ -23,30 +21,30 @@ DEPEND=""
 QA_PREBUILT="opt/xds-bin/*"
 
 src_unpack() {
-	unpack ${A}
-	mv XDS-* "${S}"
+	default
+	mv XDS-* "${S}" || die
 }
 
 src_install() {
-	local suffix bin
+	local HTML_DOCS=( "${WORKDIR}"/XDS_html_doc/. )
+	einstalldocs
+
+	local i suffix=$(usex smp '_par' '')
 	exeinto /opt/${PN}
 	doexe *
 
-	use smp && suffix="_par"
-
-	for bin in xds mintegrate mcolspot xscale; do
-		dosym ../${PN}/${bin}${suffix} /opt/bin/${bin}
+	for i in xds mintegrate mcolspot xscale; do
+		dosym ../${PN}/${i}${suffix} /opt/bin/${i}
 	done
 
-	for bin in 2cbf cellparm forkcolspot forkintegrate merge2cbf pixlab xdsconv; do
-		dosym ../${PN}/${bin} /opt/bin/${bin}
+	for i in 2cbf cellparm forkcolspot forkintegrate merge2cbf pix2lab xdsconv; do
+		dosym ../${PN}/${i} /opt/bin/${i}
 	done
 
-	dohtml -r "${WORKDIR}"/XDS_html_doc/*
 	insinto /usr/share/${PN}/INPUT_templates
-	doins "${WORKDIR}"/XDS_html_doc/html_doc/INPUT_templates/*
+	doins -r "${WORKDIR}"/XDS_html_doc/html_doc/INPUT_templates/.
 }
 
 pkg_postinst() {
-	elog "This package will expire on March 31, 2016"
+	elog "This package will expire on April 30, 2017"
 }