diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2009-02-25 17:17:33 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-02-25 17:17:33 +0000 |
commit | bb7b86faa018bb758049c71a2ac85cb5ce04737a (patch) | |
tree | b7fd9e583b6d8bf0347d98e2159ef215404b2680 /sci-astronomy | |
parent | Ops (diff) | |
download | historical-bb7b86faa018bb758049c71a2ac85cb5ce04737a.tar.gz historical-bb7b86faa018bb758049c71a2ac85cb5ce04737a.tar.bz2 historical-bb7b86faa018bb758049c71a2ac85cb5ce04737a.zip |
Removed old version
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/ds9/ChangeLog | 8 | ||||
-rw-r--r-- | sci-astronomy/ds9/Manifest | 18 | ||||
-rw-r--r-- | sci-astronomy/ds9/ds9-5.4.ebuild | 60 | ||||
-rw-r--r-- | sci-astronomy/ds9/ds9-5.5.ebuild | 4 | ||||
-rw-r--r-- | sci-astronomy/ds9/files/ds9-5.4-fitsy.patch | 13 | ||||
-rw-r--r-- | sci-astronomy/ds9/files/ds9-5.4-main.patch | 226 | ||||
-rw-r--r-- | sci-astronomy/ds9/files/ds9-5.4-makefile.patch | 26 | ||||
-rw-r--r-- | sci-astronomy/ds9/files/ds9-5.4-src.patch | 51 |
8 files changed, 15 insertions, 391 deletions
diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog index a2888d27e594..4d2d0ab7965b 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.18 2009/02/17 20:24:43 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.19 2009/02/25 17:17:33 bicatali Exp $ + + 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: diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest index bd8876226d79..4515a3fd4e31 100644 --- a/sci-astronomy/ds9/Manifest +++ b/sci-astronomy/ds9/Manifest @@ -4,29 +4,23 @@ Hash: SHA1 AUX ds9-5.1-gcc4.2-x86.patch 1001 RMD160 c955fdf898c2fbcc10a4597b3147fd2f534ccb42 SHA1 71826d2027f5fbeca166fa30d7eff718a393645c SHA256 a890da6e6d93a9b246948c6088104e176a42ba796042039186d5aabfcab3f280 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-fitsy.patch 484 RMD160 863e6a32160e8c91152293ccbea1ba7764de7247 SHA1 ce264a4a03d4a4422c63f89f939b143646e24fdc SHA256 9403d8bc011fb99f84acb65ab81a33e67867a30f1ca554af718ff5d3f9d1ca6e 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-main.patch 6580 RMD160 7d2b235ea6137a618919628214b54fdff7636d51 SHA1 a9039c744448811da5a140762ef49649105baad1 SHA256 cd284ebef857ecf9e8f23b4ba1943efb57006f879d19bc36e10e5fba9e5d9884 -AUX ds9-5.4-makefile.patch 861 RMD160 d8bc94e012ea3ebf1a5ac8d56b255d097379f617 SHA1 c5488838e13ba59d5e4675bcf7475f97b5461f74 SHA256 bf9f2b61f9abf224600663511b873547a18fab2f2dbc59545a62737940be5676 AUX ds9-5.4-saotk.patch 5400 RMD160 abfd44096cc329ae19350ae6bed50e05751fd7f8 SHA1 eb70b5cd98837ed21f0eeae293395c94686a0b33 SHA256 5bd91e719d5992502b65eb27309cde8c653175c3dba0c2db8e7cd674e652cbc8 -AUX ds9-5.4-src.patch 1690 RMD160 50ae454f2a640ac62b0509b019b070abbbe7e181 SHA1 5271be0ab53115d1038976eb14428a9034fc8bfc SHA256 e7f18d9b46e92f04dd33a06c8373c3d780b81a3dcce421b3b4e4c4cb873be0f5 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.2.tar.gz 26540080 RMD160 3951e9d6ec4b5310ebf3d69324e35c028e38c16e SHA1 f887b6e6dac17146f35aed338bc389c34947da03 SHA256 1b4d2edf056f8448469b4cb26e3f21c850d564e9ed49abb46ecb053f548779dd -DIST ds9.5.4.tar.gz 26983327 RMD160 0324d705a487a53f2efedba66c810360e7f9f8c5 SHA1 ee4be3f9e12b1d955fec619939a6daeaaca20155 SHA256 a3c367de6c99b9cf55c7c7d134a965dd61b4363b13899ded03edc3ef4b192b0d DIST ds9.5.5.tar.gz 27278806 RMD160 abcc1c71c62ac0ab3e81727ab55f561b0e174417 SHA1 ff83a450e86a3e9d252200b4cf4339a41626db87 SHA256 051cd9de22000a641acf4510d8bd7ecd4ec7cca5a2d1fe8745df6dec076b7f3f EBUILD ds9-5.2.ebuild 1967 RMD160 0f1b3f91b587ce4f6b925c5a6c126b5452a7939e SHA1 8fd2e3451161dc5622480d5c0aed07a61136ae41 SHA256 e0f7659bb31c0bed23eb1fa4e89ec75272be48f089f6fb6f92fb6fed32e76c42 -EBUILD ds9-5.4.ebuild 1802 RMD160 8c0fb6700783256df3a8e0581353fdb5dbda3af1 SHA1 8bf5aef825f0226560158ecfd36afc6193da46bb SHA256 44a565b2127717faf8cae94537caae4b319b7511f33654c808d9ec01fe198e11 -EBUILD ds9-5.5.ebuild 1857 RMD160 0f177d3a951b6ea8be88f12cf68abb1f780378b7 SHA1 c36dd28da0411d89cafb02742d01c1e03d5cef6f SHA256 ad203b9229fec5a940c21c7d48afa2091e86760c3de4cb06ccad328d7a0a5a13 -MISC ChangeLog 3425 RMD160 bc25ce4deb398a0be20f350832452e3e41c90131 SHA1 1aa419dcc14b0bdb04aaf5afe6384e4a7e850693 SHA256 659abd8cfaf83c3a9cfe393a6dddd2c71d3ec10ffcc19a211780e1aa4dcc1138 +EBUILD ds9-5.5.ebuild 1857 RMD160 6bd7c7b7884dd220aebea82d2d95cc28d72f040a SHA1 72162aee51ac9578b53fd65a9669a69d9e9b7bc6 SHA256 26c028108d81b7783b0ea9d62f15e94851c3ddfc4a9077c47849d6dd4e4b4953 +MISC ChangeLog 3654 RMD160 2ed6ef158420893e31a1a64fc22d5e49c17f90ea SHA1 474421158537d253f0092410e8307b5daf4d0645 SHA256 fb01d2430b9d4bb08935064713adb67ab1c6143550f3daad1f9895726fc0a225 MISC metadata.xml 1072 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 SHA1 1cefcee915ef90f64beb486d298972981ea3891e SHA256 42893aa6c35591819017a8708062c88df98d27ab0466ec07d7603b46d6e3719e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.10 (GNU/Linux) -iEYEARECAAYFAkmbHRcACgkQ1ycZbhPLE2CMogCeK5UE4NDJ5Ax/aTfiRf8zNqS8 -4KEAni1rCMlKGZKEuOMReH/yXyEi2klh -=k0Ln +iEYEARECAAYFAkmlfTgACgkQ1ycZbhPLE2D5DwCeI3259xJO3Q8ajHQodTG4cXun +FBsAnjSGYJQW04phfKbwub3F3eBPzJZu +=Gm5X -----END PGP SIGNATURE----- diff --git a/sci-astronomy/ds9/ds9-5.4.ebuild b/sci-astronomy/ds9/ds9-5.4.ebuild deleted file mode 100644 index 40df9be8ab8b..000000000000 --- a/sci-astronomy/ds9/ds9-5.4.ebuild +++ /dev/null @@ -1,60 +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.4.ebuild,v 1.4 2009/02/17 16:37:26 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-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-r1 - 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}"/${P}-saotk.patch - epatch "${FILESDIR}"/${P}-htmlwidget.patch - epatch "${FILESDIR}"/${P}-main.patch - epatch "${FILESDIR}"/${P}-src.patch - epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${P}-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 - doicon doc/sun.gif - make_desktop_entry ds9 "SAOImage DS9" sun.gif -} diff --git a/sci-astronomy/ds9/ds9-5.5.ebuild b/sci-astronomy/ds9/ds9-5.5.ebuild index 520f277b1450..be6339181b75 100644 --- a/sci-astronomy/ds9/ds9-5.5.ebuild +++ b/sci-astronomy/ds9/ds9-5.5.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.5.ebuild,v 1.2 2009/02/17 16:37:26 bicatali Exp $ +# $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 @@ -22,7 +22,7 @@ RDEPEND="dev-tcltk/blt x11-libs/libXau x11-libs/libXdmcp x11-libs/xpa - >=sci-astronomy/ast-4.6.2-r1 + >=sci-astronomy/ast-4.6.2-r2 sci-astronomy/funtools" DEPEND="${RDEPEND} diff --git a/sci-astronomy/ds9/files/ds9-5.4-fitsy.patch b/sci-astronomy/ds9/files/ds9-5.4-fitsy.patch deleted file mode 100644 index 4440aa86536e..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.4-fitsy.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 --git a/sci-astronomy/ds9/files/ds9-5.4-main.patch b/sci-astronomy/ds9/files/ds9-5.4-main.patch deleted file mode 100644 index 9b016a43f3cf..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.4-main.patch +++ /dev/null @@ -1,226 +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-05 11:03:36.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 2008-10-08 20:36:37.000000000 +0100 -+++ saods9/ds9/Makefile 2008-11-05 11:13:15.000000000 +0000 -@@ -4,12 +4,7 @@ - #--------------------------defines - - ZDIR = zipdir/zvfsmntpt --FILES = $(ZDIR)/$(TCLVER) \ -- $(ZDIR)/$(TKVER) \ -- $(ZDIR)/$(BLTVER) \ -- $(ZDIR)/$(TCLLIBVER) \ -- $(ZDIR)/$(TKCONVER) \ -- $(ZDIR)/src \ -+FILES = $(ZDIR)/src \ - $(ZDIR)/msgs \ - $(ZDIR)/doc \ - $(ZDIR)/template -@@ -22,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) -@@ -167,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) $@ -@@ -366,6 +332,20 @@ - rm -f libstdc++.a - endif - -+# For gentoo -+ifeq ($(ARCH),gentoo) -+ds9Base : $(OBJS) $(LIBS) -+ $(RM) $@ -+ $(CXX) ${OPTS} \ -+ -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.4-makefile.patch b/sci-astronomy/ds9/files/ds9-5.4-makefile.patch deleted file mode 100644 index 25763cf75a01..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.4-makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- saods9.orig/Makefile 2008-10-08 20:53:46.000000000 +0100 -+++ saods9/Makefile 2008-11-04 10:30:52.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 -@@ -199,11 +198,8 @@ - all : build - - build : dirs \ -- tcl tk \ -- tktable tcllib tkcon blt \ -- zlib \ -- tkimg tkmpeg html xpa iis checkdns \ -- funtools sla ast wcssubs rice hcompress plio $(OPTDIR) saotk zip zvfs ds9 -+ 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.4-src.patch b/sci-astronomy/ds9/files/ds9-5.4-src.patch deleted file mode 100644 index fea3edd1fd3d..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.4-src.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nur saods9.orig/src/ds9.tcl saods9/src/ds9.tcl ---- saods9/src/ds9.tcl 2008-04-09 17:35:48.000000000 +0200 -+++ saods9.new/src/ds9.tcl 2008-11-03 16:13:55.000000000 +0200 -@@ -68,24 +68,34 @@ - # 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 -+ 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 -+ package require base64 -+ package require log -+ package require ftp -+ package require textutil::repeat -+ package require textutil::tabify - -- source $ds9(root)/tkcon2.5/tkcon.tcl -+ package require tkcon - -- source $ds9(root)/blt2.4/graph.tcl -- source $ds9(root)/blt2.4/tabset.tcl -+ 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 - |