nmrpipe version bump to 5.0.2009.103.20.08

3 files changed, 18 insertions, 19 deletions

diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 49c6ecd9f..81a2032c6 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  nmrpipe-5.0.2009.103.20.08.ebuild:
+  version bump to lower version Upstream suggested this and we will keep
+  with this. new versioning scheme is output of nmrPipe -help
+
 *nmrpipe-9.27.2009.120.14.28 (22 May 2009)
 
   22 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest
index be69b4f60..35d0a4367 100644
--- a/sci-chemistry/nmrpipe/Manifest
+++ b/sci-chemistry/nmrpipe/Manifest
@@ -1,17 +1,12 @@
 AUX env-nmrpipe 499 RMD160 11ab9f42b03700caedfe344186c47fd4a6409758 SHA1 8431685d268b14d88dd31cb494f0d333fff225b9 SHA256 f16820dd88ae38c8db6ffed19a97aade62f0de4c3de692b7a2c3b89897d894e2
-<<<<<<< HEAD:sci-chemistry/nmrpipe/Manifest
-AUX env-nmrpipe-new 526 RMD160 2ef2c464a5de9adc8480ab3114abf026a2a57d82 SHA1 ea2bee40baaba7e67a057782eaae86485160582a SHA256 6b1568c80f3f82807adfe2c890690100d3d35d47326ee10e9c7ec25c50e21b23
-DIST NMRPipeX.tZ 145040519 RMD160 22c48c04dd9c285d724080bd4890edcc2a3d2eae SHA1 d305046307441ff0f372015c0db3bb3b425b1a05 SHA256 acc5f5c6884c9916277551cc2c0a73bdc02ab49b999a5d7e898244aba753692e
-=======
 AUX env-nmrpipe-new 509 RMD160 04d883eeaa253e51869a611bcc23262d29c5ffc8 SHA1 ce0bf895714896942c6c705d3ece23ad639884eb SHA256 7f182cf74d058ad3f4d7cc94a0fcf16b7b97fe438c72f29b835cc968d4036726
 DIST NMRPipeX.tZ 122135595 RMD160 77e870379c4a702299f8c12e2f0c4afbb5e40512 SHA1 112df5a9b12fe2083eeec0f1a3b36d3bf956764e SHA256 e06545f9ca5053002ff93affc6d3bf5363c314d852c72cab300eb8a1431fb42f
->>>>>>> nmrpipe:sci-chemistry/nmrpipe/Manifest
 DIST acme.tar.Z 11681951 RMD160 fdcf35fab1b63ddda55288b1b2ed0f82c8299bef SHA1 5093f92a4d7e4173bc056b6b1922a6da8e6bbf0c SHA256 5713452a1461e636f0de48e5ce3476fc0ae60b3f78a0288744f45e455f3445d9
 DIST binval.com 3654 RMD160 60f7b8e13ef48dc22822beb2fd107beac25db300 SHA1 fdd8d2a2b9b6f57ad9d2ebac84b15e428478d261 SHA256 0ab49d267a3b947f31024e3eae281101b7002a64a801b36f1671bd79e8ef5a9d
 DIST dyn.tZ 138636637 RMD160 ae6b32bec800456f76fd0b8d9d67af3d47a40d6c SHA1 2c0e594646cfbcedbce77f547c982d9f9064f842 SHA256 6947a5ffe6797fda2f6dc468978944fac67d6b54b8501b9f8a30a6ddc731b792
 DIST install.com 33517 RMD160 e716cb94b9d18f49a4c8a4ef2a5b15fdcaed4c8f SHA1 9300705e9293de14a1c838bd79b219a55e7baa01 SHA256 6fd1db3ab9c0cacca6ff4015e4c8de6ed1d0b62d040669137ee7d49a8d22a8ab
 DIST talos.tZ 25228729 RMD160 4783a4454faa48dd2d3c08ef5ebe589eec6b8b42 SHA1 5880b0b42f75626991d8dc1029f8c8240ce527ce SHA256 bd267bb1d0126f7dda2f89ac797cce0b08d85691bd5811b3ac5576e54d7b01b7
 DIST valpha_all.tar 724441088 RMD160 70ce860341b0817dbb058de6a228f2b776081b0b SHA1 f8aa75678833b3b2f46597bf0a4834d63104095a SHA256 6f68fcf4037328e3bae79fd11a2a10acc6a3ecd276857c0080d9f8b7ad3cfae1
-EBUILD nmrpipe-5.0.2009.103.20.08.ebuild 4611 RMD160 e868c73ee3ab2baf97b8d11780e1173a36e4f0f5 SHA1 1313eba719cf73fddd7a46e8a881a1ff24ad63cc SHA256 4e71d8d8606d886837390343b1aa96cc06e9806024afe3fd854b7472b8fcd577
-MISC ChangeLog 3477 RMD160 407f33a74c63e19bcf17867593ac87172735e6f9 SHA1 897ac6d5b1c5e049c9ac789cf36ef5735d8d273b SHA256 ec398445e9cd6863c47c2ab602bbeb81de2be8c2f1f7e86d5503721282ed9de2
+EBUILD nmrpipe-5.0.2009.103.20.08.ebuild 4643 RMD160 8f756ff22d6d1614c480157bbb19fb58e11018b6 SHA1 c65cf785ca831486785ff5a94f55df315d140e4f SHA256 f0a8cb5bfe3b6bc62c3180d28a2602bbe3da0fa25e1d61dbe116b2cdcdde5304
+MISC ChangeLog 3707 RMD160 4b4d9ecf0b4d8057980b99740a1cdcfc0a925809 SHA1 6d7e2f883dcaee594342bc9326187f86c25b9fd4 SHA256 dea2e37d65a6c1f4cef7b1b5ca66c01f5e8bd701666c7c280dd1bf7c2b09af5c
 MISC metadata.xml 273 RMD160 77dd0acbd8530bfceee840dfeccd1f4228e0460b SHA1 7c6794b74e4f357c0cd501266226eda09417d6ee SHA256 ed6f9e4b8aa59f68498bb75bf3be63a6de60feda167e4ceb12c7cb81bf8aac09
diff --git a/sci-chemistry/nmrpipe/nmrpipe-5.0.2009.103.20.08.ebuild b/sci-chemistry/nmrpipe/nmrpipe-5.0.2009.103.20.08.ebuild
index 21de630d0..4dece8163 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-5.0.2009.103.20.08.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-5.0.2009.103.20.08.ebuild
@@ -76,9 +76,11 @@ src_unpack() {
 	chmod +x binval.com install.com
 }
 
-src_compile() {
+src_install() {
 	# Unset DISPLAY to avoid the interactive graphical test.
 	DISPLAY="" ./install.com +type linux9 +dest "${S}"/NMR || die
+
+
 	# Remove the symlinks for the archives and the installation scripts.
 	for i in ${A}; do
 		rm ${i} || die "Failed to remove archive symlinks."
@@ -92,21 +94,18 @@ src_compile() {
 	# It contains incorrect hardcoded paths; only the "nmrInit.com" script
 	# should be used.
 	rm com/nmrInit.linux9.com || die "Failed to remove broken init script."
-	# Make the precompiled Linux binaries executable.
-	chmod +x nmrbin.linux9/* || die "Failed to make programs executable."
+	# Remove installation log files.
+	rm README_NMRPIPE_USERS *.log || die "Failed to remove installation log."
+	# Remove unused binaries
+	rm talos/bin/TALOS.{linux,mac,sgi6x,winxp} pdb/misc/addSeg || die
+
 	# Set the correct path to NMRPipe in the auxiliary scripts.
-	cd com
-	for i in *; do
+	for i in $(find com/ dynamo/surface/misc/ nmrtxt/ talos/misc -type f); do
 		sed -e "s%/u/delaglio%${NMRBASE}%" -i ${i} || die \
 			"Failed patching scripts."
 	done
-	sed -i "s:${WORKDIR}:${NMRBASE}:g" font.com
-	# Remove installation log files.
-	cd "${S}"
-	rm *.log || die "Failed to remove installation log."
-}
+	sed -i "s:${WORKDIR}:${NMRBASE}:g" com/font.com
 
-src_install() {
 	newenvd "${FILESDIR}"/env-${PN}-new 40${PN} || die "Failed to install env file."
 	insinto ${NMRBASE}
 # Which brainiack wrote this!?
@@ -114,7 +113,7 @@ src_install() {
 	doins -r * || die "Failed to install application."
 	dosym ${NMRBASE}/nmrbin.linux9 ${NMRBASE}/bin || die \
 		"Failed to symlink binaries."
-	fperms 775 ${NMRBASE}/nmrbin.linux9/* com/*
+	fperms 775 ${NMRBASE}/{nmrbin.linux9,com,dynamo/tcl}/*
 }
 
 pkg_postinst() {