removed sci-astronomy/ds9

13 files changed, 0 insertions, 1265 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
deleted file mode 100644
index 53f6475b8502..000000000000
--- a/sci-astronomy/ds9/ChangeLog
+++ /dev/null
@@ -1,138 +0,0 @@
-# ChangeLog for sci-astronomy/ds9
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.25 2011/08/04 18:36:23 bicatali Exp $
-
-  04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
-  Switched herd to sci-astronomy
-
-  13 Jun 2011; Justin Lecher <jlec@gentoo.org> -files/ds9.png,
-  ds9-5.7-r2.ebuild, ds9-6.0.ebuild:
-  No binaryfiles in VCS please, #370869
-
-*ds9-6.0 (29 Jan 2010)
-
-  29 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> +ds9-6.0.ebuild,
-  +files/ds9-6.0-main.patch:
-  Version bump
-
-*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)
-
-  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)
-
-  04 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/ds9-5.1-gcc4.2-x86.patch, -ds9-5.2.ebuild,
-  -files/ds9-5.2-Makefile.patch, -files/ds9-5.2-gcc43.patch,
-  -files/ds9-5.4-gcc43.patch, -files/ds9-5.4-saotk.patch, -ds9-5.5.ebuild,
-  -files/ds9-5.5-main.patch, -files/ds9-5.5-makefile.patch,
-  -files/ds9-5.5-src.patch, +ds9-5.7.ebuild, +files/ds9-5.7-main.patch,
-  +files/ds9-5.7-makefile.patch, +files/ds9-5.7-saotk.patch,
-  +files/ds9-5.7-src.patch, +files/ds9-5.7-tcl85.patch, +files/ds9.png:
-  Version bump. Updated all patches, added icon and fix for tcl-8.5 (bug
-  #267558)
-
-  25 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/ds9-5.4-fitsy.patch, -files/ds9-5.4-main.patch,
-  -files/ds9-5.4-makefile.patch, -files/ds9-5.4-src.patch, -ds9-5.4.ebuild,
-  ds9-5.5.ebuild:
-  Removed old version
-
-  17 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  files/ds9-5.5-main.patch:
-  Now propagate LDFLAGS
-
-  17 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> ds9-5.4.ebuild,
-  ds9-5.5.ebuild:
-  Forced newer ast-4.6.2-r1 dependency
-
-*ds9-5.5 (17 Feb 2009)
-
-  17 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/ds9-5.5-main.patch, +files/ds9-5.5-makefile.patch,
-  +files/ds9-5.5-src.patch, +ds9-5.5.ebuild:
-  Version bump
-
-  09 Jan 2009; Joseph Jezak <josejx@gentoo.org> ds9-5.4.ebuild:
-  Marked ~ppc for bug #253299.
-
-  20 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> ds9-5.4.ebuild:
-  Added x11-libs/xpa dependency
-
-  07 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> ds9-5.2.ebuild:
-  Added block for x11-libs/xpa on ds9-5.2
-
-*ds9-5.4 (05 Nov 2008)
-
-  05 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/ds9-5.1-Makefile.patch, -files/ds9-5.1-tk-gif.patch,
-  +files/ds9-5.4-fitsy.patch, +files/ds9-5.4-gcc43.patch,
-  +files/ds9-5.4-htmlwidget.patch, +files/ds9-5.4-main.patch,
-  +files/ds9-5.4-makefile.patch, +files/ds9-5.4-saotk.patch,
-  +files/ds9-5.4-src.patch, +files/make.gentoo, -ds9-5.1.ebuild,
-  +ds9-5.4.ebuild:
-  Version bump. Added a bunch of patches to allow using system libs.
-
-  22 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> ds9-5.2.ebuild:
-  Fixed patch location for x86 and a sed function
-
-  20 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  files/ds9-5.2-Makefile.patch:
-  More forced strip removing
-
-*ds9-5.2 (16 Apr 2008)
-
-  16 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  files/ds9-5.1-gcc4.2-x86.patch, +files/ds9-5.2-Makefile.patch,
-  +files/ds9-5.2-gcc43.patch, ds9-5.1.ebuild, +ds9-5.2.ebuild:
-  Version bump, with gcc-4.3 patch and adapted bug #189118 patch to avoid
-  emacs dependency
-
-  14 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/ds9-5.0-Makefile.patch, +files/ds9-5.1-tk-gif.patch,
-  -ds9-5.0.ebuild, ds9-5.1.ebuild:
-  Fixed security bug in internal copy to tk (bug #208464), removed older
-  affected version.
-
-  23 Jan 2008; Markus Dittrich <markusle@gentoo.org>
-  +files/ds9-5.1-gcc4.2-x86.patch, ds9-5.1.ebuild:
-  Fixed stack-smashing problems on x86 (see bug #207102). Thanks much
-  to hsgg <hsggebhardt@gmail.com> for his patch.
-
-*ds9-5.1 (15 Jan 2008)
-
-  15 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/ds9-4.13-Makefile.patch, +files/ds9-5.1-Makefile.patch,
-  -ds9-4.13.ebuild, +ds9-5.1.ebuild:
-  Version bump
-
-*ds9-5.0 (02 Nov 2007)
-
-  02 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/ds9-5.0-Makefile.patch, +ds9-5.0.ebuild:
-  Version bump
-
-  02 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> ds9-4.13.ebuild:
-  fixed for compiler (bug #197396, thanks Joshua Rich)
-
-  17 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> ds9-4.13.ebuild:
-  added virtual/xemacs as possible provider of etags
-
-  16 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> ds9-4.13.ebuild:
-  added virtual/emacs dep to build with etags. Thanks to Kirill Sokolovsky
-  <kirx@saistud.sai.msu.ru>, closing bug #189118
-
-*ds9-4.13 (02 Aug 2007)
-
-  02 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/ds9-4.13-Makefile.patch, +metadata.xml, +ds9-4.13.ebuild:
-  Initial import. Closing bug #65657
-
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
deleted file mode 100644
index 87535e0d6fea..000000000000
--- a/sci-astronomy/ds9/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ds9-5.4-htmlwidget.patch 1483 RMD160 8cc6b7ffb8f78d0172424720a10d0cae34a3d879 SHA1 31d37341d80f545da62f5b9af6bbc2f2b29d6381 SHA256 eb455cae898909705985030d4fec97f139a442fe0d557d5bea3ce7c0fdc96d6c
-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 1328 RMD160 ae66660bad5f860d410b93565722cf039a007f51 SHA1 df1fdf900ecbd527ae4d960be067f00e5160624c SHA256 f3bd7910f746aff7bb04736674c35d747e9fb09d5dcb597c216f1c55a3f65e15
-AUX ds9-5.7-tcl85.patch 414 RMD160 b7a96449e52798bafab7661d5b682d4d8ac14baf SHA1 c843c1f0e1a710eab452b79c9b1b0d2f2e03a797 SHA256 554358ed24a1b537cccdadaade241362d38fe6d86e5b481c9b18e96f1ce655ea
-AUX ds9-6.0-main.patch 9010 RMD160 2c7a03b197259a0daeeb3f7121954ebcab57165d SHA1 cd5c25f21e1090a3f9ad28c8722559a66dc6b191 SHA256 5720e18a7f2a4f1e821baeeee98407462594ace47e8f431d204b8b4cddddf143
-AUX make.gentoo 237 RMD160 b0de6c53dca48199106aaec86e950d517d94bfb7 SHA1 2ccddb02a71c97acc63ec48dccf2b904b2b5cc1b SHA256 15b7b6aebaf733c4e88818119938718a3a7b89c7a255452f4b0cbfa0a1061bd6
-DIST ds9.5.7.tar.gz 35061076 RMD160 1be5c1d8e14b0add4859cf6ff354841c56b9ebe1 SHA1 5d976cd69ac1f0b7ac7d255acf9f94ff2f45b7a4 SHA256 39ce857c75d408b3fff3e9fec0a7face2f68e5234c4a9ad1b3f43eceb1a4e114
-DIST ds9.6.0.tar.gz 44899040 RMD160 4b8979974057cdc506a02ea67f3559f14f830f83 SHA1 ae4bef3c636f69ad0df1f488d08e4fd99e0c78bf SHA256 ebf7b85b8adb4495470bbebf1ca2f13a8ba75ca5df66e21a4575ac931d924837
-DIST ds9.png.tar 10240 RMD160 d2e8a132ee2e62bc6c1a140c20be8ef7e3faf3dc SHA1 75de9ab1c0c07718a4985b1bf7c1d51440c454ae SHA256 a1a7c64b3de0374e04e06e7d7154d110bb518a6f5f95fd46e0a5a85ed5e1aa71
-EBUILD ds9-5.7-r2.ebuild 2010 RMD160 a0d8c1dd08ffb9f2b8b41d0fa5bae03592b5d292 SHA1 fe43196b330c20a2fe2f9e17a029e6405b75f707 SHA256 5a91cbdacbcf3d9fe3536c868380a7e08c1efe1d6fddead1d7aaf689988c2fff
-EBUILD ds9-6.0.ebuild 2007 RMD160 f8d5b568aedd1e6a902b1e906db726d962f1bcef SHA1 fb2d06ed9ce007cf824ed23ccff330efeac1188e SHA256 b4cf612221b7d6fb4fd3d2e94c669d6a0c519ae9987947a1eda281df09109686
-MISC ChangeLog 5097 RMD160 dc449c56b1a779ae6cc14f0a7bf5ed1691c43305 SHA1 7ef0de156031c17a04cdb13d127cf2c02ee09b10 SHA256 561f5e6768a00d8e4d09779182662d71965301a87c4c013a960a9cf311368119
-MISC metadata.xml 1082 RMD160 d598fa5addb6926724d9ff5aad5a5bcfafa62609 SHA1 5bfcaaa579e416b95b18aa8d4e2931bd9a7fd40c SHA256 bc93ce476ed3cad14d24570369fdc19c0cd823f0da6a1a657785ebba320684c7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk465v8ACgkQ1ycZbhPLE2CwBQCeMKR6I+rH105wG9zFW09lKA7C
-JdYAn1AfMYYuDl549YvfYCxG8FC/iA+P
-=yk7E
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/ds9/ds9-5.7-r2.ebuild b/sci-astronomy/ds9/ds9-5.7-r2.ebuild
deleted file mode 100644
index e83a76290402..000000000000
--- a/sci-astronomy/ds9/ds9-5.7-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7-r2.ebuild,v 1.2 2011/06/13 11:47:24 jlec Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Data visualization application for astronomical FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
-	http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-tcltk/blt
-	>=dev-tcltk/tcllib-1.10
-	>=dev-tcltk/tclxml-3.1
-	dev-tcltk/tkcon
-	dev-tcltk/tkimg
-	dev-tcltk/tktable
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/xpa
-	sci-astronomy/ast
-	sci-astronomy/funtools"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/sao${PN}"
-
-src_prepare() {
-	# some patches are adapted from fedora
-	# most of them are to use system libraries instead of bundled-ones
-	epatch \
-		"${FILESDIR}"/${PN}-5.4-htmlwidget.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-src.patch \
-		"${FILESDIR}"/${P}-main.patch \
-		"${FILESDIR}"/${P}-saotk.patch \
-		"${FILESDIR}"/${P}-tcl85.patch
-
-	# remove build-time dependency on etags (i.e. emacs or xemacs)
-	sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed"
-
-	cp "${FILESDIR}"/make.gentoo make.include
-	use amd64 && \
-		export EXTRA_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-	export OPTS="${CXXFLAGS}"
-}
-
-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?.?):\${LD_LIBRARY_PATH} 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"
-	dosym  ../../${PN}/doc /usr/share/doc/${PF}/html
-	doicon "${WORKDIR}"/${PN}.png
-	make_desktop_entry ds9 "SAOImage DS9"
-}
diff --git a/sci-astronomy/ds9/ds9-6.0.ebuild b/sci-astronomy/ds9/ds9-6.0.ebuild
deleted file mode 100644
index 05c25aa45e95..000000000000
--- a/sci-astronomy/ds9/ds9-6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-6.0.ebuild,v 1.2 2011/06/13 11:47:24 jlec Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Data visualization application for astronomical FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
-	http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-tcltk/blt
-	>=dev-tcltk/tcllib-1.10
-	>=dev-tcltk/tclxml-3.1
-	dev-tcltk/tkcon
-	dev-tcltk/tkimg
-	dev-tcltk/tktable
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/xpa
-	sci-astronomy/ast
-	sci-astronomy/funtools"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/sao${PN}"
-
-src_prepare() {
-	# some patches are adapted from fedora
-	# most of them are to use system libraries instead of bundled-ones
-	epatch \
-		"${FILESDIR}"/${PN}-5.4-htmlwidget.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-src.patch \
-		"${FILESDIR}"/${P}-main.patch \
-		"${FILESDIR}"/${P}-saotk.patch \
-		"${FILESDIR}"/${P}-tcl85.patch
-
-	# remove build-time dependency on etags (i.e. emacs or xemacs)
-	sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed"
-
-	cp "${FILESDIR}"/make.gentoo make.include
-	use amd64 && \
-		export EXTRA_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-	export OPTS="${CXXFLAGS}"
-}
-
-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?.?):\${LD_LIBRARY_PATH} 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"
-	dosym  ../../${PN}/doc /usr/share/doc/${PF}/html
-	doicon "${WORKDIR}"/${PN}.png
-	make_desktop_entry ds9 "SAOImage DS9"
-}
diff --git a/sci-astronomy/ds9/files/ds9-5.4-htmlwidget.patch b/sci-astronomy/ds9/files/ds9-5.4-htmlwidget.patch
deleted file mode 100644
index 98eb17a500e7..000000000000
--- a/sci-astronomy/ds9/files/ds9-5.4-htmlwidget.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- saods9.orig/htmlwidget/configure	2006-05-01 19:47:09.000000000 +0200
-+++ saods9/htmlwidget/configure	2008-03-08 16:36:40.000000000 +0100
-@@ -1052,11 +1052,11 @@
-   echo "$ac_t""$BUILD_TCLSH" 1>&6
- else
-   if test "$with_tcl" != ""; then
--    if test -x "$with_tcl/$tclsubdir/tclsh"; then
--      BUILD_TCLSH=$with_tcl/$tclsubdir/tclsh
-+    if test -x "$with_tcl/tclsh"; then
-+      BUILD_TCLSH=$with_tcl/tclsh
-     else
--      if test -x "$with_tcl/$tclsubdir/tclsh8.0"; then
--        BUILD_TCLSH=$with_tcl/$tclsubdir/tclsh8.0
-+      if test -x "$with_tcl/tclsh8.0"; then
-+        BUILD_TCLSH=$with_tcl/tclsh8.0
-       fi
-     fi
-   fi
-@@ -1137,7 +1137,7 @@
- if test "$enable_shared" = "yes"; then
-   ok=0
-   if test "$with_tcl" != ""; then
--    tclconf=$with_tcl/unix/tclConfig.sh
-+    tclconf=$with_tcl/tclConfig.sh
-     
- ac_safe=`echo "$tclconf" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $tclconf""... $ac_c" 1>&6
-@@ -1494,7 +1494,7 @@
-   TARGET_TCL_LIBS="$config_TARGET_TCL_LIBS"
- else
-   if test "$with_tcl" != ""; then
--    extra=`echo $with_tcl/$tclsubdir/libtcl8*.a`
-+    extra=`echo -ltcl`
-   fi
-   CC=$TARGET_CC
-   echo $ac_n "checking for sin""... $ac_c" 1>&6
---- saods9.orig/htmlwidget/src/htmlcmd.c	2002-06-20 22:19:33.000000000 +0100
-+++ saods9/htmlwidget/src/htmlcmd.c	2008-11-05 12:31:11.000000000 +0000
-@@ -23,6 +23,7 @@
- **   drh@acm.org
- **   http://www.hwaci.com/drh/
- */
-+#include <string.h>
- #include <tk.h>
- #include <stdlib.h>
- #include "htmlcmd.h"
diff --git a/sci-astronomy/ds9/files/ds9-5.7-main.patch b/sci-astronomy/ds9/files/ds9-5.7-main.patch
deleted file mode 100644
index 08039779c825..000000000000
--- a/sci-astronomy/ds9/files/ds9-5.7-main.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
---- 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*);
- 
--  int Zvfs_Init(Tcl_Interp*);
--  int Zvfs_Mount(Tcl_Interp*, char*, char *);
- 
-   int Blt_Init(Tcl_Interp*);
-   int Tktable_Init(Tcl_Interp*);
-@@ -73,15 +71,13 @@
-   appname = dupstr(argv[0]);
- 
-   // set default encoding dir
--  Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4");
- 
-   // so that tcl and tk know where to find their libs
-   // we do it here before InitLibraryPath is called
--  putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4");
--  putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4");
-+
- 
-   // invoke startup script
--  TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
-+  TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl");
- }
- 
- Tcl_Interp *global_interp;
-@@ -100,31 +96,8 @@
-   // We have to initialize the virtual filesystem before calling
-   // Tcl_Init().  Otherwise, Tcl_Init() will not be able to find
-   // its startup script files.
--  if (Zvfs_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, 
--		     (Tcl_PackageInitProc*)NULL);
- 
-   // find current working directory, and set as mount point
--  {
--    Tcl_DString pwd;
--    Tcl_DStringInit(&pwd);
--    Tcl_GetCwd(interp, &pwd);
--#ifdef ZIPFILE
--    ostringstream str;
--    str << (char *)Tcl_GetNameOfExecutable() 
--	<< "/../ds9.zip" 
--	<<  ends;
--    if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){
--      cerr << "ERROR: The auxiliary ds9 file 'ds9.zip' is missing. If you moved the ds9 program from its original location, please also move the zip file to the same place." << endl;
--      exit(1);
--    }
--#else
--    Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(), 
--	       Tcl_DStringValue(&pwd));
--#endif
--    Tcl_DStringFree(&pwd);
--  }
- 
-   // Initialize Tcl and Tk
-   if (Tcl_Init(interp))
-@@ -133,7 +106,6 @@
-   // Tk
-   if (Tk_Init(interp))
-     return TCL_ERROR;
--  Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
- 
-   {
-     Tcl_DString pwd;
-@@ -142,18 +114,6 @@
-     Tcl_DStringFree(&pwd);
-   }
- 
--  // Blt
--  if (Blt_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "BLT", Blt_Init, 
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tktable
--  if (Tktable_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "Tktable", Tktable_Init, 
--		     (Tcl_PackageInitProc*)NULL);
--
-   // Checkdns
-   if (Checkdns_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-@@ -171,13 +131,6 @@
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
- 		     (Tcl_PackageInitProc*)NULL);
--
--  // Tclxpa
--  if (Tclxpa_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
-   // IIS
-   if (Iis_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;
--  Tcl_StaticPackage (interp, "img", 
--		     Tkimg_Init,(Tcl_PackageInitProc*)NULL);
--
--  // zlibtcl
--  if (Zlibtcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // jpegtcl
--  if (Jpegtcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgjpeg
--  if (Tkimgjpeg_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tifftcl
--  if (Tifftcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgtiff
--  if (Tkimgtiff_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Pngtcl
--  if (Pngtcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgpng
--  if (Tkimgpng_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimggif
--  if (Tkimggif_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "gif", Tkimggif_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgppm
--  if (Tkimgppm_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "ppm", Tkimgppm_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgbmp
--  if (Tkimgbmp_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "bmp", Tkimgbmp_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgxbm
--  if (Tkimgxbm_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "xbm", Tkimgxbm_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgwindow
--  if (Tkimgwindow_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
-   // Signal_Ext
- #ifndef _WIN32
-   if (Signal_ext_Init(interp) == TCL_ERROR)
-@@ -294,15 +165,6 @@
- 		     (Tcl_PackageInitProc*)NULL);
- #endif
- 
--  // Variables
--  Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); 
--  Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY);
--  Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
--  Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
--  Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY);
--
--  //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
--
-   return TCL_OK;
- }
- 
-diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile
---- 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
- 
- ZDIR	= zipdir/zvfsmntpt
--FFILES	= $(ZDIR)/$(TCLVER) \
--	$(ZDIR)/$(TKVER) \
--	$(ZDIR)/$(BLTVER) \
--	$(ZDIR)/$(TCLLIBVER) \
--	$(ZDIR)/$(TKCONVER) \
--	$(ZDIR)/$(XMLRPCVER) \
-+FFILES	= \
- 	$(ZDIR)/src \
- 	$(ZDIR)/msgs \
- 	$(ZDIR)/doc \
-@@ -30,39 +25,14 @@
- 	../lib/libsaotk.a \
- 	../lib/libtkhtml.a \
- 	../lib/libtkmpeg.a \
--	../lib/$(TCLXMLVER)/libTclxml3.2.a \
--	../lib/$(TKIMGVER)/libtkimgwindow1.3.a \
--	../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \
--	../lib/$(TKIMGVER)/libjpegtcl1.0.a \
--	../lib/$(TKIMGVER)/libtkimgtiff1.3.a \
--	../lib/$(TKIMGVER)/libtifftcl3.6.1.a \
--	../lib/$(TKIMGVER)/libtkimgpng1.3.a \
--	../lib/$(TKIMGVER)/libpngtcl1.2.6.a \
--	../lib/$(TKIMGVER)/libtkimgppm1.3.a \
--	../lib/$(TKIMGVER)/libtkimggif1.3.a \
--	../lib/$(TKIMGVER)/libtkimgbmp1.3.a \
--	../lib/$(TKIMGVER)/libtkimgxbm1.3.a \
--	../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \
--	../lib/$(TKIMGVER)/libtkimg1.3.a \
--	../lib/$(TKTABLEVER)/libTktable2.9.a \
--	../lib/libfuntools.a \
- 	../lib/librice.a \
- 	../lib/libhcomp.a \
- 	../lib/libplio.a \
--	../lib/libast.a \
- 	../lib/libsaotk.a \
--	../lib/libwcs.a \
- 	../lib/libsla.a \
--	../lib/libzvfs.a \
--	../lib/libzip.a \
--	../lib/libz.a \
--	../lib/libxpa.a \
- 	../lib/libiis.a \
- 	../lib/libcheckdns.a \
--	../lib/libsignal_ext.a \
--	../lib/libBLT24.a \
--	../lib/libtk8.4.a \
--	../lib/libtcl8.4.a
-+	../lib/libsignal_ext.a
- endif
- 
- ifeq ($(OS),windows)
-@@ -165,12 +135,9 @@
- ifneq (,$(findstring leopard,$(ARCH)))
- CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE) -DZIPFILE
- 
--ds9	: ds9Base ds9.zip
-+ds9	: ds9Base
- 	$(RM) $@
--	cp ds9Base ds9
--	strip ds9
--	cp ds9 ../bin/.
--	cp ds9.zip ../bin/.
-+	cp ds9Base ../bin/ds9
- 	cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
- 
- debug	: ds9Base ds9.zip
-@@ -180,14 +147,9 @@
- ds9.zip	: $(FILES)
- 	cd zipdir; zip -r9 ../ds9.zip *	
- else
--ds9	: null.zip ds9Base $(FILES)
-+ds9	: ds9Base $(FILES)
- 	$(RM) $@
--	cp ds9Base ds9.zip
--	strip ds9.zip
--	cat null.zip >> ds9.zip
--	cd zipdir; zip -rA9 ../ds9.zip *
--	mv ds9.zip ds9
--	cp ds9 ../bin/.
-+	cp ds9Base ../bin/ds9
- 
- debug	: null.zip ds9Base $(FILES)
- 	$(RM) $@
-@@ -359,6 +321,23 @@
- 
- #--------------------------linux
- 
-+# for gentoo: get rid of bundled libs
-+ifneq (,$(findstring gentoo,$(ARCH)))
-+ds9Base	: $(OBJS) $(LIBS)
-+	$(RM) $@
-+	rm -f libstdc++.a
-+	ln -s `$(CXX) -print-file-name=libstdc++.a` .
-+	$(CXX) $(LDFLAGS) \
-+	$(OBJS) $(LIBS) -o $@ \
-+	-Wl,-Bstatic -L. -lstdc++ \
-+	-Wl,-Bdynamic -L$(X11LIB) -lX11 \
-+	-ldl -lpthread -lxml2 \
-+	-ltk -ltcl -lBLT24 \
-+	-lfuntools `pkg-config --libs wcstools` -lz \
-+	`ast_link`
-+	rm -f libstdc++.a
-+endif
-+
- ifneq (,$(findstring linux,$(ARCH)))
- ds9Base	: $(OBJS) $(LIBS)
- 	$(RM) $@
diff --git a/sci-astronomy/ds9/files/ds9-5.7-makefile.patch b/sci-astronomy/ds9/files/ds9-5.7-makefile.patch
deleted file mode 100644
index 567d2e8f975f..000000000000
--- a/sci-astronomy/ds9/files/ds9-5.7-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- saods9.orig/Makefile	2009-11-04 02:32:17.000000000 +0000
-+++ saods9/Makefile	2009-11-04 02:39:27.000000000 +0000
-@@ -177,14 +177,12 @@
- all	: build
- 
- build : dirs \
--	tcl tk \
--	tktable tcllib tkcon xmlrpc blt \
--	zlib tclxml tkimg tkmpeg html \
--	xpa iis checkdns $(SIGNAL) funtools \
--	sla ast wcssubs \
-+	xmlrpc \
-+	tkmpeg html \
-+	iis checkdns $(SIGNAL) funtools \
-+	sla \
- 	rice hcompress plio \
--	$(OPTDIR) \
--	saotk zip zvfs ds9
-+	saotk ds9
- 
- doc	: FORCE
- 	@echo "Making Documentation..."
-@@ -299,7 +297,7 @@
- 
- html	: FORCE
- 	@echo "Installing HTMLWIDGET..."
--	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
-+	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
- 	cd $(HTMLDIR); $(MAKE)
- 	cp $(HTMLDIR)/libtkhtml.a lib/.
- 
diff --git a/sci-astronomy/ds9/files/ds9-5.7-saotk.patch b/sci-astronomy/ds9/files/ds9-5.7-saotk.patch
deleted file mode 100644
index 98467a4c1e9b..000000000000
--- a/sci-astronomy/ds9/files/ds9-5.7-saotk.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Nur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile
---- saods9.orig/saotk/fitsy++/Makefile	2009-11-04 02:32:17.000000000 +0000
-+++ saods9/saotk/fitsy++/Makefile	2009-11-04 06:26:59.000000000 +0000
-@@ -3,8 +3,8 @@
- 
- CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \
- 	-I../../include -I$(X11INCLUDE) \
--	-I../../$(FUNTOOLSDIR)/filter -I../../$(FUNTOOLSDIR)/fitsy \
--	-I../../$(FUNTOOLSDIR)/util
-+	-I/usr/include/funtools/filter -I/usr/include/funtools/fitsy \
-+	-I/usr/include/funtools/util -I/usr/include/wcs
- 
- SS	= \
- 	alloc.C \
-diff -Nur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C
---- saods9.orig/saotk/frame/fitsimage.C	2009-11-04 02:32:17.000000000 +0000
-+++ saods9/saotk/frame/fitsimage.C	2009-11-04 06:26:59.000000000 +0000
-@@ -26,7 +26,99 @@
- // this is kluge to speed up doug minks wcssubs 'ksearch' routine
- extern "C" {
-   FitsHead* wcshead = NULL;
--  char* ksearchh(char*, char*);
-+  char* ksearchh(char* hstring, char* keyword)
-+  {
-+/* Find entry for keyword keyword in FITS header string hstring.
-+   (the keyword may have a maximum of eight letters)
-+   NULL is returned if the keyword is not found */
-+
-+/* char *hstring; character string containing fits-style header
-+               information in the format <keyword>= <value> {/ <comment>}
-+               the default is that each entry is 80 characters long;
-+               however, lines may be of arbitrary length terminated by
-+               nulls, carriage returns or linefeeds, if packed is true.  */
-+/*char *keyword; character string containing the name of the variable
-+               to be returned.  ksearch searches for a line beginning
-+               with this string.  The string may be a character
-+               literal or a character variable terminated by a null
-+               or '$'.  it is truncated to 8 characters. */
-+{
-+    char *loc, *headnext, *headlast, *pval, *lc, *line;
-+    int icol, nextchar, lkey, nleft, lhead, lmax;
-+
-+#ifdef USE_SAOLIB
-+       int iel=1, ip=1, nel, np, ier;
-+       char *get_fits_head_str();
-+
-+       if( !use_saolib ){
-+#endif
-+
-+    pval = 0;
-+static int lhead0 = 0;
-+/* Find current length of header string */
-+    if (lhead0)
-+       lmax = lhead0;
-+    else
-+       lmax = 256000;
-+    for (lhead = 0; lhead < lmax; lhead++) {
-+       if (hstring[lhead] == (char) 0)
-+           break;
-+       }
-+
-+/* Search header string for variable name */
-+    headlast = hstring + lhead;
-+    headnext = hstring;
-+    pval = NULL;
-+    while (headnext < headlast) {
-+       nleft = headlast - headnext;
-+       loc = strncsrch (headnext, keyword, nleft);
-+
-+       /* Exit if keyword is not found */
-+       if (loc == NULL) {
-+           break;
-+           }
-+
-+       icol = (loc - hstring) % 80;
-+       lkey = strlen (keyword);
-+       nextchar = (int) *(loc + lkey);
-+
-+       /* If this is not in the first 8 characters of a line, keep searching */
-+       if (icol > 7)
-+           headnext = loc + 1;
-+
-+       /* If parameter name in header is longer, keep searching */
-+       else if (nextchar != 61 && nextchar > 32 && nextchar < 127)
-+           headnext = loc + 1;
-+
-+       /* If preceeding characters in line are not blanks, keep searching */
-+       else {
-+           line = loc - icol;
-+           for (lc = line; lc < loc; lc++) {
-+               if (*lc != ' ')
-+                   headnext = loc + 1;
-+               }
-+
-+       /* Return pointer to start of line if match */
-+           if (loc >= headnext) {
-+               pval = line;
-+               break;
-+               }
-+           }
-+       }
-+/* Return pointer to calling program */
-+       return (pval);
-+
-+#ifdef USE_SAOLIB
-+       }
-+       else {
-+           if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL)
-+               return(hstring);
-+           else
-+               return(NULL);
-+           }
-+#endif
-+}
-+}
- 
-   char* findit(char* cards, char* key)
-   {
-diff -Nur saods9.orig/saotk/frame/Makefile saods9/saotk/frame/Makefile
---- saods9.orig/saotk/frame/Makefile	2009-11-04 02:32:17.000000000 +0000
-+++ saods9/saotk/frame/Makefile	2009-11-04 06:28:21.000000000 +0000
-@@ -5,8 +5,7 @@
- 	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
- 	-I../../include -I$(X11INCLUDE) \
- 	-I../../$(FUNTOOLSDIR)/util \
--	-I/usr/include/libxml2 \
--	-I../../$(ASTDIR)
-+	-I/usr/include/libxml2
- 
- SS	= \
- 	annulus.C \
-diff -Nur saods9.orig/saotk/widget/ps.h saods9/saotk/widget/ps.h
---- saods9.orig/saotk/widget/ps.h	2009-11-04 02:32:17.000000000 +0000
-+++ saods9/saotk/widget/ps.h	2009-11-04 06:26:59.000000000 +0000
-@@ -13,7 +13,7 @@
- #include "zlib.h"
- extern int DebugGZ;
- 
--#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64)
-+#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64) || defined(__LP64__)
- #define BIT32 int
- #else
- #define BIT32 long
diff --git a/sci-astronomy/ds9/files/ds9-5.7-src.patch b/sci-astronomy/ds9/files/ds9-5.7-src.patch
deleted file mode 100644
index e64d2e73ca41..000000000000
--- a/sci-astronomy/ds9/files/ds9-5.7-src.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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,32 @@
- option add {*Label*BorderWidth} 2
- 
- # initialize
--set ds9(root) "zvfsmntpt"
-+set ds9(root) "/usr/share/ds9"
- 
--source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl
--source $ds9(root)/tcl8.4/http2.5/http.tcl
-+package require msgcat
-+package require http
- 
--source $ds9(root)/tk8.4/tearoff.tcl
- 
--source $ds9(root)/tcllib1.10/base64/base64.tcl
--source $ds9(root)/tcllib1.10/log/log.tcl
--source $ds9(root)/tcllib1.10/ftp/ftp.tcl
--source $ds9(root)/tcllib1.10/textutil/repeat.tcl
--source $ds9(root)/tcllib1.10/textutil/tabify.tcl
--
--source $ds9(root)/tkcon2.5/tkcon.tcl
--source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
--
--source $ds9(root)/blt2.4/graph.tcl
--source $ds9(root)/blt2.4/tabset.tcl
-+package require base64
-+package require log
-+package require ftp
-+package require textutil::repeat
-+package require textutil::tabify
-+
-+package require tkcon
-+
-+package require BLT
-+package require Tktable
-+package require tclxpa
-+package require img::base
-+package require img::jpeg
-+package require img::tiff
-+package require img::png
-+package require img::gif
-+package require img::ppm
-+package require img::bmp
-+package require img::xbm
-+package require img::window
- 
- source $ds9(root)/src/source.tcl
- 
diff --git a/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch b/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch
deleted file mode 100644
index dde993922a54..000000000000
--- a/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- saods9.orig/htmlwidget/makemake.tcl.in	2005-11-09 01:06:08.000000000 +0100
-+++ saods9/htmlwidget/makemake.tcl.in	2008-01-12 01:09:50.000000000 +0100
-@@ -360,9 +360,7 @@
- 
- # A target to build everything.
- #
--set all ${PFX}hwish${TEXE}
--lappend all ${PFX}hv${TEXE}
--lappend all ${PFX}ss${TEXE}
-+set all libtkhtml.a
- if {"@ENABLE_SHLIB@"=="1"} {
-   lappend all tkhtml@TARGET_SHLIB_EXT@
- #  lappend all tkhtml.so
diff --git a/sci-astronomy/ds9/files/ds9-6.0-main.patch b/sci-astronomy/ds9/files/ds9-6.0-main.patch
deleted file mode 100644
index d941c341d374..000000000000
--- a/sci-astronomy/ds9/files/ds9-6.0-main.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
---- saods9.orig/ds9/ds9.C	2009-10-01 17:53:59.000000000 +0100
-+++ saods9/ds9/ds9.C	2010-01-29 17:46:20.000000000 +0000
-@@ -13,8 +13,6 @@
- 
-   void TclSetStartupScriptFileName(const char*);
- 
--  int Zvfs_Init(Tcl_Interp*);
--  int Zvfs_Mount(Tcl_Interp*, char*, char *);
- 
-   int Blt_Init(Tcl_Interp*);
-   int Tktable_Init(Tcl_Interp*);
-@@ -73,15 +71,13 @@
-   appname = dupstr(argv[0]);
- 
-   // set default encoding dir
--  Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4");
- 
-   // so that tcl and tk know where to find their libs
-   // we do it here before InitLibraryPath is called
--  putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4");
--  putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4");
-+
- 
-   // invoke startup script
--  TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
-+  TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl");
- }
- 
- Tcl_Interp *global_interp;
-@@ -100,31 +96,8 @@
-   // We have to initialize the virtual filesystem before calling
-   // Tcl_Init().  Otherwise, Tcl_Init() will not be able to find
-   // its startup script files.
--  if (Zvfs_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, 
--		     (Tcl_PackageInitProc*)NULL);
- 
-   // find current working directory, and set as mount point
--  {
--    Tcl_DString pwd;
--    Tcl_DStringInit(&pwd);
--    Tcl_GetCwd(interp, &pwd);
--#ifdef ZIPFILE
--    ostringstream str;
--    str << (char *)Tcl_GetNameOfExecutable() 
--	<< "/../ds9.zip" 
--	<<  ends;
--    if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){
--      cerr << "ERROR: The auxiliary ds9 file 'ds9.zip' is missing. If you moved the ds9 program from its original location, please also move the zip file to the same place." << endl;
--      exit(1);
--    }
--#else
--    Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(), 
--	       Tcl_DStringValue(&pwd));
--#endif
--    Tcl_DStringFree(&pwd);
--  }
- 
-   // Initialize Tcl and Tk
-   if (Tcl_Init(interp))
-@@ -133,7 +106,6 @@
-   // Tk
-   if (Tk_Init(interp))
-     return TCL_ERROR;
--  Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
- 
-   {
-     Tcl_DString pwd;
-@@ -142,18 +114,6 @@
-     Tcl_DStringFree(&pwd);
-   }
- 
--  // Blt
--  if (Blt_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "BLT", Blt_Init, 
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tktable
--  if (Tktable_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "Tktable", Tktable_Init, 
--		     (Tcl_PackageInitProc*)NULL);
--
-   // Checkdns
-   if (Checkdns_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-@@ -171,13 +131,6 @@
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
- 		     (Tcl_PackageInitProc*)NULL);
--
--  // Tclxpa
--  if (Tclxpa_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
-   // IIS
-   if (Iis_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;
--  Tcl_StaticPackage (interp, "img", 
--		     Tkimg_Init,(Tcl_PackageInitProc*)NULL);
--
--  // zlibtcl
--  if (Zlibtcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // jpegtcl
--  if (Jpegtcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgjpeg
--  if (Tkimgjpeg_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tifftcl
--  if (Tifftcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgtiff
--  if (Tkimgtiff_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Pngtcl
--  if (Pngtcl_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgpng
--  if (Tkimgpng_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimggif
--  if (Tkimggif_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "gif", Tkimggif_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgppm
--  if (Tkimgppm_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "ppm", Tkimgppm_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgbmp
--  if (Tkimgbmp_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "bmp", Tkimgbmp_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgxbm
--  if (Tkimgxbm_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "xbm", Tkimgxbm_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
--  // Tkimgwindow
--  if (Tkimgwindow_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
--		     (Tcl_PackageInitProc*)NULL);
--
-   // Signal_Ext
- #ifndef _WIN32
-   if (Signal_ext_Init(interp) == TCL_ERROR)
-@@ -294,15 +165,6 @@
- 		     (Tcl_PackageInitProc*)NULL);
- #endif
- 
--  // Variables
--  Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); 
--  Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY);
--  Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
--  Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
--  Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY);
--
--  //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
--
-   return TCL_OK;
- }
- 
-diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile
---- saods9.orig/ds9/Makefile	2010-01-12 21:24:30.000000000 +0000
-+++ saods9/ds9/Makefile	2010-01-29 17:53:29.000000000 +0000
-@@ -4,12 +4,7 @@
- #--------------------------defines
- 
- ZDIR	= zipdir/zvfsmntpt
--FFILES	= $(ZDIR)/$(TCLVER) \
--	$(ZDIR)/$(TKVER) \
--	$(ZDIR)/$(BLTVER) \
--	$(ZDIR)/$(TCLLIBVER) \
--	$(ZDIR)/$(TKCONVER) \
--	$(ZDIR)/$(XMLRPCVER) \
-+FFILES	= \
- 	$(ZDIR)/src \
- 	$(ZDIR)/msgs \
- 	$(ZDIR)/doc \
-@@ -30,43 +25,14 @@
- 	../lib/libsaotk.a \
- 	../lib/libtkhtml.a \
- 	../lib/libtkmpeg.a \
--	../lib/$(TCLXMLVER)/libTclxml3.2.a \
--	../lib/$(TKIMGVER)/libtkimgwindow1.3.a \
--	../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \
--	../lib/$(TKIMGVER)/libjpegtcl1.0.a \
--	../lib/$(TKIMGVER)/libtkimgtiff1.3.a \
--	../lib/$(TKIMGVER)/libtifftcl3.6.1.a \
--	../lib/$(TKIMGVER)/libtkimgpng1.3.a \
--	../lib/$(TKIMGVER)/libpngtcl1.2.6.a \
--	../lib/$(TKIMGVER)/libtkimgppm1.3.a \
--	../lib/$(TKIMGVER)/libtkimggif1.3.a \
--	../lib/$(TKIMGVER)/libtkimgbmp1.3.a \
--	../lib/$(TKIMGVER)/libtkimgxbm1.3.a \
--	../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \
--	../lib/$(TKIMGVER)/libtkimg1.3.a \
--	../lib/$(TKTABLEVER)/libTktable2.9.a \
--	../lib/libfuntools.a \
- 	../lib/librice.a \
- 	../lib/libhcomp.a \
- 	../lib/libplio.a \
--	../lib/libast.a \
--	../lib/libast_err.a \
--	../lib/libast_grf3d.a \
--	../lib/libast_pal.a \
--	../lib/libast_wcslib.a \
- 	../lib/libsaotk.a \
--	../lib/libwcs.a \
- 	../lib/libsla.a \
--	../lib/libzvfs.a \
--	../lib/libzip.a \
--	../lib/libz.a \
--	../lib/libxpa.a \
- 	../lib/libiis.a \
- 	../lib/libcheckdns.a \
--	../lib/libsignal_ext.a \
--	../lib/libBLT24.a \
--	../lib/libtk8.4.a \
--	../lib/libtcl8.4.a
-+	../lib/libsignal_ext.a
- endif
- 
- ifeq ($(OS),windows)
-@@ -178,12 +144,9 @@
- 
- all: ds9
- 
--ds9	: ds9Base ds9.zip
-+ds9	: ds9Base
- 	$(RM) $@
--	cp ds9Base ds9
--	strip ds9
--	cp ds9 ../bin/.
--	cp ds9.zip ../bin/.
-+	cp ds9Base ../bin/ds9
- 	cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
- 
- debug	: ds9Base ds9.zip
-@@ -199,14 +162,9 @@
- 
- all: ds9
- 
--ds9	: null.zip ds9Base $(FILES)
-+ds9	: ds9Base $(FILES)
- 	$(RM) $@
--	cp ds9Base ds9.zip
--	strip ds9.zip
--	cat null.zip >> ds9.zip
--	cd zipdir; zip -rA9 ../ds9.zip *
--	mv ds9.zip ds9
--	cp ds9 ../bin/.
-+	cp ds9Base ../bin/ds9
- 
- debug	: null.zip ds9Base $(FILES)
- 	$(RM) $@
-@@ -377,6 +335,23 @@
- 
- #--------------------------linux
- 
-+# for gentoo: get rid of bundled libs
-+ifneq (,$(findstring gentoo,$(ARCH)))
-+ds9Base	: $(OBJS) $(LIBS)
-+	$(RM) $@
-+	rm -f libstdc++.a
-+	ln -s `$(CXX) -print-file-name=libstdc++.a` .
-+	$(CXX) $(LDFLAGS) \
-+	$(OBJS) $(LIBS) -o $@ \
-+	-Wl,-Bstatic -L. -lstdc++ \
-+	-Wl,-Bdynamic -L$(X11LIB) -lX11 \
-+	-ldl -lpthread -lxml2 \
-+	-ltk -ltcl -lBLT24 \
-+	-lfuntools `pkg-config --libs wcstools` -lz \
-+	`ast_link`
-+	rm -f libstdc++.a
-+endif
-+
- ifneq (,$(findstring linux,$(ARCH)))
- ds9Base	: $(OBJS) $(LIBS)
- 	$(RM) $@
diff --git a/sci-astronomy/ds9/files/make.gentoo b/sci-astronomy/ds9/files/make.gentoo
deleted file mode 100644
index 4ca14484285f..000000000000
--- a/sci-astronomy/ds9/files/make.gentoo
+++ /dev/null
@@ -1,9 +0,0 @@
-OS	= unix
-ARCH	= gentoo
-
-X11INCLUDE=/usr/include
-X11LIB	= $(LIBDIR)
-MYLIBDIR = $(LIBDIR)
-
-CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H ${EXTRA_CPPFLAGS}
-CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H ${EXTRA_CPPFLAGS}
diff --git a/sci-astronomy/ds9/metadata.xml b/sci-astronomy/ds9/metadata.xml
deleted file mode 100644
index 3368e80a76f7..000000000000
--- a/sci-astronomy/ds9/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
-  The Smithsonian Astrophysical Observatory Image Deep Space 9 is an
-  astronomical imaging and data visualization application. It is the
-  new generation of the SAOImage software. DS9 supports FITS images
-  and binary tables, multiple frame buffers, region manipulation, many
-  scale algorithms and colormaps. It provides communication with
-  external analysis tasks and is configurable and extensible. DS9
-  supports multiple frame buffers, mosaic images, tiling, blinking,
-  geometric markers, colormap manipulation, scaling, arbitrary zoom,
-  rotation, pan, and a variety of coordinate systems. DS9 also
-  supports FTP and HTTP data access.
- 
-  DS9 is a Tk/Tcl application which utilizes the SAOTk widget set. It
-  also incorporates the  X Public Access (XPA) mechanism to allow
-  external processes to access and control its data, GUI functions, and
-  algorithms.
-</longdescription>
-</pkgmetadata>