From 8ec3ec2dabd5c3870962777de8a60c33973cb7cb Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Wed, 9 Jun 2010 12:43:15 +0200
Subject: Fixes for envs (Portage version: 2.2_rc67/git/Linux x86_64)  (Signed
 Manifest commit)

---
 sci-chemistry/nmrpipe/Manifest              |  9 ++++-----
 sci-chemistry/nmrpipe/files/env-nmrpipe     | 27 ---------------------------
 sci-chemistry/nmrpipe/files/env-nmrpipe-new |  5 ++++-
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 sci-chemistry/nmrpipe/files/env-nmrpipe

diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest
index 4775b415e..9d99e190b 100644
--- a/sci-chemistry/nmrpipe/Manifest
+++ b/sci-chemistry/nmrpipe/Manifest
@@ -2,8 +2,7 @@
 Hash: SHA1
 
 AUX 5.0.2010.155.15.05-lib.patch 997 RMD160 09e9dbed8e1e2e4964bdf381a15b556d0ea9f3bb SHA1 881a3554f21fb23973e0b8a31b59cff495f5edbb SHA256 011aea3e38ef3eb650be7b5d6274913bbb4f5367838f4bb86f97556ad247b57f
-AUX env-nmrpipe 564 RMD160 703d03932315c67bb1cc2c894c631a64992e528f SHA1 85e7d89bb093f8cd2eacbb46f8739b157699ccb7 SHA256 1d0ba3e84285856080b6b015253c18528d38bc81156b0df79db346befc704f40
-AUX env-nmrpipe-new 537 RMD160 0b8b6e53ad49c4bd280f22590e92fdf336e7b66f SHA1 3491378d2d49c867dd0f5bd661d79409b714ea53 SHA256 fbe6cec954a377bb9d957a0c1921060d2543d2b378a6beb801e6fb34796bff15
+AUX env-nmrpipe-new 597 RMD160 6948506b9106af33ecd1d7aefce5bb1b9a1f3e1d SHA1 df74a34eab52ed3b4007cf2a33a8b2ccacf50938 SHA256 9cdf0ebfb771c04ff8e38b94ad29cd18e349f76ee6604e07d4b7567621c6be46
 DIST NMRPipeX.tZ 150521041 RMD160 d2a9c70aac1fa81011f57821a09ac377783b80cb SHA1 064b040e758265e4cfde10fbd22738ed214fd4f5 SHA256 908aed7336312d0fe80cc87b173263a8f58da51c9ca9c9da13de531412664baf
 DIST acme.tar.Z 11681951 RMD160 fdcf35fab1b63ddda55288b1b2ed0f82c8299bef SHA1 5093f92a4d7e4173bc056b6b1922a6da8e6bbf0c SHA256 5713452a1461e636f0de48e5ce3476fc0ae60b3f78a0288744f45e455f3445d9
 DIST binval.com 3654 RMD160 60f7b8e13ef48dc22822beb2fd107beac25db300 SHA1 fdd8d2a2b9b6f57ad9d2ebac84b15e428478d261 SHA256 0ab49d267a3b947f31024e3eae281101b7002a64a801b36f1671bd79e8ef5a9d
@@ -17,7 +16,7 @@ MISC metadata.xml 273 RMD160 77dd0acbd8530bfceee840dfeccd1f4228e0460b SHA1 7c679
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwOhJ8ACgkQgAnW8HDreRaRIwCgz2RfriTdCtt7XHJKvFVWW8rU
-46cAnj2QEK0D7pFF+ZUEpzOaRG3Kkoz+
-=pRfh
+iEYEARECAAYFAkwPcEMACgkQgAnW8HDreRapZACgqqjiD63oqsz6HJLin6ajol4j
+mssAn3RorIkIYh/Hgf3TxbFWtL/b0+3o
+=d2kl
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/nmrpipe/files/env-nmrpipe b/sci-chemistry/nmrpipe/files/env-nmrpipe
deleted file mode 100644
index 1ca8dbb6e..000000000
--- a/sci-chemistry/nmrpipe/files/env-nmrpipe
+++ /dev/null
@@ -1,27 +0,0 @@
-# Platform
-BINTYPE="linux9"
-
-# NMRPipe
-NMRBASE="/opt/nmrpipe"
-NMRTXT="${NMRBASE}/nmrtxt"
-MANPATH="${NMRBASE}/man"
-PATH="${NMRBASE}/bin"
-# Auxiliary NMRPipe scripts
-# PATH="${PATH}:${NMRBASE}/com"
-
-TALOS_DIR="${NMRBASE}/talos"
-TALOSP_DIR="${NMRBASE}/talosplus"
-
-# Dynamo
-DYNAMO_DIR="${NMRBASE}/dynamo"
-DYNAMO_PARAMS="${DYNAMO_DIR}/params"
-SURF_DIR="${DYNAMO_DIR}/surface"
-PATH="${PATH}:${DYNAMO_DIR}/tcl"
-DYNAMO_KEY="2002084"
-
-# PDBH
-PDBH_BASE="${NMRBASE}/pdb"
-PDBH_DIR="${PDBH_BASE}/pdbH"
-PDBH_LIST="${PDBH_BASE}/pdbH.list"
-PDBH_TAB="${PDBH_BASE}/resolution.tab"
-
diff --git a/sci-chemistry/nmrpipe/files/env-nmrpipe-new b/sci-chemistry/nmrpipe/files/env-nmrpipe-new
index 8c5993c7d..c8aa37b0c 100644
--- a/sci-chemistry/nmrpipe/files/env-nmrpipe-new
+++ b/sci-chemistry/nmrpipe/files/env-nmrpipe-new
@@ -1,12 +1,15 @@
 # Platform
 BINTYPE="linux9"
+NMRBINTYPE="linux9"
 PATH="/opt/nmrpipe/com:/opt/nmrpipe/bin:/opt/nmrpipe/dynamo/tcl"
 
 # NMRPipe
 NMRBASE="/opt/nmrpipe"
 NMRTXT="/opt/nmrpipe/nmrtxt"
 MANPATH="/opt/nmrpipe/man"
-# Auxiliary NMRPipe scripts
+
+TALOS_DIR="/opt/nmrpipe/talos"
+TALOSP_DIR="/opt/nmrpipe/talosplus"
 
 # Dynamo
 DYNAMO_DIR="/opt/nmrpipe/dynamo"
-- 
cgit v1.2.3