Fixed a few potential problems, including bug #99685.

(Portage version: 2.0.51.22-r2)

5 files changed, 24 insertions, 11 deletions

diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 4fd4ffc9de90..0b69d5401c23 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -1,6 +1,14 @@
 # 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.1 2005/05/24 20:59:55 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/ChangeLog,v 1.2 2005/07/20 17:35:20 ribosome Exp $
+
+*nmrpipe-20050415-r1 (20 Jul 2005)
+
+  20 Jul 2005; Olivier Fisette <ribosome@gentoo.org>
+  files/nmrpipe-20050415-env, -nmrpipe-20050415.ebuild,
+  +nmrpipe-20050415-r1.ebuild:
+  Fixed a few potential problems, including bug #99685. Thanks to Katia
+  Lecours <klecours@rsvs.ulaval.ca> for reporting.
 
 *nmrpipe-20050415 (24 May 2005)
 
diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest
index e5231eda1cb0..2cce44b10f10 100644
--- a/sci-chemistry/nmrpipe/Manifest
+++ b/sci-chemistry/nmrpipe/Manifest
@@ -1,5 +1,5 @@
-MD5 33853b36ebd3b9409b75729d1b99f8a0 nmrpipe-20050415.ebuild 3893
 MD5 8555083ed3ffd9d23032f8a158234ac5 ChangeLog 394
+MD5 f82c722d8847555cbbf419a6b030786a nmrpipe-20050415-r1.ebuild 4081
 MD5 f189a3c4ff5ae55bcee4f8ed0ace5d20 metadata.xml 254
-MD5 a0cf759ccc9f784668a46fea06921a91 files/digest-nmrpipe-20050415 583
-MD5 e7236bf3258e1cb32a99df7d3887b7d6 files/nmrpipe-20050415-env 466
+MD5 503badd99fa2affecd086405761e0c23 files/nmrpipe-20050415-env 472
+MD5 a0cf759ccc9f784668a46fea06921a91 files/digest-nmrpipe-20050415-r1 583
diff --git a/sci-chemistry/nmrpipe/files/digest-nmrpipe-20050415 b/sci-chemistry/nmrpipe/files/digest-nmrpipe-20050415-r1
index 49d98abac037..49d98abac037 100644
--- a/sci-chemistry/nmrpipe/files/digest-nmrpipe-20050415
+++ b/sci-chemistry/nmrpipe/files/digest-nmrpipe-20050415-r1
diff --git a/sci-chemistry/nmrpipe/files/nmrpipe-20050415-env b/sci-chemistry/nmrpipe/files/nmrpipe-20050415-env
index 29239a092cfd..d405ebb53feb 100644
--- a/sci-chemistry/nmrpipe/files/nmrpipe-20050415-env
+++ b/sci-chemistry/nmrpipe/files/nmrpipe-20050415-env
@@ -4,15 +4,15 @@ BINTYPE="linux9"
 # NMRPipe
 NMRBASE="/opt/nmrpipe"
 MANPATH="${NMRBASE}/man"
-PATH="${NMRBASE}/nmrbin.linux9"
+PATH="${NMRBASE}/bin"
 # Auxiliary NMRPipe scripts
-# PATH="${NMRBASE}/com"
+# PATH="${PATH}:${NMRBASE}/com"
 
 # Dynamo
 DYNAMO_DIR="${NMRBASE}/dynamo"
 DYNAMO_PARAMS="${DYNAMO_DIR}/params"
 SURF_DIR="${DYNAMO_DIR}/surface"
-PATH="${DYNAMO_DIR}/tcl"
+PATH="${PATH}:${DYNAMO_DIR}/tcl"
 DYNAMO_KEY="2002084"
 
 # PDBH
diff --git a/sci-chemistry/nmrpipe/nmrpipe-20050415.ebuild b/sci-chemistry/nmrpipe/nmrpipe-20050415-r1.ebuild
index 41d49c5626b6..b4e6d044591e 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-20050415.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-20050415-r1.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-20050415.ebuild,v 1.1 2005/05/24 20:59:55 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/nmrpipe-20050415-r1.ebuild,v 1.1 2005/07/20 17:35:20 ribosome Exp $
 
 DESCRIPTION="Spectral visualisation, analysis and Fourier processing"
 # The specific terms of this license are printed automatically on startup
@@ -68,17 +68,21 @@ pkg_nofetch() {
 
 src_unpack() {
 	# The installation script will unpack the package. We just provide symlinks
-	# to the archive files (and installation scripts).
-	for i in ${A}; do
+	# to the archive files, ...
+	for i in ${PN}.linux9.tar.Z xview_fonts.tar.Z xview.linux9.tar.Z \
+		dyn.tar.Z mfr.tar.Z pdbH.tar.Z valpha.tar acme.tar.Z; do
 		ln -s "${DISTDIR}/${i}" "${i}"
 	done
-	# Make the installation scripts executable.
+	# ... copy the installation scripts ...
+	cp ${DISTDIR}/{binval.com,install.com} .
+	# ... and make the installation scripts executable.
 	chmod +x "binval.com" "install.com"
 }
 
 src_compile() {
 	# Unset DISPLAY to avoid the interactive graphical test.
 	DISPLAY="" ./install.com "${S}" || die
+	# Remove the symlinks for the archives and the installation scripts.
 	for i in ${A}; do
 		rm "${i}"
 	done
@@ -103,6 +107,7 @@ src_install() {
 	insinto "/opt/${PN}"
 	insopts "-m0755"
 	doins -r *
+	dosym "/opt/${PN}/nmrbin.linux9" "/opt/${PN}/bin"
 }
 
 pkg_postinst() {