Fixed ds9 script for paths. Might be broken for xml, only time will tell

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

5 files changed, 31 insertions, 23 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index c05052c763fa..d15090adf90a 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.21 2009/11/24 07:40:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.22 2009/11/25 07:32:54 bicatali Exp $
+
+*ds9-5.7-r2 (25 Nov 2009)
+
+  25 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> -ds9-5.7-r1.ebuild,
+  +ds9-5.7-r2.ebuild, files/ds9-5.7-main.patch, files/ds9-5.7-src.patch:
+  Fixed ds9 script for paths. Might be broken for xml, only time will tell
 
 *ds9-5.7-r1 (24 Nov 2009)
 
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index f86c911928a9..e48bd8b30b99 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA1
 
 AUX ds9-5.4-htmlwidget.patch 1483 RMD160 8cc6b7ffb8f78d0172424720a10d0cae34a3d879 SHA1 31d37341d80f545da62f5b9af6bbc2f2b29d6381 SHA256 eb455cae898909705985030d4fec97f139a442fe0d557d5bea3ce7c0fdc96d6c
-AUX ds9-5.7-main.patch 8979 RMD160 b599daffc93f6fd8543c85afcfc55483ce83437c SHA1 615db4517031cd1bd77a8917b04d7a41a5f3015e SHA256 3cab726b035ea4f2d7097202e20b524726cee395b74c15a72f719362b2d79952
+AUX ds9-5.7-main.patch 9049 RMD160 fd433707846899da21be27f0797481bb23d406f0 SHA1 288695f253f39a06ffb338c4c4e198ed4fcc4cbe SHA256 81312df5361ff60f78d37329f250614814bc4b142105a412f87a5b47006f8136
 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
+AUX ds9-5.7-src.patch 1328 RMD160 ae66660bad5f860d410b93565722cf039a007f51 SHA1 df1fdf900ecbd527ae4d960be067f00e5160624c SHA256 f3bd7910f746aff7bb04736674c35d747e9fb09d5dcb597c216f1c55a3f65e15
 AUX ds9-5.7-tcl85.patch 414 RMD160 b7a96449e52798bafab7661d5b682d4d8ac14baf SHA1 c843c1f0e1a710eab452b79c9b1b0d2f2e03a797 SHA256 554358ed24a1b537cccdadaade241362d38fe6d86e5b481c9b18e96f1ce655ea
 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-r1.ebuild 1950 RMD160 95b821ce3d71a1dda98eaf17d24b5931adcf30ce SHA1 dfb92cfbc9e700c0bfb969322f011a24dd68b11d SHA256 656340c49370968f57962848dc0b87cb344d3db88423649fcf89e2ac161357bc
-MISC ChangeLog 4461 RMD160 47d6ce805b3dde31fbe062b57edb5e8e8ead34eb SHA1 49d70451bd17686970586d760ba06c2df25fffd8 SHA256 05e3228bc35581a3346953250db8078eb0ef284a05937805c84ed38c52de1e12
+EBUILD ds9-5.7-r2.ebuild 1972 RMD160 16e2a0a196e21c5428291b6f1706e210bdbd3c32 SHA1 90401405f692ecd81696fe149187318041d6f9c9 SHA256 8429a22ef030b81300ebf3b561118edef13f96566d7b9b13a85e712371625b9d
+MISC ChangeLog 4712 RMD160 c116aea6f2ee768e38d98b788021efeeba50db7e SHA1 986646e42bc8df1e25eed59626cfd41dd5ff4e62 SHA256 3c0925d66bb284058393cdd012974d7a7cadeba659f2fcd2f9a089b5164e3ca3
 MISC metadata.xml 1072 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 SHA1 1cefcee915ef90f64beb486d298972981ea3891e SHA256 42893aa6c35591819017a8708062c88df98d27ab0466ec07d7603b46d6e3719e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksLl38ACgkQ1ycZbhPLE2CROgCffRU3k2t/I8aFU8CVReHPufr9
-ChgAnR0fztFBNO8m5j2gO1FywyKvXK27
-=+Eus
+iEYEARECAAYFAksM5z8ACgkQ1ycZbhPLE2BjjACfRfBSP5bZHqDZS5L+t27mDfDB
+yJEAoJJpTwoPgNKMca0EU92g9Mo6hGsg
+=yL7R
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/ds9/ds9-5.7-r1.ebuild b/sci-astronomy/ds9/ds9-5.7-r2.ebuild
index 6d2762445686..a0a8e8fbcbc3 100644
--- a/sci-astronomy/ds9/ds9-5.7-r1.ebuild
+++ b/sci-astronomy/ds9/ds9-5.7-r2.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-r1.ebuild,v 1.1 2009/11/24 07:40:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7-r2.ebuild,v 1.1 2009/11/25 07:32:54 bicatali Exp $
 
 EAPI=2
 inherit eutils
@@ -52,7 +52,7 @@ src_prepare() {
 src_install () {
 	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
+	echo "LD_LIBRARY_PATH=$(dir -d ${ROOT}usr/$(get_libdir)/Tclxml?.?):\${LD_LIBRARY_PATH} ds9.exe" >> ds9.sh
 	exeinto /usr/bin
 	newexe ds9.sh ds9
 	insinto /usr/share/${PN}
diff --git a/sci-astronomy/ds9/files/ds9-5.7-main.patch b/sci-astronomy/ds9/files/ds9-5.7-main.patch
index 802068abdbc6..08039779c825 100644
--- a/sci-astronomy/ds9/files/ds9-5.7-main.patch
+++ b/sci-astronomy/ds9/files/ds9-5.7-main.patch
@@ -1,6 +1,6 @@
 diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
---- saods9.orig/ds9/ds9.C	2009-11-04 02:32:16.000000000 +0000
-+++ saods9/ds9/ds9.C	2009-11-04 02:58:59.000000000 +0000
+--- saods9.orig/ds9/ds9.C	2009-10-01 17:53:59.000000000 +0100
++++ saods9/ds9/ds9.C	2009-11-25 07:43:52.000000000 +0000
 @@ -13,8 +13,6 @@
  
    void TclSetStartupScriptFileName(const char*);
@@ -101,10 +101,14 @@ diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
    // IIS
    if (Iis_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
-@@ -194,84 +147,6 @@
-   if (Tclxml_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
+@@ -190,88 +143,6 @@
+   Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init, 
+ 		     (Tcl_PackageInitProc*)NULL);
  
+-  // Tclxml
+-  if (Tclxml_Init(interp) == TCL_ERROR)
+-    return TCL_ERROR;
+-
 -  // Tkimg
 -  if (Tkimg_Init(interp) == TCL_ERROR)
 -    return TCL_ERROR;
@@ -186,7 +190,7 @@ diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
    // Signal_Ext
  #ifndef _WIN32
    if (Signal_ext_Init(interp) == TCL_ERROR)
-@@ -294,15 +169,6 @@
+@@ -294,15 +165,6 @@
  		     (Tcl_PackageInitProc*)NULL);
  #endif
  
@@ -203,8 +207,8 @@ diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
  }
  
 diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile
---- saods9.orig/ds9/Makefile	2009-11-04 02:32:16.000000000 +0000
-+++ saods9/ds9/Makefile	2009-11-04 03:10:28.000000000 +0000
+--- saods9.orig/ds9/Makefile	2009-09-30 21:35:26.000000000 +0100
++++ saods9/ds9/Makefile	2009-11-25 07:42:35.000000000 +0000
 @@ -4,12 +4,7 @@
  #--------------------------defines
  
@@ -302,11 +306,11 @@ diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile
 +	$(RM) $@
 +	rm -f libstdc++.a
 +	ln -s `$(CXX) -print-file-name=libstdc++.a` .
-+	$(CXX) ${LDFLAGS} \
++	$(CXX) $(LDFLAGS) \
 +	$(OBJS) $(LIBS) -o $@ \
 +	-Wl,-Bstatic -L. -lstdc++ \
 +	-Wl,-Bdynamic -L$(X11LIB) -lX11 \
-+	-ldl -lpthread -lxml2 -L/usr/lib/$(TCLXMLVER) -lTclxml3.2 \
++	-ldl -lpthread -lxml2 \
 +	-ltk -ltcl -lBLT24 \
 +	-lfuntools `pkg-config --libs wcstools` -lz \
 +	`ast_link`
diff --git a/sci-astronomy/ds9/files/ds9-5.7-src.patch b/sci-astronomy/ds9/files/ds9-5.7-src.patch
index d60870b2f942..e64d2e73ca41 100644
--- a/sci-astronomy/ds9/files/ds9-5.7-src.patch
+++ b/sci-astronomy/ds9/files/ds9-5.7-src.patch
@@ -1,6 +1,6 @@
 --- saods9.orig/src/ds9.tcl	2009-11-04 02:32:17.000000000 +0000
 +++ saods9/src/ds9.tcl	2009-11-04 02:50:39.000000000 +0000
-@@ -34,24 +34,34 @@
+@@ -34,24 +34,32 @@
  option add {*Label*BorderWidth} 2
  
  # initialize
@@ -13,7 +13,6 @@
 +package require http
  
 -source $ds9(root)/tk8.4/tearoff.tcl
-+package require tearoff
  
 -source $ds9(root)/tcllib1.10/base64/base64.tcl
 -source $ds9(root)/tcllib1.10/log/log.tcl
@@ -33,7 +32,6 @@
 +package require textutil::tabify
 +
 +package require tkcon
-+package require xmlrpc
 +
 +package require BLT
 +package require Tktable