sci-chemistry/xds-bin: Version Bump, #462730

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 28 insertions, 24 deletions

diff --git a/sci-chemistry/xds-bin/ChangeLog b/sci-chemistry/xds-bin/ChangeLog
index 7fa807aae6e8..a2207e8f9995 100644
--- a/sci-chemistry/xds-bin/ChangeLog
+++ b/sci-chemistry/xds-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/xds-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/ChangeLog,v 1.10 2012/07/25 12:47:09 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/ChangeLog,v 1.11 2013/03/24 10:51:01 jlec Exp $
+
+*xds-bin-20120926 (24 Mar 2013)
+
+  24 Mar 2013; Justin Lecher <jlec@gentoo.org> -xds-bin-20111230.ebuild,
+  +xds-bin-20120926.ebuild, metadata.xml:
+  Version Bump, #462730
 
   25 Jul 2012; Justin Lecher <jlec@gentoo.org> xds-bin-20111230.ebuild,
   metadata.xml:
diff --git a/sci-chemistry/xds-bin/metadata.xml b/sci-chemistry/xds-bin/metadata.xml
index e42d0af60f42..51fdedab1b38 100644
--- a/sci-chemistry/xds-bin/metadata.xml
+++ b/sci-chemistry/xds-bin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+  <herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/xds-bin/xds-bin-20111230.ebuild b/sci-chemistry/xds-bin/xds-bin-20120926.ebuild
index 4056840be2a9..1515ecbffdfe 100644
--- a/sci-chemistry/xds-bin/xds-bin-20111230.ebuild
+++ b/sci-chemistry/xds-bin/xds-bin-20120926.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/xds-bin-20111230.ebuild,v 1.2 2012/07/25 12:47:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xds-bin/xds-bin-20120926.ebuild,v 1.1 2013/03/24 10:51:01 jlec Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils
 
@@ -29,27 +29,25 @@ src_unpack() {
 }
 
 src_install() {
+	local suffix bin
 	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
+	doexe *
+
+	use smp && suffix="_par"
+
+	for bin in xds mintegrate mcolspot xscale; do
+		dosym ../${PN}/${bin}${suffix} /opt/bin/${bin}
+	done
 
-	cat >> "${T}"/20xds <<- EOF
-	PATH="/opt/${PN}/"
-	EOF
-	doenvd "${T}"/20xds || die
+	for bin in 2cbf cellparm forkcolspot forkintegrate merge2cbf xdsconv; do
+		dosym ../${PN}/${bin} /opt/bin/${bin}
+	done
+
+	dohtml -r "${WORKDIR}"/XDS_html_doc/*
+	insinto /usr/share/${PN}/INPUT_templates
+	doins "${WORKDIR}"/XDS_html_doc/html_doc/INPUT_templates/*
 }
 
 pkg_postinst() {
-	elog "This package will expire on December 31, 2011"
+	elog "This package will expire on June 30, 2013"
 }