Fixed some paths for tclxml and ds9.tcl

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 20 insertions, 10 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index d43a4a06963b..c05052c763fa 100644
--- a/sci-astronomy/ds9/ChangeLog
+++ b/sci-astronomy/ds9/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/ds9
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.20 2009/11/04 06:25:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.21 2009/11/24 07:40:17 bicatali Exp $
+
+*ds9-5.7-r1 (24 Nov 2009)
+
+  24 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> -ds9-5.7.ebuild,
+  +ds9-5.7-r1.ebuild, files/ds9-5.7-main.patch:
+  Fixed some paths for tclxml and ds9.tcl
 
 *ds9-5.7 (04 Nov 2009)
 
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index 51212d6d9275..f86c911928a9 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX ds9-5.4-htmlwidget.patch 1483 RMD160 8cc6b7ffb8f78d0172424720a10d0cae34a3d879 SHA1 31d37341d80f545da62f5b9af6bbc2f2b29d6381 SHA256 eb455cae898909705985030d4fec97f139a442fe0d557d5bea3ce7c0fdc96d6c
-AUX ds9-5.7-main.patch 8975 RMD160 451c48a584431190357224c65bdc26df077c1539 SHA1 686f1eb28c059a209bf9445c2f0d3e0bf6cc07ec SHA256 396daae22ffc2d83aae598df24f5e9633bed9b22417e2f3fa8b3cad36faeada2
+AUX ds9-5.7-main.patch 8979 RMD160 b599daffc93f6fd8543c85afcfc55483ce83437c SHA1 615db4517031cd1bd77a8917b04d7a41a5f3015e SHA256 3cab726b035ea4f2d7097202e20b524726cee395b74c15a72f719362b2d79952
 AUX ds9-5.7-makefile.patch 998 RMD160 d4debc34c21f9af654ec7c3c81f1600cbe896225 SHA1 1feb11091b3a8707535ffb073e7d5e5929429404 SHA256 6d96786533f288e14e4ed2a82bcfa0c37d1314a9d88c9500c779d95a97bf5f3f
 AUX ds9-5.7-saotk.patch 4907 RMD160 bbadc06a9ae2a1eb397b1f649f84054e32f19c8d SHA1 b4c787d985f5895f53dcc7da4a166897ac72b1ca SHA256 974a2a214fe8ca516d2bd5c53061dd23e6112f63f1e9d49a5e7d5c83c4adbfb0
 AUX ds9-5.7-src.patch 1377 RMD160 9e768d3edd612e108d20da2aa01fc160b6a1b49e SHA1 23ab4788007067869d4ef2e01e0b4bae89e238d8 SHA256 847822b8f244afe1941ef69b5f3f05abea6a5eb2ae8b8d8b46fc47a3a5003a0d
@@ -10,13 +10,13 @@ AUX ds9-5.7-tcl85.patch 414 RMD160 b7a96449e52798bafab7661d5b682d4d8ac14baf SHA1
 AUX ds9.png 3622 RMD160 4429d2de155ff272d58dddd447ea193bb33a78ab SHA1 0d1b655ba190ac4067ddd7efb95cec023754f3af SHA256 ff5f38cfdfd59aee262ae3443fddf35d644b8604c9d6ab07eb96a137ee0a0d28
 AUX make.gentoo 237 RMD160 b0de6c53dca48199106aaec86e950d517d94bfb7 SHA1 2ccddb02a71c97acc63ec48dccf2b904b2b5cc1b SHA256 15b7b6aebaf733c4e88818119938718a3a7b89c7a255452f4b0cbfa0a1061bd6
 DIST ds9.5.7.tar.gz 35061076 RMD160 1be5c1d8e14b0add4859cf6ff354841c56b9ebe1 SHA1 5d976cd69ac1f0b7ac7d255acf9f94ff2f45b7a4 SHA256 39ce857c75d408b3fff3e9fec0a7face2f68e5234c4a9ad1b3f43eceb1a4e114
-EBUILD ds9-5.7.ebuild 1792 RMD160 c16b2ffae73ee58c2a08a90bcbabc95eb054f61d SHA1 05acd41b26b4b5cc9152b3e3698528d5c8fc53c0 SHA256 f64f46b298ee7ca8561ed44b1866de4d144acddddacae05dc7ae770ed4654d2b
-MISC ChangeLog 4271 RMD160 7591b4528b915d6f808847955e9a9b8126c545c5 SHA1 0c19956bc6b58e315d6a81540ad68a43251343f3 SHA256 20be995f19087ede5939cc365c603ab7e1916e6bd7c31cf2b87033e0c0c866f2
+EBUILD ds9-5.7-r1.ebuild 1950 RMD160 95b821ce3d71a1dda98eaf17d24b5931adcf30ce SHA1 dfb92cfbc9e700c0bfb969322f011a24dd68b11d SHA256 656340c49370968f57962848dc0b87cb344d3db88423649fcf89e2ac161357bc
+MISC ChangeLog 4461 RMD160 47d6ce805b3dde31fbe062b57edb5e8e8ead34eb SHA1 49d70451bd17686970586d760ba06c2df25fffd8 SHA256 05e3228bc35581a3346953250db8078eb0ef284a05937805c84ed38c52de1e12
 MISC metadata.xml 1072 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 SHA1 1cefcee915ef90f64beb486d298972981ea3891e SHA256 42893aa6c35591819017a8708062c88df98d27ab0466ec07d7603b46d6e3719e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrxKFQACgkQ1ycZbhPLE2DIDgCfV1eQNEV1JQeUGUUsx03PkQwI
-/LYAoIl2AuUFHhJCQB175NJGOqk4vn1B
-=ms2d
+iEYEARECAAYFAksLl38ACgkQ1ycZbhPLE2CROgCffRU3k2t/I8aFU8CVReHPufr9
+ChgAnR0fztFBNO8m5j2gO1FywyKvXK27
+=+Eus
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/ds9/ds9-5.7.ebuild b/sci-astronomy/ds9/ds9-5.7-r1.ebuild
index 15dcb102fbe2..6d2762445686 100644
--- a/sci-astronomy/ds9/ds9-5.7.ebuild
+++ b/sci-astronomy/ds9/ds9-5.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7.ebuild,v 1.1 2009/11/04 06:25:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7-r1.ebuild,v 1.1 2009/11/24 07:40:17 bicatali Exp $
 
 EAPI=2
 inherit eutils
@@ -50,7 +50,11 @@ src_prepare() {
 }
 
 src_install () {
-	dobin bin/ds9 || die "failed installing ds9 binary"
+	newbin bin/ds9 ds9.exe || die "failed installing ds9 binary"
+	echo "#!/bin/sh" > ds9
+	echo "LD_LIBRARY_PATH=$(dir -d ${ROOT}usr/$(get_libdir)/Tclxml*) ds9.exe" >> ds9.sh
+	exeinto /usr/bin
+	newexe ds9.sh ds9
 	insinto /usr/share/${PN}
 	doins -r ds9/zipdir/zvfsmntpt/* || die
 	dodoc README acknowledgement || die "failed installing basic doc"
diff --git a/sci-astronomy/ds9/files/ds9-5.7-main.patch b/sci-astronomy/ds9/files/ds9-5.7-main.patch
index 588aa6dcab67..802068abdbc6 100644
--- a/sci-astronomy/ds9/files/ds9-5.7-main.patch
+++ b/sci-astronomy/ds9/files/ds9-5.7-main.patch
@@ -24,7 +24,7 @@ diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
  
    // invoke startup script
 -  TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
-+  TclSetStartupScriptFileName("/usr/share/ds9/ds9.tcl");
++  TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl");
  }
  
  Tcl_Interp *global_interp;