New version. Removing obsolete version.

(Portage version: 2.0.51.22-r3)

5 files changed, 40 insertions, 27 deletions

diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 8b864276523a..5d3882460459 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/nmrpipe
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/ChangeLog,v 1.4 2005/08/31 00:40:57 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/ChangeLog,v 1.5 2005/10/18 14:40:51 ribosome Exp $
+
+*nmrpipe-2.3.2005.167.14.44 (18 Oct 2005)
+
+  18 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/nmrpipe-20050616-env, +files/env-nmrpipe,
+  +nmrpipe-2.3.2005.167.14.44.ebuild, -nmrpipe-20050616-r1.ebuild:
+  New version. Removing obsolete version.
 
 *nmrpipe-20050616-r1 (31 Aug 2005)
 
diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest
index 1cb7bab3927e..dabbae20624d 100644
--- a/sci-chemistry/nmrpipe/Manifest
+++ b/sci-chemistry/nmrpipe/Manifest
@@ -1,5 +1,5 @@
-MD5 a795e5521920ba8f4a9a2ea4c0e5e15d nmrpipe-20050616-r1.ebuild 4217
+MD5 1f32699892c9647adeab23c603336aa6 nmrpipe-2.3.2005.167.14.44.ebuild 4621
 MD5 ed6fbd16c2ce349850d79d010ddd5da9 ChangeLog 1162
 MD5 f189a3c4ff5ae55bcee4f8ed0ace5d20 metadata.xml 254
-MD5 2e7903ea90b6ace1bfa67c6efb6e875d files/digest-nmrpipe-20050616-r1 585
-MD5 29c1ecf7eda6ce5cb66a3cc7eafc00f1 files/nmrpipe-20050616-env 499
+MD5 1e3746832adf60875e61757b9ffdd1ef files/digest-nmrpipe-2.3.2005.167.14.44 584
+MD5 29c1ecf7eda6ce5cb66a3cc7eafc00f1 files/env-nmrpipe 499
diff --git a/sci-chemistry/nmrpipe/files/digest-nmrpipe-20050616-r1 b/sci-chemistry/nmrpipe/files/digest-nmrpipe-2.3.2005.167.14.44
index 252530dd10f2..474073efefa7 100644
--- a/sci-chemistry/nmrpipe/files/digest-nmrpipe-20050616-r1
+++ b/sci-chemistry/nmrpipe/files/digest-nmrpipe-2.3.2005.167.14.44
@@ -1,10 +1,10 @@
-MD5 b17803971db1c1a5949cc33d50190275 nmrpipe.linux9.tar.Z 21918245
+MD5 619771c84baeffe7e786ddd07c0d73ba nmrpipe.linux9.tar.Z 22505078
 MD5 bd7b0dfd903eab1df014bb9d7356612b xview_fonts.tar.Z 2183991
 MD5 06d27f018d0abd3e2e35fcd923423af3 xview.linux9.tar.Z 4047400
-MD5 70ae354d8ee365a9998a6679b9e88085 dyn.tar.Z 37503947
-MD5 185f4d4090d95181443d7fe4321489ae mfr.tar.Z 1066703
+MD5 0a03f5c8fb0fa48deb803b00ac5f4a3f dyn.tar.Z 37506563
+MD5 2fa433021210fe75c275910b67693015 mfr.tar.Z 829580
 MD5 b33e195e36e9c35a970632dc9670d312 pdbH.tar.Z 75004655
 MD5 af1c0e23c9d78025b9173fcbbb1c1f07 valpha.tar 490800640
 MD5 f8df76a619d702153a19b23f1678aca6 acme.tar.Z 11681951
 MD5 72a4802dcc912569d645f4cb5b27f5e5 binval.com 3209
-MD5 08d2b3dec7d37cf0685bdf4240512301 install.com 20519
+MD5 8c128c3c6a0840fd20f54ae40b330224 install.com 20812
diff --git a/sci-chemistry/nmrpipe/files/nmrpipe-20050616-env b/sci-chemistry/nmrpipe/files/env-nmrpipe
index beb9d707eb4f..beb9d707eb4f 100644
--- a/sci-chemistry/nmrpipe/files/nmrpipe-20050616-env
+++ b/sci-chemistry/nmrpipe/files/env-nmrpipe
diff --git a/sci-chemistry/nmrpipe/nmrpipe-20050616-r1.ebuild b/sci-chemistry/nmrpipe/nmrpipe-2.3.2005.167.14.44.ebuild
index a3d346ca4e0d..a2e9c9ada4a3 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-20050616-r1.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-2.3.2005.167.14.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/nmrpipe-20050616-r1.ebuild,v 1.1 2005/08/31 00:40:57 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/nmrpipe-2.3.2005.167.14.44.ebuild,v 1.1 2005/10/18 14:40:51 ribosome Exp $
 
 DESCRIPTION="Spectral visualisation, analysis and Fourier processing"
 # The specific terms of this license are printed automatically on startup
@@ -27,8 +27,6 @@ SRC_URI="${PN}.linux9.tar.Z
 	acme.tar.Z
 	binval.com
 	install.com"
-# The maintainer absolutely wants to control redistribution.
-RESTRICT="fetch"
 
 SLOT="0"
 IUSE=""
@@ -38,16 +36,21 @@ IUSE=""
 # if there are such requests.
 KEYWORDS="-* ~x86"
 
-RDEPEND="virtual/x11
-	dev-lang/f2c
+# The maintainer absolutely wants to control redistribution.
+RESTRICT="fetch"
+
+DEPEND="app-shells/tcsh
+	dev-lang/f2c"
+
+RDEPEND="${DEPEND}
 	dev-lang/tcl
 	dev-lang/tk
 	dev-tcltk/blt
 	media-gfx/gnuplot
-	app-shells/tcsh
+	sci-chemistry/rasmol
 	sys-libs/libtermcap-compat
-	x11-libs/xview
-	sci-chemistry/rasmol"
+	virtual/x11
+	x11-libs/xview"
 
 S="${WORKDIR}"
 NMRBASE="/opt/${PN}"
@@ -84,40 +87,43 @@ src_compile() {
 	DISPLAY="" ./install.com "${S}" || die
 	# Remove the symlinks for the archives and the installation scripts.
 	for i in ${A}; do
-		rm ${i}
+		rm ${i} || die "Failed to remove archive symlinks."
 	done
 	# Remove some of the bundled applications and libraries; they are
 	# provided by Gentoo instead.
-	rm -r xview XView nmrbin.linux9/{0.0,lib,*timestamp,xv,gnuplot*,rasmol*}
+	rm -r xview XView nmrbin.linux9/{0.0,lib,*timestamp,xv,gnuplot*,rasmol*} \
+		|| die "Failed to remove unnecessary libraries."
 	# Remove the initialisation script generated during the installation.
 	# It contains incorrect hardcoded paths; only the "nmrInit.com" script
 	# should be used.
-	rm com/nmrInit.linux9.com
+	rm com/nmrInit.linux9.com || die "Failed to remove broken init script."
 	# Make the precompiled Linux binaries executable.
-	chmod +x nmrbin.linux9/*
+	chmod +x nmrbin.linux9/* || die "Failed to make programs executable."
 	# Set the correct path to NMRPipe in the auxiliary scripts.
 	cd com
 	for i in *; do
-		sed -e "s%/u/delaglio%${NMRBASE}%" -i ${i} || die
+		sed -e "s%/u/delaglio%${NMRBASE}%" -i ${i} || die \
+			"Failed patching scripts."
 	done
 	# Remove installation log files.
 	cd "${S}"
-	rm *.log
+	rm *.log || die "Failed to remove installation log."
 }
 
 src_install() {
-	newenvd "${FILESDIR}"/${P}-env 40${PN}
-	insinto /opt/${PN}
+	newenvd "${FILESDIR}"/env-${PN} 40${PN} || die "Failed to install env file."
+	insinto ${NMRBASE}
 	insopts -m0755
-	doins -r *
-	dosym /opt/${PN}/nmrbin.linux9 /opt/${PN}/bin
+	doins -r * || die "Failed to install application."
+	dosym ${NMRBASE}/nmrbin.linux9 ${NMRBASE}/bin || die \
+		"Failed to symlink binaries."
 }
 
 pkg_postinst() {
 	echo
 	ewarn "Before using NMRPipe applications, users must source the following"
 	ewarn "csh script, which will set the necessary environment variables:"
-	ewarn "\t/opt/${PN}/com/nmrInit.com"
+	ewarn "\t${NMRBASE}/com/nmrInit.com"
 	ewarn
 	ewarn "Be aware that this script redefines the locations of the Tcl"
 	ewarn "libraries. This could break other non-NMRPipe Tcl applications"