[gentoo-commits] proj/sci:master commit in: sci-chemistry/nmrpipe/, sci-chemistry/nmrpipe/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     f24577a3113b0bbc13c127be3f3bf2e52da67162
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 21:56:40 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 21:56:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f24577a3

Version Bump

(Portage version: 2.2.0_alpha93/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 sci-chemistry/nmrpipe/ChangeLog                    |   12 ++++++++++++
 ...4.35-lib.patch => 7.1.2012.029.12.03-lib.patch} |    0
 ...35.ebuild => nmrpipe-7.1.2012.029.12.03.ebuild} |   10 ++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 48cb092..b406bb0 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2012; Justin Lecher <jlec@gentoo.org>
+  +files/7.1.2012.029.12.03-lib.patch, -files/6.5.2012.009.14.35-lib.patch,
+  -nmrpipe-6.5.2012.009.14.35.ebuild, +nmrpipe-7.1.2012.029.12.03.ebuild:
+  Version Bump
+
+*nmrpipe-7.1.2012.029.12.03 (22 Mar 2012)
+
+  22 Mar 2012; Justin Lecher <jlec@gentoo.org>
+  +files/7.1.2012.029.12.03-lib.patch, -files/6.5.2012.009.14.35-lib.patch,
+  -nmrpipe-6.5.2012.009.14.35.ebuild, +nmrpipe-7.1.2012.029.12.03.ebuild:
+  Version Bump
+
 *nmrpipe-6.5.2012.009.14.35 (10 Jan 2012)
 
   10 Jan 2012; Justin Lecher <jlec@gentoo.org>

diff --git a/sci-chemistry/nmrpipe/files/6.5.2012.009.14.35-lib.patch b/sci-chemistry/nmrpipe/files/7.1.2012.029.12.03-lib.patch
similarity index 100%
rename from sci-chemistry/nmrpipe/files/6.5.2012.009.14.35-lib.patch
rename to sci-chemistry/nmrpipe/files/7.1.2012.029.12.03-lib.patch

diff --git a/sci-chemistry/nmrpipe/nmrpipe-6.5.2012.009.14.35.ebuild b/sci-chemistry/nmrpipe/nmrpipe-7.1.2012.029.12.03.ebuild
similarity index 96%
rename from sci-chemistry/nmrpipe/nmrpipe-6.5.2012.009.14.35.ebuild
rename to sci-chemistry/nmrpipe/nmrpipe-7.1.2012.029.12.03.ebuild
index 0ced64d..cbf35d6 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-6.5.2012.009.14.35.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-7.1.2012.029.12.03.ebuild
@@ -12,10 +12,8 @@ DESCRIPTION="Spectral visualisation, analysis and Fourier processing"
 HOMEPAGE="http://spin.niddk.nih.gov/bax/software/NMRPipe/"
 SRC_URI="
 	NMRPipeX.tZ
-	valpha_all.tar
 	talos.tZ
 	dyn.tZ
-	acme.tar.Z
 	binval.com
 	install.com"
 
@@ -69,8 +67,8 @@ pkg_nofetch() {
 src_unpack() {
 	# The installation script will unpack the package. We just provide symlinks
 	# to the archive files, ...
-	for i in valpha_all.tar talos.tZ NMRPipeX.tZ dyn.tZ acme.tar.Z; do
-		ln -s "${DISTDIR}"/${i} ${i}
+	for i in NMRPipeX.tZ talos.tZ dyn.tZ; do
+		ln -sf "${DISTDIR}"/${i} || die
 	done
 	# ... copy the installation scripts ...
 	cp -L "${DISTDIR}"/{binval.com,install.com} .
@@ -79,7 +77,7 @@ src_unpack() {
 	# Unset DISPLAY to avoid the interactive graphical test.
 	# This just unpacks the stuff
 #	env DISPLAY="" csh ./install.com +type linux9 +dest "${S}"/NMR || die
-	VIRTUALX_COMMAND="csh ./install.com +type linux9 +dest ${S}/NMR" virtualmake
+	VIRTUALX_COMMAND="csh ./install.com +type linux9 +dest ${S}/NMR +nopost" virtualmake
 }
 
 src_prepare() {
@@ -112,7 +110,7 @@ src_install() {
 	EOF
 
 	# Remove the symlinks for the archives and the installation scripts.
-	for i in ${A} valpha_hn.tar valpha_time.tar valpha.tar; do
+	for i in ${A} ; do
 		rm -f ${i} || die "Failed to remove archive symlinks."
 	done
 	# Remove some of the bundled applications and libraries; they are provided by Gentoo instead.