sci-astronomy/ds9: Version bump

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

7 files changed, 36 insertions, 72 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index d897fc9e9..41893de4f 100644
--- a/sci-astronomy/ds9/ChangeLog
+++ b/sci-astronomy/ds9/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/ds9-Makefile.patch, -ds9-4.12.ebuild, +ds9-4.13.ebuild,
+  -files/ds9-iis.patch, +files/ds9-4.13-Makefile.patch:
+  Version bump
+
   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
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index 748fc277c..e41180009 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -1,24 +1,20 @@
-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.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
+AUX ds9-4.13-Makefile.patch 2463 RMD160 0aef1b79a591d9d11327eb763952d4c3b7818350 SHA1 67cac524850090b6b2371383145ba3e6b7d9539b SHA256 a8a3121a350a9aff5d8586a307a4de0ad4c30bfc50079e95f062322d826f593e
+MD5 86f2391964f277f1a5f3449fec065546 files/ds9-4.13-Makefile.patch 2463
+RMD160 0aef1b79a591d9d11327eb763952d4c3b7818350 files/ds9-4.13-Makefile.patch 2463
+SHA256 a8a3121a350a9aff5d8586a307a4de0ad4c30bfc50079e95f062322d826f593e files/ds9-4.13-Makefile.patch 2463
+DIST ds9.4.13.tar.gz 25635857 RMD160 8a9f763e6c45a4abd9e7cb6fd4ce7e0dbe149868 SHA1 68f39b5c955526680fec12538aa824b429b95b17 SHA256 638ff1a038c3dea966c6a510cb2f8b044f556ac339b11909b8c6a050a900307b
+EBUILD ds9-4.13.ebuild 1269 RMD160 2d3d88b106eecff6213cb4ddfb2c33736e8a0ec3 SHA1 fa6fae2da1a89900f84cb987439f4d64808b1e73 SHA256 7950160fd9283325f0283045865d0e6f7e44005da880fcae533d6f61729b9469
+MD5 983fa30dd0c65c71c4b202048651eb1d ds9-4.13.ebuild 1269
+RMD160 2d3d88b106eecff6213cb4ddfb2c33736e8a0ec3 ds9-4.13.ebuild 1269
+SHA256 7950160fd9283325f0283045865d0e6f7e44005da880fcae533d6f61729b9469 ds9-4.13.ebuild 1269
+MISC ChangeLog 995 RMD160 2ba9f72234f4f23e14916e2197a612bdd60ac9ef SHA1 205e3e2c878b8803759a6684bd2fcc9b17f0ff29 SHA256 3f70436821bef00986bf7b32a98e58ddddc29186832077b3e26b4250e216055c
+MD5 e5c51f6e094a181de5a2323eec08ac00 ChangeLog 995
+RMD160 2ba9f72234f4f23e14916e2197a612bdd60ac9ef ChangeLog 995
+SHA256 3f70436821bef00986bf7b32a98e58ddddc29186832077b3e26b4250e216055c ChangeLog 995
 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 c025117ffefc84698e48aee76cfe7f7e files/digest-ds9-4.12 232
-RMD160 34280fa4450652be0624066a651da9c2ef070ab7 files/digest-ds9-4.12 232
-SHA256 db906022390c3aa4914efa8a1a4c32bf1e5405ee10a1d700fdb553bdb157dcf7 files/digest-ds9-4.12 232
+MD5 5085c2acfeef3c632361044a5716de5a files/digest-ds9-4.13 232
+RMD160 d8d36e76f70cd1f2093418749270316ee81106e9 files/digest-ds9-4.13 232
+SHA256 8a1f4648767667a6c636006eeab07f2dfff1257ef9d53a2baf5ebf31cd261a3c files/digest-ds9-4.13 232
diff --git a/sci-astronomy/ds9/ds9-4.12.ebuild b/sci-astronomy/ds9/ds9-4.13.ebuild
index f2fe975b0..f54b8719d 100644
--- a/sci-astronomy/ds9/ds9-4.12.ebuild
+++ b/sci-astronomy/ds9/ds9-4.13.ebuild
@@ -25,24 +25,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# patch to speed up compilation (no man pages generation)
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
 }
 
 src_compile() {
 	local ds9arch
 	case ${ARCH} in
-		x86)
-			ds9arch=linux
-			;;
-		amd64)
-			ds9arch=linux64
-			;;
-		ppc)
-			ds9arch=linuxppc
-			;;
-		x86-fbsd)
-			ds9arch=freebsd
-			;;
+		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
diff --git a/sci-astronomy/ds9/files/digest-ds9-4.12 b/sci-astronomy/ds9/files/digest-ds9-4.12
deleted file mode 100644
index d193ea245..000000000
--- a/sci-astronomy/ds9/files/digest-ds9-4.12
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-ds9-4.13 b/sci-astronomy/ds9/files/digest-ds9-4.13
new file mode 100644
index 000000000..65a3f7f59
--- /dev/null
+++ b/sci-astronomy/ds9/files/digest-ds9-4.13
@@ -0,0 +1,3 @@
+MD5 6f08cd8d1942e76cf5e9772938849054 ds9.4.13.tar.gz 25635857
+RMD160 8a9f763e6c45a4abd9e7cb6fd4ce7e0dbe149868 ds9.4.13.tar.gz 25635857
+SHA256 638ff1a038c3dea966c6a510cb2f8b044f556ac339b11909b8c6a050a900307b ds9.4.13.tar.gz 25635857
diff --git a/sci-astronomy/ds9/files/ds9-Makefile.patch b/sci-astronomy/ds9/files/ds9-4.13-Makefile.patch
index 12953b2ee..467c579e2 100644
--- a/sci-astronomy/ds9/files/ds9-Makefile.patch
+++ b/sci-astronomy/ds9/files/ds9-4.13-Makefile.patch
@@ -1,6 +1,6 @@
---- Makefile.orig	2007-04-19 19:25:12.771792750 +0100
-+++ Makefile	2007-04-19 19:30:25.975366750 +0100
-@@ -345,40 +345,40 @@
+--- Makefile.orig	2007-08-01 17:41:38.172069500 +0100
++++ Makefile	2007-08-01 17:57:17.200552750 +0100
+@@ -351,40 +351,41 @@
  tclsh	: FORCE
  	@echo "Installing Tcl shared..."
  	cd $(TCLDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --enable-shared
@@ -10,14 +10,14 @@
  tcl	: FORCE
  	@echo "Installing Tcl noshared..."
  	cd $(TCLDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --disable-shared
--	cd $(TCLDIRDIR); $(MAKE) install
+ 	cd $(TCLDIRDIR); $(MAKE) install
 +	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
  
  tksh	: FORCE
  	@echo "Installing Tk shared..."
  	cd $(TKDIRDIR); CC='$(CC) $(OPTS) $(TCLOPTS)' ./configure $(TCLFLAGS) --enable-shared
 -	cd $(TKDIRDIR); $(MAKE) install
-+	cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries
++	cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries
  	$(RM) -r lib/tk8.4/demos
  	$(RM) -r lib/$(TKVER)/demos
  
@@ -48,7 +48,7 @@
  
  tkindex : FORCE
  	@echo "Installing Tk mkIndex..."
-@@ -397,7 +397,7 @@
+@@ -403,7 +404,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..."
-@@ -407,7 +407,7 @@
+@@ -413,7 +414,7 @@
  tkimgsh	: FORCE
  	@echo "Installing TKIMG shared..."
  	cd $(TKIMGDIR); CC='$(CC) $(OPTS)' ./configure $(TKIMGFLAGS)
@@ -66,21 +66,3 @@
  
  tkmpeg	: FORCE
  	@echo "Installing TKMPEG..."
-@@ -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*
- 
- xpa	: FORCE
-@@ -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
--	ce $(ZIPDIR); $(RM) libzip.a
-+	cd $(ZIPDIR); $(RM) libzip.a
- 	cd $(ZIPDIR); $(AR) -cr libzip.a $(ZIPOBJS)
- 	cp $(ZIPDIR)/libzip.a lib/libzip.a
- 
diff --git a/sci-astronomy/ds9/files/ds9-iis.patch b/sci-astronomy/ds9/files/ds9-iis.patch
deleted file mode 100644
index bd4d21c9f..000000000
--- a/sci-astronomy/ds9/files/ds9-iis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;