ds9-4.0_beta10: updated version and patches.

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@361 32389bae-6d03-0410-99cf-db05cde120eb

9 files changed, 176 insertions, 89 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index 9ddc600e3..f6d8d0e34 100644
--- a/sci-astronomy/ds9/ChangeLog
+++ b/sci-astronomy/ds9/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for sci-astronomy/ds9
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ds9-4.0_beta10 (15 Oct 2006)
+
+   15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> 
+   +ds9-4.0_beta10.ebuild
+   +files/ds9-iis.patch
+   +files/ds9-Makefile.patch
+   -ds9-4.0_beta7.ebuild	
+   Version bump. Removed outdated version. 
+	
 *ds9-4.0_beta7 (02 Dec 2005)
 
    O2 Dec 2005; Sebastien Fabbro <seb@ist.utl.pt> +ds9-4.0_beta7.ebuild:
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index f9de5e5f6..30462f2aa 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -1,5 +1,24 @@
-MD5 136442c7f901b769d8aba402103db6b6 ChangeLog 270
-MD5 ca47a1d8b95dd32d957b2dbf402250c0 ds9-4.0_beta7.ebuild 1489
-MD5 a8d8c98fa3633546413bd278f3af9ca8 files/digest-ds9-4.0_beta7 63
-MD5 1368902cfd7fbe8a1c52bf34c2829765 files/ds9-Makefile.patch 2040
-MD5 1a9e880154be5521b9aacc906b1f407a metadata.xml 370
+AUX ds9-Makefile.patch 2765 RMD160 ad893d348c21788301d85c1819ad0c3464d69f00 SHA1 639d09096712b5bfd4400c7bba1eec847bb611d1 SHA256 bc970eec09bd59dc5afcfbb8c1fd979590f4ea3d64e365b846df7edd5fa9e1c6
+MD5 5747aa9df02c24aa93081a413c8c1844 files/ds9-Makefile.patch 2765
+RMD160 ad893d348c21788301d85c1819ad0c3464d69f00 files/ds9-Makefile.patch 2765
+SHA256 bc970eec09bd59dc5afcfbb8c1fd979590f4ea3d64e365b846df7edd5fa9e1c6 files/ds9-Makefile.patch 2765
+AUX ds9-iis.patch 281 RMD160 7a7501b72c76cb773fb55058b590d1f22abb5746 SHA1 f9fd79bfb5dbe1234f69cfbd8521f6f35cc7d2e1 SHA256 197a302329ca82a475518f305cafd69c5ed2e2eb77aec25c580b2d0c16d6a280
+MD5 f4150dabeae67167f406aff57f1dd901 files/ds9-iis.patch 281
+RMD160 7a7501b72c76cb773fb55058b590d1f22abb5746 files/ds9-iis.patch 281
+SHA256 197a302329ca82a475518f305cafd69c5ed2e2eb77aec25c580b2d0c16d6a280 files/ds9-iis.patch 281
+DIST ds9.4.0b10.tar.gz 23761512 RMD160 9f2d1e4135cd470117793505d80f8993f329a6dc SHA1 c8e3100b493b22587dd9300cf6cd7038346e0fdd SHA256 16f31beb2fa7c6c90907948e20cea66f499d6c13ca98fc8b9dcc6ccb8f48e5d5
+EBUILD ds9-4.0_beta10.ebuild 1562 RMD160 d85a72abe88064de2b90e96e527718cb61203b89 SHA1 7937b235cf1a665b2c63b3c7978595d5d70f09fc SHA256 f14ae6d1849f2e0811c66dd090c8d7ffa17453aa2e829390efff8132fd8ee721
+MD5 81958ddfb8f68369cb2d446fed17e992 ds9-4.0_beta10.ebuild 1562
+RMD160 d85a72abe88064de2b90e96e527718cb61203b89 ds9-4.0_beta10.ebuild 1562
+SHA256 f14ae6d1849f2e0811c66dd090c8d7ffa17453aa2e829390efff8132fd8ee721 ds9-4.0_beta10.ebuild 1562
+MISC ChangeLog 503 RMD160 be5fed7ae980a7d9096ef99fbb742893fc31390d SHA1 5318a6f3ed4694b07059f817e4973da0ee8c8947 SHA256 6ce709d977e980efa2d3556e2464afd24d17060ca019fe56f45d26d12fb6840e
+MD5 8f3bfdd2f2a68c1e67495214f822c43c ChangeLog 503
+RMD160 be5fed7ae980a7d9096ef99fbb742893fc31390d ChangeLog 503
+SHA256 6ce709d977e980efa2d3556e2464afd24d17060ca019fe56f45d26d12fb6840e ChangeLog 503
+MISC metadata.xml 1204 RMD160 499402134f93bfb9e0e94256deb868deef3fecdb SHA1 01ed9fc148888ada86ef32171e0582b73b0e4ecd SHA256 455ee63ba4680c5d3877f9069aa839b7c290ad45b56e1824d32d32c0109813e0
+MD5 0bcfcb07c4b91f3b64a39bb6e1c0d67f metadata.xml 1204
+RMD160 499402134f93bfb9e0e94256deb868deef3fecdb metadata.xml 1204
+SHA256 455ee63ba4680c5d3877f9069aa839b7c290ad45b56e1824d32d32c0109813e0 metadata.xml 1204
+MD5 b8f07f84f583af1e005825e1e215fd14 files/digest-ds9-4.0_beta10 238
+RMD160 6e125cbb68a20af0f1d3ffcfca8172ebaa291c52 files/digest-ds9-4.0_beta10 238
+SHA256 1c1d110961285243ef7b5c1e49c0a322da6473df96fea2fe975af30c4381db88 files/digest-ds9-4.0_beta10 238
diff --git a/sci-astronomy/ds9/ds9-4.0_beta10.ebuild b/sci-astronomy/ds9/ds9-4.0_beta10.ebuild
new file mode 100644
index 000000000..52c43dbb0
--- /dev/null
+++ b/sci-astronomy/ds9/ds9-4.0_beta10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit flag-o-matic eutils
+
+MY_PV=${PV/_beta/b}
+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}.${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+DEPEND="app-arch/zip"
+
+S=${WORKDIR}/sao${PN}
+
+# This is a long and fragile compilation
+# which recompiles tcl/tk, blt, funtools, and who knows what else
+# The make install in src_compile only installs and strips the ds9 exec
+# One day scientists will use tools like autotools, cmake, scons
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# patch to speed up compilation (no man pages generation)
+	epatch ${FILESDIR}/${PN}-Makefile.patch
+	# patch to fix a cast on 64 bits.
+	use amd64 && epatch ${FILESDIR}/${PN}-iis.patch
+	# add a line for the shell to understand
+	sed -i -e '1i #!/bin/sh' funtools-*/filter/inc.sed
+}
+
+src_compile() {
+	local ds9arch
+	case ${ARCH} in
+		x86)
+			ds9arch=linux
+			;;
+		amd64)
+			ds9arch=linux64
+			;;
+		ppc)
+			ds9arch=linuxppc
+			;;
+		ppc-macos)
+			ds9arch=darwin
+			;;
+		x86-fbsd)
+			ds9arch=freebsd
+			;;
+		*) die "ds9 not supported upstream for this architecture";;
+	esac
+
+	ln -s make.${ds9arch} make.include
+	emake || die "emake failed"
+	# only install locally
+}
+
+src_install () {
+	dobin bin/ds9
+	dobin bin/xpa*
+	doman man/man?/xpa*
+	dodoc README acknowledgement copyright
+	use doc && dohtml doc/*
+}
diff --git a/sci-astronomy/ds9/ds9-4.0_beta7.ebuild b/sci-astronomy/ds9/ds9-4.0_beta7.ebuild
deleted file mode 100644
index f79939387..000000000
--- a/sci-astronomy/ds9/ds9-4.0_beta7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils
-
-MY_PV="4.0b7"
-DESCRIPTION="Astronomical imaging and data visualization application for FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc xpa"
-DEPEND=">=sys-devel/gcc-3.4
-        virtual/x11"
-RDEPEND="virtual/x11"
-
-S=${WORKDIR}/sao${PN}
-
-# This is a long and fragile compilation
-# which recompiles tcl/tk, blt, funtools, and who knows what else
-# The make install in src_compile only install and strip the ds9 exec
-# One day scientists will use tools like autotools, cmake, scons
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-    # The patch is to speed up the compilation
-    # (avoid generating tcl man files for ex.) 
-    # and avoid local install bugs with symbolic linking.
-	epatch ${FILESDIR}/${PN}-Makefile.patch
-}
-
-src_compile() {
-	! is-flag -fPIC && append-flags -fPIC
-	sed -i -e '1i #!/bin/sh' funtools-*/filter/inc.sed
-	use x86   && ln -s make.linux make.include
-	use amd64 && ln -s make.linux64 make.include
-	emake -j1 || die "emake failed"
-	# only install locally
-	make install || die "make install (local) failed"
-}
-
-src_install () {
-	dobin bin/ds9
-	if use xpa; then
-		dobin bin/xpa*
-		doman man/man?/xpa*
-	fi
-	dodoc README acknowledgement copyright
-	use doc && dohtml ds9/doc/*
-}
diff --git a/sci-astronomy/ds9/files/digest-ds9-4.0_beta10 b/sci-astronomy/ds9/files/digest-ds9-4.0_beta10
new file mode 100644
index 000000000..6670ba81b
--- /dev/null
+++ b/sci-astronomy/ds9/files/digest-ds9-4.0_beta10
@@ -0,0 +1,3 @@
+MD5 b2969056c7cd429a716f794a4dcceb16 ds9.4.0b10.tar.gz 23761512
+RMD160 9f2d1e4135cd470117793505d80f8993f329a6dc ds9.4.0b10.tar.gz 23761512
+SHA256 16f31beb2fa7c6c90907948e20cea66f499d6c13ca98fc8b9dcc6ccb8f48e5d5 ds9.4.0b10.tar.gz 23761512
diff --git a/sci-astronomy/ds9/files/digest-ds9-4.0_beta7 b/sci-astronomy/ds9/files/digest-ds9-4.0_beta7
deleted file mode 100644
index 6202529fa..000000000
--- a/sci-astronomy/ds9/files/digest-ds9-4.0_beta7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86bde2f24ef70cd57c2fd856ccf9dcc1 ds9.4.0b7.tar.gz 22237375
diff --git a/sci-astronomy/ds9/files/ds9-Makefile.patch b/sci-astronomy/ds9/files/ds9-Makefile.patch
index c5be804bc..3a2de8377 100644
--- a/sci-astronomy/ds9/files/ds9-Makefile.patch
+++ b/sci-astronomy/ds9/files/ds9-Makefile.patch
@@ -1,42 +1,42 @@
---- Makefile.old	2005-12-01 23:31:19.000000000 +0000
-+++ Makefile	2005-12-01 19:52:04.000000000 +0000
-@@ -141,22 +141,22 @@
+--- Makefile	2006-09-05 19:16:36.000000000 +0100
++++ Makefile.new	2006-10-12 19:46:14.000000000 +0100
+@@ -286,40 +286,40 @@
  tclsh	: FORCE
  	@echo "Installing Tcl shared..."
- 	cd $(TCLDIRDIR); CC=$(CCc) ./configure $(TCLFLAGS) --enable-shared
+ 	cd $(TCLDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --enable-shared
 -	cd $(TCLDIRDIR); $(MAKE) install
 +	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
  
  tcl	: FORCE
  	@echo "Installing Tcl noshared..."
- 	cd $(TCLDIRDIR); CC=$(CCc) ./configure $(TCLFLAGS) --disable-shared
+ 	cd $(TCLDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --disable-shared
 -	cd $(TCLDIRDIR); $(MAKE) install
 +	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
  
  tksh	: FORCE
  	@echo "Installing Tk shared..."
- 	cd $(TKDIRDIR); CC=$(CCc) ./configure $(TCLFLAGS) --enable-shared
+ 	cd $(TKDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --enable-shared
 -	cd $(TKDIRDIR); $(MAKE) install
 +	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
+ 	$(RM) -r lib/tk8.4/demos
+ 	$(RM) -r lib/$(TKVER)/demos
  
  tk	: FORCE
  	@echo "Installing Tk noshared..."
- 	cd $(TKDIRDIR); CC=$(CCc) ./configure $(TCLFLAGS) --disable-shared
+ 	cd $(TKDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --disable-shared
 -	cd $(TKDIRDIR); $(MAKE) install
 +	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
+ 	$(RM) -r lib/$(TKVER)/demos
  
- tclxsh  : FORCE
- 	@echo "Installing TCLX shared..."
-@@ -171,17 +171,17 @@
  tktablesh : FORCE
  	@echo "Installing TkTable..."
- 	cd $(TKTABLEDIR); CC=$(CCc) ./configure $(TCLFLAGS) --enable-shared
+ 	cd $(TKTABLEDIR); CC='$(CC) $(OPTS)' ./configure $(TKTABLEFLAGS) --enable-shared
 -	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install 
-+	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries
++	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries 
  
  tktable	: FORCE
  	@echo "Installing TkTable..."
- 	cd $(TKTABLEDIR); CC=$(CCc) ./configure $(TCLFLAGS) --disable-shared
+ 	cd $(TKTABLEDIR); CC='$(CC) $(OPTS)' ./configure $(TKTABLEFLAGS) --disable-shared
 -	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install
 +	cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries
  
@@ -48,12 +48,30 @@
  
  tkindex : FORCE
  	@echo "Installing Tk mkIndex..."
-@@ -190,7 +190,7 @@
- blt	: FORCE
- 	@echo "Installing BLT..."
- 	cd $(BLTDIR); ./configure $(BLTFLAGS)
--	cd $(BLTDIR); $(MAKE); $(MAKE) install
-+	cd $(BLTDIR); $(MAKE); $(MAKE) -C src install; $(MAKE) -C library install
- 
- mktclapp: FORCE
- 	@echo "Installing MKTCLAPP..."
+@@ -338,7 +338,7 @@
+ zlibsh  : FORCE
+ 	@echo "Installing zlib..."
+ 	cd $(ZLIBDIR); CC=$(CC) CFLAGS='$(OPTS)' ./configure $(ZLIBFLAGS) --shared
+-	cd $(ZLIBDIR); $(MAKE) install
++	cd $(ZLIBDIR); $(MAKE) install-binaries install-libraries
+ 
+ tkimg	: FORCE
+ 	@echo "Installing TKIMG noshared..."
+@@ -348,7 +348,7 @@
+ tkimgsh	: FORCE
+ 	@echo "Installing TKIMG shared..."
+ 	cd $(TKIMGDIR); CC='$(CC) $(OPTS)' ./configure $(TKIMGFLAGS)
+-	cd $(TKIMGDIR); $(MAKE) install
++	cd $(TKIMGDIR); $(MAKE) install-binaries install-libraries
+ 
+ tkmpeg	: FORCE
+ 	@echo "Installing TKMPEG..."
+@@ -371,7 +371,7 @@
+ xpash	: FORCE
+ 	@echo "Installing XPA shared..."
+ 	cd $(XPADIR); CC=$(CC) CFLAGS='$(OPTS)' LDFLAGS='$(OPTS)' ./configure $(XPAFLAGS) --enable-shared
+-	cd $(XPADIR); $(MAKE); $(MAKE) tclxpa; $(MAKE) install
++	cd $(XPADIR); $(MAKE); $(MAKE) tclxpa; $(MAKE) install-binaries install-libraries
+ 	cd bin; strip xpa*
+ 
+ xpa	: FORCE
diff --git a/sci-astronomy/ds9/files/ds9-iis.patch b/sci-astronomy/ds9/files/ds9-iis.patch
new file mode 100644
index 000000000..bd4d21c9f
--- /dev/null
+++ b/sci-astronomy/ds9/files/ds9-iis.patch
@@ -0,0 +1,11 @@
+--- iis/xim.C	2006-04-25 01:39:32.000000000 +0100
++++ iis/xim.C.new	2006-10-12 19:47:11.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ void iisIO(void* data, int mask)
+ {
+-  int fd = (int)data;
++  int fd = (long)data;
+ 
+   if (IISDebug)
+     cerr << "iisIO() " << fd << ' ' << mask << endl;
diff --git a/sci-astronomy/ds9/metadata.xml b/sci-astronomy/ds9/metadata.xml
index 58c7d934e..a637e4989 100644
--- a/sci-astronomy/ds9/metadata.xml
+++ b/sci-astronomy/ds9/metadata.xml
@@ -2,11 +2,25 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<maintainer>
-  <email>seb@ist.utl.pt</email>
-  <name> Sebastien Fabbro</name>
-</maintainer>
-  <longdescription lang="en">
-    DS9 is a a package to visualize multiple astronomical FITS images.
-  </longdescription>
+<longdescription lang="en">
+SAOImage DS9 is an astronomical imaging and data visualization
+application. DS9 supports FITS images and binary tables, multiple
+frame buffers, region manipulation, and many scale algorithms and
+colormaps. It provides for easy communication with external analysis
+tasks and is highly configurable and extensible. DS9 supports advanced
+features such as 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 access.
+ 
+ The GUI for DS9 is user configurable. GUI elements such as the
+ coordinate display, panner, magnifier, horizontal and vertical
+ graphs, button bar, and colorbar can be configured via menus or the
+ command line.
+ 
+ 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>