sci-astronomy/ds9: Deleted, in-tree is newer

15 files changed, 0 insertions, 1088 deletions

diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
deleted file mode 100644
index b8e4707..0000000
--- a/sci-astronomy/ds9/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX ds9-5.1-Makefile.patch 1154 RMD160 1fa279839fecd4cc56a8445d34036ade9ad92406 SHA1 84dcb1a7d6e3fe1583d8ff9cf25a81091364cc9a SHA256 632d64d27f14e73c9ccb0e16874f652d556edbff0be34e38f53ec5cbd1f1b59b
-AUX ds9-5.1-gcc4.2-x86.patch 1001 RMD160 c955fdf898c2fbcc10a4597b3147fd2f534ccb42 SHA1 71826d2027f5fbeca166fa30d7eff718a393645c SHA256 a890da6e6d93a9b246948c6088104e176a42ba796042039186d5aabfcab3f280
-AUX ds9-5.1-tk-gif.patch 460 RMD160 bc670457e0424041d4fe4022f569cd78457c9b7b SHA1 aa90e00e34c026bf8776f973644cfebc09abaa32 SHA256 f46964aea235b2da8ae294a151668ede2dab46e83a0fbe1549de19b3305a477b
-AUX ds9-5.2-Makefile.patch 1726 RMD160 34e39e6144d1e8251b00faf6393983c9077455bf SHA1 ee40fa4a9511865ee778c73b3ef3565f5ef0a779 SHA256 ba1e1fac3aa45f72734fc23dc4b05c7fe00e464dce0a9c379b05e00f52a74757
-AUX ds9-5.2-gcc43.patch 5677 RMD160 e729c4a2644f4452e126e3903066eb1b68f8e4d0 SHA1 b473943c4772ac2e8f0e8da254aba2a49206a5b4 SHA256 2fba8aef2f9b42b5915e3f864fd84dedc38a6deb62655437f4f02e2e0fb3fa70
-AUX ds9-5.4-gcc43.patch 3088 RMD160 9cbde4184673d2c3eb3fc4da2947c1eac846f579 SHA1 8741209fbfd3b46ec1ff8ece7df67964c04416a3 SHA256 16f90115b05f2c5e4b3651e748683425453bb2b0395622a970d06b66975fdbd2
-AUX ds9-5.4-htmlwidget.patch 1483 RMD160 8cc6b7ffb8f78d0172424720a10d0cae34a3d879 SHA1 31d37341d80f545da62f5b9af6bbc2f2b29d6381 SHA256 eb455cae898909705985030d4fec97f139a442fe0d557d5bea3ce7c0fdc96d6c
-AUX ds9-5.4-saotk.patch 5400 RMD160 abfd44096cc329ae19350ae6bed50e05751fd7f8 SHA1 eb70b5cd98837ed21f0eeae293395c94686a0b33 SHA256 5bd91e719d5992502b65eb27309cde8c653175c3dba0c2db8e7cd674e652cbc8
-AUX ds9-5.5-main.patch 6809 RMD160 bbbf9e8a9d54fb8b802171b47b049bf8d7b61215 SHA1 1bb1dd4ebc04e082827795ef1b73ed6d203a34b1 SHA256 a58a6f2c04f578312277502059d51d9e21ca74464f9d03632fb0257c4a665de0
-AUX ds9-5.5-makefile.patch 879 RMD160 6d204ca28fd90a6dc00af5ff6436d5104b907499 SHA1 693b90b19c694e77767584e0a251b2aa7903ff66 SHA256 cf34e5117d83eb367043250d9e8aa9e9b350363a6f3194ab59077bad64e64fc7
-AUX ds9-5.5-src.patch 1678 RMD160 22e9fc46522e2acffd271006c405c9882144fe84 SHA1 e52494991bfe8d8b8462e4ffc4dea84c9e7948cb SHA256 28e355f46adc5f71356ada257bd8d91e430da8cc2369830239038f167f56e7c2
-AUX make.gentoo 237 RMD160 b0de6c53dca48199106aaec86e950d517d94bfb7 SHA1 2ccddb02a71c97acc63ec48dccf2b904b2b5cc1b SHA256 15b7b6aebaf733c4e88818119938718a3a7b89c7a255452f4b0cbfa0a1061bd6
-DIST ds9.5.1.tar.gz 27331599 RMD160 46d915ff098f13911858320d33f5cda6c8ee0ea1 SHA1 7c2bb56e0a8a222b0d13d1d255aaa98fd2979d45 SHA256 aea981ea5714ca4dd9125aacebf2676a85e7045da7d1f97492fbe0e84a22aaf8
-DIST ds9.5.5.tar.gz 27278806 RMD160 abcc1c71c62ac0ab3e81727ab55f561b0e174417 SHA1 ff83a450e86a3e9d252200b4cf4339a41626db87 SHA256 051cd9de22000a641acf4510d8bd7ecd4ec7cca5a2d1fe8745df6dec076b7f3f
-EBUILD ds9-5.1-r1.ebuild 1985 RMD160 a01698ff9b072c9f8e1d25ab34424ca23b453b3d SHA1 f1184d78c3c69175b5b6edf5c030064d3a7730cf SHA256 c44ef2e01441d34e6ea16e13791b5b7bec21e2b7f494e3f48b1ff58180939c97
-EBUILD ds9-5.5.ebuild 1875 RMD160 14a720a1cfa3ffb4647a6988e6b7f2a0ada9fabd SHA1 ac812b50595fea6ffc4e973664aed549dff9f247 SHA256 c6fcc0887354bffae18e492d381bef59407a8115d2d315fe2f857f4c4c884289
diff --git a/sci-astronomy/ds9/ds9-5.1-r1.ebuild b/sci-astronomy/ds9/ds9-5.1-r1.ebuild
deleted file mode 100644
index 8bc8b9b..0000000
--- a/sci-astronomy/ds9/ds9-5.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.1.ebuild,v 1.3 2008/02/14 23:32:16 bicatali Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Data visualization application for astronomical FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXau"
-DEPEND="${RDEPEND}
-	app-arch/zip"
-
-RESTRICT="strip test mirror"
-
-S="${WORKDIR}/sao${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# patch to speed up compilation (no man pages generation)
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-
-	# fix stack smashing on x86 with gcc-4.2
-	if [[ "${ARCH}" == "x86" ]]; then
-		epatch "${FILESDIR}"/${P}-gcc4.2-x86.patch
-	fi
-	# security fix in embedded tk (bug #208464)
-	epatch "${FILESDIR}"/${P}-tk-gif.patch
-
-	# remove build-time dependency on etags (i.e. emacs or xemacs)
-	sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed"
-}
-
-src_compile() {
-	local ds9arch
-	case ${ARCH} in
-		x86) ds9arch=linux ;;
-		amd64) ds9arch=linux64 ;;
-		ppc) ds9arch=linuxppc ;;
-		x86-fbsd) ds9arch=freebsd ;;
-		*) die "ds9 not supported upstream for this architecture";;
-	esac
-	ln -s make.${ds9arch} make.include
-
-	# This is a long and fragile compilation
-	# which recompiles tcl/tk, tkimg, blt, funtools,
-	# and a lot of other packages
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTS="${CXXFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install () {
-	dobin bin/ds9 || die "failed installing ds9 binary"
-	dobin bin/xpa* || die "failed installing xpa* binaries"
-	doman man/man?/xpa* || die " failed installing man pages"
-	dodoc README acknowledgement || die "failed installing basic doc"
-	if use doc; then
-		dohtml -r doc/* || die "failed installing html doc"
-	fi
-}
diff --git a/sci-astronomy/ds9/ds9-5.5.ebuild b/sci-astronomy/ds9/ds9-5.5.ebuild
deleted file mode 100644
index faa20c4..0000000
--- a/sci-astronomy/ds9/ds9-5.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.5.ebuild,v 1.3 2009/02/25 17:17:33 bicatali Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Data visualization application for astronomical FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="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-lang/tk-8.5
-	>=dev-tcltk/tcllib-1.10
-	>=dev-tcltk/tclxml-3.1
-	dev-tcltk/tkcon
-	>=dev-tcltk/tkimg-1.3.1
-	dev-tcltk/tktable
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/xpa
-	>=sci-astronomy/ast-4.6.2-r2
-	sci-astronomy/funtools"
-
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
-	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-saotk.patch
-	epatch "${FILESDIR}"/${PN}-5.4-htmlwidget.patch
-	epatch "${FILESDIR}"/${P}-main.patch
-	epatch "${FILESDIR}"/${P}-src.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${PN}-5.4-gcc43.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 () {
-	dobin bin/ds9 || die "failed installing ds9 binary"
-	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
-	convert doc/sun.gif ds9.png
-	doicon ds9.png
-	make_desktop_entry ds9 "SAOImage DS9"
-}
diff --git a/sci-astronomy/ds9/files/ds9-5.1-Makefile.patch b/sci-astronomy/ds9/files/ds9-5.1-Makefile.patch
deleted file mode 100644
index 6e1d6a8..0000000
--- a/sci-astronomy/ds9/files/ds9-5.1-Makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig	2008-01-15 15:19:48.367764731 +0000
-+++ Makefile	2008-01-15 16:04:54.805517099 +0000
-@@ -235,23 +235,23 @@
- tcl	: FORCE
- 	@echo "Installing Tcl..."
- 	cd $(TCLDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared
--	cd $(TCLDIRDIR); $(MAKE) install
-+	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
- 
- tk	: FORCE
- 	@echo "Installing Tk..."
- 	cd $(TKDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared
--	cd $(TKDIRDIR); $(MAKE) install
-+	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
- 	$(RM) -r lib/$(TKVER)/demos
- 
- tktable	: FORCE
- 	@echo "Installing TkTable..."
- 	cd $(TKTABLEDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKTABLEFLAGS) --disable-shared
--	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install
-+	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries
- 
- tcllib	: FORCE
- 	@echo "Installing TCLLIB..."
- 	cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS)
--	cd $(TCLLIBDIR); $(MAKE) install
-+	cd $(TCLLIBDIR); $(MAKE) install-libraries
- 
- ifeq ($(OS),macosx)
- blt	: optincl
diff --git a/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch b/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch
deleted file mode 100644
index ce87e11..0000000
--- a/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur saods9/make.linux saods9.new/make.linux
---- saods9/make.linux	2007-12-18 17:54:57.000000000 -0500
-+++ saods9.new/make.linux	2008-01-23 08:58:46.000000000 -0500
-@@ -9,15 +9,13 @@
- 
- # note: bug with gcc 4.1 and 4.2
- # can't use -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
-+CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
-+
- #CXX	= g++
--#CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
-+#CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- #CC	= gcc
--#CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
--
--CXX	= g++34
--CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--CC	= gcc34
--CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+#CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
- STRIP	= strip
- ZCAT	= zcat
diff --git a/sci-astronomy/ds9/files/ds9-5.1-tk-gif.patch b/sci-astronomy/ds9/files/ds9-5.1-tk-gif.patch
deleted file mode 100644
index 4649a56..0000000
--- a/sci-astronomy/ds9/files/ds9-5.1-tk-gif.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tk8.4.17/generic/tkImgGIF.c.orig	2008-02-14 23:20:53.683962654 +0000
-+++ tk8.4.17/generic/tkImgGIF.c	2008-02-14 23:21:42.762759495 +0000
-@@ -826,6 +826,12 @@
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+	Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+	return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
- 	cmap[transparent][CM_RED] = 0;
- 	cmap[transparent][CM_GREEN] = 0;
diff --git a/sci-astronomy/ds9/files/ds9-5.2-Makefile.patch b/sci-astronomy/ds9/files/ds9-5.2-Makefile.patch
deleted file mode 100644
index 55a2d0e..0000000
--- a/sci-astronomy/ds9/files/ds9-5.2-Makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.orig	2008-04-16 13:43:29.417500857 +0000
-+++ Makefile	2008-04-16 14:03:38.346474803 +0000
-@@ -237,23 +237,23 @@
- tcl	: FORCE
- 	@echo "Installing Tcl..."
- 	cd $(TCLDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared
--	cd $(TCLDIRDIR); $(MAKE) install
-+	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
- 
- tk	: FORCE
- 	@echo "Installing Tk..."
- 	cd $(TKDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared
--	cd $(TKDIRDIR); $(MAKE) install
-+	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
- 	$(RM) -r lib/$(TKVER)/demos
- 
- tktable	: FORCE
- 	@echo "Installing TkTable..."
- 	cd $(TKTABLEDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKTABLEFLAGS) --disable-shared
--	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install
-+	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries
- 
- tcllib	: FORCE
- 	@echo "Installing TclLib..."
- 	cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS)
--	cd $(TCLLIBDIR); $(MAKE) install
-+	cd $(TCLLIBDIR); $(MAKE) install-libraries
- 
- tkcon	: FORCE
- 	@echo "Installing TkCon..."
-@@ -295,7 +295,7 @@
- 	@echo "Installing XPA..."
- 	cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure $(XPAFLAGS)  --disable-shared
- 	cd $(XPADIR); $(MAKE); $(MAKE) install
--	cd bin; $(STRIP) xpa*
-+
- 
- iis	: FORCE
- 	@echo "Installing IIS..."
---- ds9/Makefile.orig	2008-04-17 15:47:39.189030792 +0000
-+++ ds9/Makefile	2008-04-17 15:47:51.873753654 +0000
-@@ -152,7 +152,6 @@
- ds9	: null.zip 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
diff --git a/sci-astronomy/ds9/files/ds9-5.2-gcc43.patch b/sci-astronomy/ds9/files/ds9-5.2-gcc43.patch
deleted file mode 100644
index 71d2db7..0000000
--- a/sci-astronomy/ds9/files/ds9-5.2-gcc43.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- iis/iistcl.C.orig	2008-04-16 13:53:34.315972056 +0000
-+++ iis/iistcl.C	2008-04-16 13:54:57.634895375 +0000
-@@ -4,7 +4,7 @@
- 
- #include <ctype.h>
- #include <string.h>
--
-+#include <cstdlib>
- #include <iostream>
- #include <sstream>
- using namespace std;
---- saotk/widget/ps.C.orig	2008-04-16 14:09:20.865993878 +0000
-+++ saotk/widget/ps.C	2008-04-16 14:10:04.020453111 +0000
-@@ -4,6 +4,7 @@
- 
- #include "ps.h"
- #include "util.h"
-+#include <cstring>
- 
- Filter::Filter()
- {
---- saotk/frame/callback.C.orig	2008-04-16 14:23:03.661659706 +0000
-+++ saotk/frame/callback.C	2008-04-16 14:36:52.264879112 +0000
-@@ -2,8 +2,8 @@
- // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
--#include <string.h>
--#include <iostream.h>
-+#include <cstring>
-+#include <iostream>
- 
- #include "callback.h"
- 
---- saotk/frame/ciaoparser.C.orig	2008-04-16 15:12:42.535454290 +0000
-+++ saotk/frame/ciaoparser.C	2008-04-16 15:13:18.023725663 +0000
-@@ -128,9 +128,9 @@
- 
- #define FITSPTR (fr->findFits(1))
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
---- saotk/frame/ds9parser.C.orig	2008-04-16 15:12:42.535454290 +0000
-+++ saotk/frame/ds9parser.C	2008-04-16 15:13:40.601718953 +0000
-@@ -333,9 +333,9 @@
- #define FITSPTR (fr->findFits(globalTile))
- #define DISCARD_(x) {yyclearin; mkDiscard(x);}
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
---- saotk/frame/fitsdata.C.orig	2008-04-16 15:09:33.746979438 +0000
-+++ saotk/frame/fitsdata.C	2008-04-16 15:11:28.432297279 +0000
-@@ -2,11 +2,11 @@
- // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
--#include <stdlib.h>
--#include <limits.h>
--#include <float.h>
--#include <iostream.h>
--#include <math.h>
-+#include <cstdlib>
-+#include <climits>
-+#include <cfloat>
-+#include <iostream>
-+#include <cmath>
- 
- #include "fitsdata.h"
- #include "colorscale.h"
---- saotk/frame/inversescale.C.orig	2008-04-16 15:12:42.539452518 +0000
-+++ saotk/frame/inversescale.C	2008-04-16 15:13:56.113594982 +0000
-@@ -2,8 +2,8 @@
- // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
--#include <iostream.h>
--#include <math.h>
-+#include <iostream>
-+#include <cmath>
- 
- #include "inversescale.h"
- #include "framebase.h"
---- saotk/frame/parser.C.orig	2008-04-16 15:12:42.539452518 +0000
-+++ saotk/frame/parser.C	2008-04-16 15:14:20.254970721 +0000
-@@ -708,9 +708,9 @@
- 
- #define FITSPTR (fr->findFits(1))
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "frame.h"
---- saotk/frame/prosparser.C.orig	2008-04-16 15:12:42.543450746 +0000
-+++ saotk/frame/prosparser.C	2008-04-16 15:14:40.360116448 +0000
-@@ -155,9 +155,9 @@
- #define FITSPTR (fr->findFits(1))
- #define DISCARD_(x) {yyclearin; prosDiscard(x);}
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
---- saotk/frame/saoparser.C.orig	2008-04-16 15:12:42.547448974 +0000
-+++ saotk/frame/saoparser.C	2008-04-16 15:14:56.133015294 +0000
-@@ -121,9 +121,9 @@
- #define FITSPTR (fr->findFits(1))
- #define DISCARD_(x) {yyclearin; saoDiscard(x);}
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
---- saotk/frame/tngparser.C.orig	2008-04-16 15:12:42.547448974 +0000
-+++ saotk/frame/tngparser.C	2008-04-16 15:15:11.549893852 +0000
-@@ -167,9 +167,9 @@
- #define FITSPTR (fr->findFits(1))
- #define DISCARD_(x) {yyclearin; tngDiscard(x);}
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
---- saotk/frame/xyparser.C.orig	2008-04-16 15:12:42.551447202 +0000
-+++ saotk/frame/xyparser.C	2008-04-16 15:15:28.970886617 +0000
-@@ -200,9 +200,9 @@
- 
- #define FITSPTR (fr->findFits(1))
- 
--#include <math.h>
--#include <string.h>
--#include <iostream.h>
-+#include <cmath>
-+#include <cstring>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
---- saotk/colorbar/colorbarbase.C.orig	2008-04-16 15:41:10.236325709 +0000
-+++ saotk/colorbar/colorbarbase.C	2008-04-16 15:33:33.482296780 +0000
-@@ -11,6 +11,7 @@
- #include <X11/Xutil.h>
- 
- #include "parser.H"
-+#include <cstdlib>
- 
- // Parser Stuff
- #undef yyFlexLexer
---- saotk/colorbar/colorbar.C.orig	2008-04-16 15:27:48.890467306 +0000
-+++ saotk/colorbar/colorbar.C	2008-04-16 15:28:09.291629902 +0000
-@@ -2,8 +2,8 @@
- // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
--#include <stdlib.h>
--#include <string.h>
-+#include <cstdlib>
-+#include <cstring>
- 
- #include "colorbar.h"
- #include "util.h"
---- saotk/util/conputs.C.orig	2008-04-16 15:41:48.354497940 +0000
-+++ saotk/util/conputs.C	2008-04-16 15:42:01.775262745 +0000
-@@ -1,3 +1,4 @@
-+#include <cstring>
- #include <iostream>
- using namespace std;
- 
---- ds9/ds9.C.orig	2008-04-16 15:45:04.281663192 +0000
-+++ ds9/ds9.C	2008-04-16 15:45:17.622423439 +0000
-@@ -1,3 +1,4 @@
-+#include <cstdlib>
- #include <iostream>
- using namespace std;
- 
diff --git a/sci-astronomy/ds9/files/ds9-5.4-gcc43.patch b/sci-astronomy/ds9/files/ds9-5.4-gcc43.patch
deleted file mode 100644
index 06d6ef5..0000000
--- a/sci-astronomy/ds9/files/ds9-5.4-gcc43.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
---- saods9.orig/ds9/ds9.C	2008-10-08 20:36:37.000000000 +0100
-+++ saods9/ds9/ds9.C	2008-11-04 11:46:44.000000000 +0000
-@@ -1,5 +1,7 @@
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- using namespace std;
- 
- #include <tcl.h>
-diff -Nur saods9.orig/iis/iistcl.C saods9/iis/iistcl.C
---- saods9.orig/iis/iistcl.C	2008-06-02 22:27:50.000000000 +0100
-+++ saods9/iis/iistcl.C	2008-11-04 11:45:29.000000000 +0000
-@@ -7,6 +7,7 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstdlib>
- using namespace std;
- 
- #include <tcl.h>
-diff -Nur saods9.orig/saotk/fitsy++/card.C saods9/saotk/fitsy++/card.C
---- saods9.orig/saotk/fitsy++/card.C	2008-01-04 17:29:24.000000000 +0000
-+++ saods9/saotk/fitsy++/card.C	2008-11-04 11:45:29.000000000 +0000
-@@ -3,6 +3,7 @@
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
- #include "card.h"
-+#include <string.h>
- 
- FitsCard::FitsCard()
- {
-diff -Nur saods9.orig/saotk/fitsy++/compress.C saods9/saotk/fitsy++/compress.C
---- saods9.orig/saotk/fitsy++/compress.C	2008-06-05 21:37:51.000000000 +0100
-+++ saods9/saotk/fitsy++/compress.C	2008-11-04 11:45:29.000000000 +0000
-@@ -6,6 +6,7 @@
- #include "head.h"
- #include "util.h"
- #include "NaN.h"
-+#include <string.h>
- 
- FitsCompress::FitsCompress(FitsFile* fits)
- {
-diff -Nur saods9.orig/saotk/fitsy++/file.C saods9/saotk/fitsy++/file.C
---- saods9.orig/saotk/fitsy++/file.C	2008-06-03 15:46:25.000000000 +0100
-+++ saods9/saotk/fitsy++/file.C	2008-11-04 11:45:29.000000000 +0000
-@@ -6,6 +6,7 @@
- #include <sstream>
- #include <iomanip>
- using namespace std;
-+#include <string.h>
- 
- #include "file.h"
- #include "util.h"
-diff -Nur saods9.orig/saotk/fitsy++/iis.C saods9/saotk/fitsy++/iis.C
---- saods9.orig/saotk/fitsy++/iis.C	2008-01-04 17:29:24.000000000 +0000
-+++ saods9/saotk/fitsy++/iis.C	2008-11-04 11:45:29.000000000 +0000
-@@ -3,6 +3,7 @@
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
- #include "iis.h"
-+#include <string.h>
- 
- FitsIIS::FitsIIS(int width, int height)
- {
-diff -Nur saods9.orig/saotk/frame/frscale.C saods9/saotk/frame/frscale.C
---- saods9.orig/saotk/frame/frscale.C	2008-01-04 17:29:26.000000000 +0000
-+++ saods9/saotk/frame/frscale.C	2008-11-04 11:45:37.000000000 +0000
-@@ -3,6 +3,7 @@
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "frscale.h"
- 
-diff -Nur saods9.orig/saotk/widget/ps.C saods9/saotk/widget/ps.C
---- saods9.orig/saotk/widget/ps.C	2008-06-03 15:46:25.000000000 +0100
-+++ saods9/saotk/widget/ps.C	2008-11-04 11:52:06.000000000 +0000
-@@ -4,7 +4,8 @@
- 
- #include "ps.h"
- #include "util.h"
--#include "string.h"
-+#include <cstring>
-+using std::memcpy;
- 
- Filter::Filter()
- {
---- saods9.orig/saotk/colorbar/colorbarbase.C	2008-09-26 22:54:36.000000000 +0100
-+++ saods9/saotk/colorbar/colorbarbase.C	2008-11-04 18:10:13.000000000 +0000
-@@ -10,6 +10,7 @@
- 
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <cstdlib>
- 
- #include "parser.H"
- 
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 98eb17a..0000000
--- 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.4-saotk.patch b/sci-astronomy/ds9/files/ds9-5.4-saotk.patch
deleted file mode 100644
index e7a97a2..0000000
--- a/sci-astronomy/ds9/files/ds9-5.4-saotk.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Nur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile
---- saods9.orig/saotk/fitsy++/Makefile	2007-12-28 22:07:11.000000000 +0000
-+++ saods9/saotk/fitsy++/Makefile	2008-11-03 23:06:28.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/Makefile saods9/saotk/frame/Makefile
---- saods9.orig/saotk/frame/Makefile	2008-09-23 20:47:09.000000000 +0100
-+++ saods9/saotk/frame/Makefile	2008-11-03 23:11:01.000000000 +0000
-@@ -4,8 +4,7 @@
- CXXFLAGS = $(CXXOPT) -w \
- 	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
- 	-I../../include -I$(X11INCLUDE) \
--	-I../../$(FUNTOOLSDIR)/util \
--	-I../../$(ASTDIR)
-+	-I/usr/include/funtools/util
- 
- SS	= \
- 	annulus.C \
-diff -Nur saods9.orig/saotk/util/tkpostscript.h saods9/saotk/util/tkpostscript.h
---- saods9.orig/saotk/util/tkpostscript.h	2008-02-20 22:26:21.000000000 +0000
-+++ saods9/saotk/util/tkpostscript.h	2008-11-04 09:58:00.000000000 +0000
-@@ -4,7 +4,7 @@
- 
- // this is copied from tkCanvPs.c
- 
--#include "../../tk8.4.18/generic/tkCanvas.h"
-+#include </usr/lib/tk8.4/include/generic/tkCanvas.h>
- 
- typedef struct TkPostscriptInfo {
-     int x, y, width, height;	/* Area to print, in canvas pixel
-diff -Nur saods9.orig/saotk/widget/ps.h saods9/saotk/widget/ps.h
---- saods9.orig/saotk/widget/ps.h	2008-01-04 17:29:27.000000000 +0000
-+++ saods9/saotk/widget/ps.h	2008-11-04 09:59:00.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 -ur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C
---- saods9.orig/saotk/frame/fitsimage.C	2007-05-22 20:36:50.000000000 +0200
-+++ saods9/saotk/frame/fitsimage.C	2008-11-04 16:36:40.000000000 +0100
-@@ -31,7 +31,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 --git a/sci-astronomy/ds9/files/ds9-5.5-main.patch b/sci-astronomy/ds9/files/ds9-5.5-main.patch
deleted file mode 100644
index 707d884..0000000
--- a/sci-astronomy/ds9/files/ds9-5.5-main.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
---- saods9.orig/ds9/ds9.C	2009-02-16 17:06:50.000000000 +0000
-+++ saods9/ds9/ds9.C	2009-02-16 17:07:42.000000000 +0000
-@@ -11,8 +11,8 @@
- 
-   void TclSetStartupScriptFileName(const char*);
- 
--  int Zvfs_Init(Tcl_Interp*);
--  int Zvfs_Mount(Tcl_Interp*, char*, char *);
-+/*  int Zvfs_Init(Tcl_Interp*);
-+  int Zvfs_Mount(Tcl_Interp*, char*, char *);*/
- 
-   int Blt_Init(Tcl_Interp*);
-   int Tktable_Init(Tcl_Interp*);
-@@ -64,15 +64,15 @@
-   appname = dupstr(argv[0]);
- 
-   // set default encoding dir
--  Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4");
-+  //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");
-+  //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;
-@@ -91,13 +91,13 @@
-   // 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)
-+/*  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);
-@@ -113,7 +113,7 @@
- #endif
-     Tcl_DStringFree(&pwd);
-   }
--
-+*/
-   // Initialize Tcl and Tk
-   if (Tcl_Init(interp))
-     return TCL_ERROR;
-@@ -121,7 +121,7 @@
-   // Tk
-   if (Tk_Init(interp))
-     return TCL_ERROR;
--  Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
-+  //Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
- 
-   {
-     Tcl_DString pwd;
-@@ -131,7 +131,7 @@
-   }
- 
-   // Blt
--  if (Blt_Init(interp) == TCL_ERROR)
-+  /*if (Blt_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "BLT", Blt_Init, 
- 		     (Tcl_PackageInitProc*)NULL);
-@@ -140,7 +140,7 @@
-   if (Tktable_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "Tktable", Tktable_Init, 
--		     (Tcl_PackageInitProc*)NULL);
-+		     (Tcl_PackageInitProc*)NULL);  */
- 
-   // Checkdns
-   if (Checkdns_Init(interp) == TCL_ERROR)
-@@ -161,10 +161,10 @@
- 		     (Tcl_PackageInitProc*)NULL);
- 
-   // Tclxpa
--  if (Tclxpa_Init(interp) == TCL_ERROR)
-+/*  if (Tclxpa_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
--		     (Tcl_PackageInitProc*)NULL);
-+		     (Tcl_PackageInitProc*)NULL);*/
- 
-   // IIS
-   if (Iis_Init(interp) == TCL_ERROR)
-@@ -179,7 +179,7 @@
- 		     (Tcl_PackageInitProc*)NULL);
- 
-   // Tkimg
--  if (Tkimg_Init(interp) == TCL_ERROR)
-+/*  if (Tkimg_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "img", 
- 		     Tkimg_Init,(Tcl_PackageInitProc*)NULL);
-@@ -254,7 +254,7 @@
-   if (Tkimgwindow_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
--		     (Tcl_PackageInitProc*)NULL);
-+		     (Tcl_PackageInitProc*)NULL);*/
- 
- #ifdef _MACOSX
-   if (Tkmacosx_Init(interp) == TCL_ERROR)
-@@ -271,11 +271,11 @@
- #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, "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_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY);*/
- 
-   //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
- 
-diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile
---- saods9.orig/ds9/Makefile	2009-02-16 17:06:50.000000000 +0000
-+++ saods9/ds9/Makefile	2009-02-16 17:33:47.000000000 +0000
-@@ -4,13 +4,7 @@
- #--------------------------defines
- 
- ZDIR	= zipdir/zvfsmntpt
--FILES	= $(ZDIR)/$(TCLVER) \
--	$(ZDIR)/$(TKVER) \
--	$(ZDIR)/$(BLTVER) \
--	$(ZDIR)/$(TCLLIBVER) \
--	$(ZDIR)/$(TKCONVER) \
--	$(ZDIR)/$(XMLRPCVER) \
--	$(ZDIR)/src \
-+FILES	= $(ZDIR)/src \
- 	$(ZDIR)/msgs \
- 	$(ZDIR)/doc \
- 	$(ZDIR)/template
-@@ -23,37 +17,13 @@
- 	../lib/libsaotk.a \
- 	../lib/libtkhtml.a \
- 	../lib/libtkmpeg.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/libBLT24.a \
--	../lib/libtk8.4.a \
--	../lib/libtcl8.4.a
-+	../lib/libcheckdns.a
- endif
- 
- ifeq ($(OS),windows)
-@@ -168,14 +138,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) $@
-@@ -382,7 +347,18 @@
- 	/usr/lib/amd64/libdl.so
- 	rm -f libstdc++.a
- endif
--
-+# For gentoo                                                               
-+ifeq ($(ARCH),gentoo)
-+ds9Base : $(OBJS) $(LIBS)
-+	$(RM) $@                                                                
-+	$(CXX) ${OPTS} ${LDFLAGS} \
-+	-o $@ $(OBJS) $(LIBS) \
-+	-L$(X11LIB) -lX11 \
-+	-ldl -lpthread \
-+	-ltk -ltcl -lBLT24 \
-+	-lfuntools `pkg-config --libs wcstools` -lz \
-+	`ast_link`                                                              
-+endif                 
- #--------------------------linux
- 
- ifneq (,$(findstring linux,$(ARCH)))
diff --git a/sci-astronomy/ds9/files/ds9-5.5-makefile.patch b/sci-astronomy/ds9/files/ds9-5.5-makefile.patch
deleted file mode 100644
index f165ec8..0000000
--- a/sci-astronomy/ds9/files/ds9-5.5-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- saods9.orig/Makefile	2009-02-16 17:06:48.000000000 +0000
-+++ saods9/Makefile	2009-02-16 18:06:01.000000000 +0000
-@@ -35,8 +35,7 @@
- 	--with-tk=$(root)/$(TKDIRDIR) $(XFLAGS)
-   XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
- 	$(XFLAGS)
--  HTMLFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIR) \
--	--with-tk=$(root)/$(TKDIR) $(XFLAGS)
-+  HTMLFLAGS = --prefix $(root) $(XFLAGS)
-   FUNTOOLSFLAGS = --prefix $(root) --with-zlib=../../lib/libz.a \
- 	--with-wcslib=../lib/libwcs.a --enable-mainlib
- endif
-@@ -197,11 +196,9 @@
- all	: build
- 
- build : dirs \
--	tcl tk \
--	tktable tcllib tkcon xmlrpc blt \
--	zlib \
--	tkimg tkmpeg html xpa iis checkdns \
--	funtools sla ast wcssubs rice hcompress plio $(OPTDIR) saotk zip zvfs ds9
-+	xmlrpc \
-+	tkmpeg html iis checkdns \
-+	sla rice hcompress plio $(OPTDIR) saotk ds9
- 
- doc	: FORCE
- 	@echo "Making Documentation..."
diff --git a/sci-astronomy/ds9/files/ds9-5.5-src.patch b/sci-astronomy/ds9/files/ds9-5.5-src.patch
deleted file mode 100644
index 559dc01..0000000
--- a/sci-astronomy/ds9/files/ds9-5.5-src.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- saods9.orig/src/ds9.tcl	2009-02-16 17:06:47.000000000 +0000
-+++ saods9/src/ds9.tcl	2009-02-16 18:37:18.000000000 +0000
-@@ -224,25 +224,29 @@
- # initialize, depending on how we are running: choices are zvfs, or wish
- # for now, its not possible to change the current work directory since
- # all of the paths are relative
--if {![catch {package present zvfs}]} {
--    set ds9(root) "zvfsmntpt"
-+if {![catch {package present checkdns}]} {
-+    set ds9(root) "/usr/share/ds9"
- 
--    source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl
--    source $ds9(root)/tcl8.4/http2.5/http.tcl
--
--    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 msgcat
-+    package require http
-+    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/make.gentoo b/sci-astronomy/ds9/files/make.gentoo
deleted file mode 100644
index 4ca1448..0000000
--- 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}