sci-astronomy/ds9: ds9: version bump

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

6 files changed, 49 insertions, 52 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index 17dea62c2..d897fc9e9 100644
--- a/sci-astronomy/ds9/ChangeLog
+++ b/sci-astronomy/ds9/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/ds9
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/ds9-Makefile.patch, -ds9-4.0_beta10.ebuild, +ds9-4.12.ebuild:
+  ds9: version bump
+
   16 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> 
   +ds9-4.0_beta10.ebuild
   +files/ds9-Makefile.patch
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index d2a4ecf13..748fc277c 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -1,24 +1,24 @@
-AUX ds9-Makefile.patch 3199 RMD160 b598c9d9610b18f778fc3bc7d1ff5edea026e179 SHA1 bdd4f73d4df4d3e03e419f44ae35745e7e90459c SHA256 9f6327e884306e90109fc42fdc03c2d589bd7a7531412f660f8fa836e3df9080
-MD5 21b3f865bc85766987ea2b2f23761786 files/ds9-Makefile.patch 3199
-RMD160 b598c9d9610b18f778fc3bc7d1ff5edea026e179 files/ds9-Makefile.patch 3199
-SHA256 9f6327e884306e90109fc42fdc03c2d589bd7a7531412f660f8fa836e3df9080 files/ds9-Makefile.patch 3199
+AUX ds9-Makefile.patch 3245 RMD160 ebe65616f1c6a929f53fbfcf819d27bc7ed1dec7 SHA1 64a26c5db8c3a1faf72edd7209009b9986d71cfe SHA256 c91d95555ce09f1e31850b8c593a2a359c7f8477d8c46ce690b954592d4a8113
+MD5 4e4bc986b177f6f23ef63b7414fdbaa4 files/ds9-Makefile.patch 3245
+RMD160 ebe65616f1c6a929f53fbfcf819d27bc7ed1dec7 files/ds9-Makefile.patch 3245
+SHA256 c91d95555ce09f1e31850b8c593a2a359c7f8477d8c46ce690b954592d4a8113 files/ds9-Makefile.patch 3245
 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 1630 RMD160 01456559d3d150c78686dda99c22b51c30c4b87d SHA1 39619312ba1ab48eeff8eaa0a448fa8f4f43681d SHA256 b523c28c73d259391c3d3a7b405748cd7c5e814b599fe1312491887c0c3933e2
-MD5 6a514580d04eac1c8a49a297fc7dd6b3 ds9-4.0_beta10.ebuild 1630
-RMD160 01456559d3d150c78686dda99c22b51c30c4b87d ds9-4.0_beta10.ebuild 1630
-SHA256 b523c28c73d259391c3d3a7b405748cd7c5e814b599fe1312491887c0c3933e2 ds9-4.0_beta10.ebuild 1630
-MISC ChangeLog 657 RMD160 2e625c5d418289afb2c4c4f9f7f2deb64a8df111 SHA1 d0747fe1641cc34f3bb40aab8c73b232ba57d22a SHA256 7a6273714736eb8736086c2b42acebd419668f3f0c5a16e60f039bdd6d6f4495
-MD5 2c03e2e1b59d1aeb3784dcc67ae69b1a ChangeLog 657
-RMD160 2e625c5d418289afb2c4c4f9f7f2deb64a8df111 ChangeLog 657
-SHA256 7a6273714736eb8736086c2b42acebd419668f3f0c5a16e60f039bdd6d6f4495 ChangeLog 657
+DIST ds9.4.12.tar.gz 25538527 RMD160 fcfff6ac98ed367a6fdf19a5f5cd8338bad270b3 SHA1 f07faff4620bad7673da2ab86449f5cef7a5dd98 SHA256 6d744e4ed485b64115b6007d91afd53048dd689dfe0b7129a4adfe82b6a2a380
+EBUILD ds9-4.12.ebuild 1294 RMD160 eb0308485ca98947d3bb3b032e84c4c37ee9d6a5 SHA1 c75b351e45410f5283d75bdff2f292d7eda01a96 SHA256 e124e3357fa9f30000186cae5923b0b2e9072574d8acfe78d6188c685d706da5
+MD5 325311d2fe81a46459c069bf8c43807f ds9-4.12.ebuild 1294
+RMD160 eb0308485ca98947d3bb3b032e84c4c37ee9d6a5 ds9-4.12.ebuild 1294
+SHA256 e124e3357fa9f30000186cae5923b0b2e9072574d8acfe78d6188c685d706da5 ds9-4.12.ebuild 1294
+MISC ChangeLog 803 RMD160 8fd19b2303b32df282d3ec6aa73a0c3024ba7260 SHA1 2c20b5cda85780d5b21eb884ee0f477d9dad8f45 SHA256 70c88b7d6206e203c48aad8c5b6bd891e124373ff68f60d3e2463f0cb7be74a5
+MD5 c2a28d045707b81c33fb1a1085312fbb ChangeLog 803
+RMD160 8fd19b2303b32df282d3ec6aa73a0c3024ba7260 ChangeLog 803
+SHA256 70c88b7d6206e203c48aad8c5b6bd891e124373ff68f60d3e2463f0cb7be74a5 ChangeLog 803
 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
+MD5 c025117ffefc84698e48aee76cfe7f7e files/digest-ds9-4.12 232
+RMD160 34280fa4450652be0624066a651da9c2ef070ab7 files/digest-ds9-4.12 232
+SHA256 db906022390c3aa4914efa8a1a4c32bf1e5405ee10a1d700fdb553bdb157dcf7 files/digest-ds9-4.12 232
diff --git a/sci-astronomy/ds9/ds9-4.0_beta10.ebuild b/sci-astronomy/ds9/ds9-4.12.ebuild
index 3996c95fb..f2fe975b0 100644
--- a/sci-astronomy/ds9/ds9-4.0_beta10.ebuild
+++ b/sci-astronomy/ds9/ds9-4.12.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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"
+SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -18,22 +17,15 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	app-arch/zip"
 
-S=${WORKDIR}/sao${PN}
+RESTRICT="strip test"
 
-# 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
+S=${WORKDIR}/sao${PN}
 
 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
+	epatch "${FILESDIR}"/${PN}-Makefile.patch
 }
 
 src_compile() {
@@ -48,22 +40,23 @@ src_compile() {
 		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 OPTS="${CXXFLAGS}" || die "emake failed"
+
+	# This is a long and fragile compilation
+	# which recompiles tcl/tk, tkimg, blt, funtools, 
+	# and a lot of other packages
+	emake -j1 OPTS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install () {
 	dobin bin/ds9
 	dobin bin/xpa*
 	doman man/man?/xpa*
-	dodoc README acknowledgement copyright
-	use doc && dohtml doc/*
+	dodoc README acknowledgement
+	use doc && dohtml -r doc/*
 }
diff --git a/sci-astronomy/ds9/files/digest-ds9-4.0_beta10 b/sci-astronomy/ds9/files/digest-ds9-4.0_beta10
deleted file mode 100644
index 6670ba81b..000000000
--- a/sci-astronomy/ds9/files/digest-ds9-4.0_beta10
+++ /dev/null
@@ -1,3 +0,0 @@
-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.12 b/sci-astronomy/ds9/files/digest-ds9-4.12
new file mode 100644
index 000000000..d193ea245
--- /dev/null
+++ b/sci-astronomy/ds9/files/digest-ds9-4.12
@@ -0,0 +1,3 @@
+MD5 27f6c1ffe4c52e76694120d4fcf520ef ds9.4.12.tar.gz 25538527
+RMD160 fcfff6ac98ed367a6fdf19a5f5cd8338bad270b3 ds9.4.12.tar.gz 25538527
+SHA256 6d744e4ed485b64115b6007d91afd53048dd689dfe0b7129a4adfe82b6a2a380 ds9.4.12.tar.gz 25538527
diff --git a/sci-astronomy/ds9/files/ds9-Makefile.patch b/sci-astronomy/ds9/files/ds9-Makefile.patch
index 5759a6d0b..12953b2ee 100644
--- a/sci-astronomy/ds9/files/ds9-Makefile.patch
+++ b/sci-astronomy/ds9/files/ds9-Makefile.patch
@@ -1,21 +1,21 @@
---- Makefile.orig	2006-10-18 11:47:43.000000000 +0100
-+++ Makefile	2006-10-18 11:48:37.000000000 +0100
-@@ -286,40 +286,40 @@
+--- Makefile.orig	2007-04-19 19:25:12.771792750 +0100
++++ Makefile	2007-04-19 19:30:25.975366750 +0100
+@@ -345,40 +345,40 @@
  tclsh	: FORCE
  	@echo "Installing Tcl shared..."
- 	cd $(TCLDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --enable-shared
+ 	cd $(TCLDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --enable-shared
 -	cd $(TCLDIRDIR); $(MAKE) install
 +	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
  
  tcl	: FORCE
  	@echo "Installing Tcl noshared..."
- 	cd $(TCLDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --disable-shared
+ 	cd $(TCLDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --disable-shared
 -	cd $(TCLDIRDIR); $(MAKE) install
 +	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
  
  tksh	: FORCE
  	@echo "Installing Tk shared..."
- 	cd $(TKDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --enable-shared
+ 	cd $(TKDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --enable-shared
 -	cd $(TKDIRDIR); $(MAKE) install
 +	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
  	$(RM) -r lib/tk8.4/demos
@@ -23,7 +23,7 @@
  
  tk	: FORCE
  	@echo "Installing Tk noshared..."
- 	cd $(TKDIRDIR); CC='$(CC) $(OPTS)' ./configure $(TCLFLAGS) --disable-shared
+ 	cd $(TKDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --disable-shared
 -	cd $(TKDIRDIR); $(MAKE) install
 +	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
  	$(RM) -r lib/$(TKVER)/demos
@@ -32,7 +32,7 @@
  	@echo "Installing TkTable..."
  	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..."
@@ -48,7 +48,7 @@
  
  tkindex : FORCE
  	@echo "Installing Tk mkIndex..."
-@@ -338,7 +338,7 @@
+@@ -397,7 +397,7 @@
  zlibsh  : FORCE
  	@echo "Installing zlib..."
  	cd $(ZLIBDIR); CC=$(CC) CFLAGS='$(OPTS)' ./configure $(ZLIBFLAGS) --shared
@@ -57,7 +57,7 @@
  
  tkimg	: FORCE
  	@echo "Installing TKIMG noshared..."
-@@ -348,7 +348,7 @@
+@@ -407,7 +407,7 @@
  tkimgsh	: FORCE
  	@echo "Installing TKIMG shared..."
  	cd $(TKIMGDIR); CC='$(CC) $(OPTS)' ./configure $(TKIMGFLAGS)
@@ -66,16 +66,16 @@
  
  tkmpeg	: FORCE
  	@echo "Installing TKMPEG..."
-@@ -371,7 +371,7 @@
+@@ -430,7 +430,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*
+ 	cd bin; $(STRIP) xpa*
  
  xpa	: FORCE
-@@ -427,7 +427,7 @@
+@@ -490,7 +490,7 @@
  	@echo "Installing ZIP..."
  	cd $(ZIPDIR); PREFIX=$(root) $(MAKE) CC=$(CC) CFLAGS='$(OPTS) -I. -DUNIX' LFLAGS1='$(OPTS)' -f unix/Makefile generic
  	cd $(ZIPDIR); PREFIX=$(root) $(MAKE) CC=$(CC) CFLAGS='$(OPTS) -I. -DUNIX' LFLAGS1='$(OPTS)' -f unix/Makefile install