Replaced environment variables by a startup script.

6 files changed, 23 insertions, 14 deletions

diff --git a/app-sci/nmrview/ChangeLog b/app-sci/nmrview/ChangeLog
index ad6cf22a6856..2056ea697b7d 100644
--- a/app-sci/nmrview/ChangeLog
+++ b/app-sci/nmrview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/nmrview
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/nmrview/ChangeLog,v 1.1 2004/12/16 16:26:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/nmrview/ChangeLog,v 1.2 2004/12/18 16:32:03 ribosome Exp $
+
+*nmrview-5.2.2-r1 (18 Dec 2004)
+
+  18 Dec 2004; Olivier Fisette <ribosome@gentoo.org> -files/nmrview-env,
+  +files/nmrview.sh, +nmrview-5.2.2-r1.ebuild, -nmrview-5.2.2.ebuild:
+  Replaced environment variables by a startup script.
 
 *nmrview-5.2.2 (16 Dec 2004)
 
diff --git a/app-sci/nmrview/Manifest b/app-sci/nmrview/Manifest
index a5f3fc53f9b6..20314e11ec65 100644
--- a/app-sci/nmrview/Manifest
+++ b/app-sci/nmrview/Manifest
@@ -1,5 +1,6 @@
-MD5 4d81d67c8bc55178e24ac406b027d272 nmrview-5.2.2.ebuild 1200
+MD5 189f8f4b8cd61dd0d151f0c875e3c4e6 nmrview-5.2.2-r1.ebuild 1173
 MD5 0e02a81413d1ce90c18f500d08e4b5fa ChangeLog 352
 MD5 f189a3c4ff5ae55bcee4f8ed0ace5d20 metadata.xml 254
-MD5 9fa24af9e6f0d4358ec24dd44b02e196 files/nmrview-env 116
 MD5 a8857c8e06c514a0e16ec3d10999ca52 files/digest-nmrview-5.2.2 138
+MD5 8a6408219a081c5208f17e288ebe32bb files/nmrview.sh 153
+MD5 a8857c8e06c514a0e16ec3d10999ca52 files/digest-nmrview-5.2.2-r1 138
diff --git a/app-sci/nmrview/files/digest-nmrview-5.2.2 b/app-sci/nmrview/files/digest-nmrview-5.2.2-r1
index efba3c928648..efba3c928648 100644
--- a/app-sci/nmrview/files/digest-nmrview-5.2.2
+++ b/app-sci/nmrview/files/digest-nmrview-5.2.2-r1
diff --git a/app-sci/nmrview/files/nmrview-env b/app-sci/nmrview/files/nmrview-env
deleted file mode 100644
index ed9d48c0692c..000000000000
--- a/app-sci/nmrview/files/nmrview-env
+++ /dev/null
@@ -1,4 +0,0 @@
-NMRVIEW5HOME="/opt/nmrview"
-TK_LIBRARY="/opt/nmrview/tk8.0"
-TCL_LIBRARY="/opt/nmrview/tcl8.0"
-PATH=/opt/nmrview/bin
diff --git a/app-sci/nmrview/files/nmrview.sh b/app-sci/nmrview/files/nmrview.sh
new file mode 100644
index 000000000000..b6b68b9b1e9f
--- /dev/null
+++ b/app-sci/nmrview/files/nmrview.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export NMRVIEW5HOME="/opt/nmrview"
+export TK_LIBRARY="/opt/nmrview/tk8.0"
+export TCL_LIBRARY="/opt/nmrview/tcl8.0"
+/opt/nmrview/bin/nmrview
diff --git a/app-sci/nmrview/nmrview-5.2.2.ebuild b/app-sci/nmrview/nmrview-5.2.2-r1.ebuild
index bdf54b58514f..52e2fb58b05f 100644
--- a/app-sci/nmrview/nmrview-5.2.2.ebuild
+++ b/app-sci/nmrview/nmrview-5.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/nmrview/nmrview-5.2.2.ebuild,v 1.1 2004/12/16 16:26:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/nmrview/nmrview-5.2.2-r1.ebuild,v 1.1 2004/12/18 16:32:03 ribosome Exp $
 
 DESCRIPTION="NMRView - Visualisation and analysis of processed NMR data"
 LICENSE="as-is"
@@ -13,9 +13,7 @@ SLOT="0"
 IUSE=""
 KEYWORDS="-* ~x86"
 
-DEPEND="virtual/x11
-	=dev-lang/tcl-8.4*
-	=dev-lang/tk-8.4*"
+RDEPEND="virtual/x11"
 
 S=${WORKDIR}
 
@@ -34,16 +32,18 @@ pkg_nofetch() {
 }
 
 src_compile() {
+	echo
 	einfo "Nothing to compile."
+	echo
 }
 
 src_install() {
+	exeinto /usr/bin
+	newexe ${FILESDIR}/${PN}.sh ${PN}
 	exeinto ${INSTDIR}/bin
-	newexe ${PN}${PV//./_}_01_linux nmrview
+	newexe ${PN}${PV//./_}_01_linux ${PN}
 	DIRS="help html images nvtcl nvtclC nvtclExt reslib star tcl8.4 tk8.4 tools"
 	cp -r ${DIRS} ${D}/${INSTDIR}
 	dodoc README
 	dosym ${INSTDIR}/html /usr/share/doc/${PF}/html
-	insinto /etc/env.d
-	newins ${FILESDIR}/${PN}-env ${PN}
 }