Bump. Added a patch to avoid overflows

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

5 files changed, 75 insertions, 71 deletions

diff --git a/sci-astronomy/skycat/ChangeLog b/sci-astronomy/skycat/ChangeLog
index ab1bf6dc52bb..b8e34a49430b 100644
--- a/sci-astronomy/skycat/ChangeLog
+++ b/sci-astronomy/skycat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/skycat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/ChangeLog,v 1.6 2009/09/25 03:19:55 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/ChangeLog,v 1.7 2010/09/24 18:13:38 bicatali Exp $
+
+*skycat-3.1.1 (24 Sep 2010)
+
+  24 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org> -skycat-3.0.2.ebuild,
+  -skycat-3.0.2-r1.ebuild, +skycat-3.1.1.ebuild,
+  +files/skycat-3.1.1-gcc45.patch:
+  Bump. Added a patch to avoid overflows
 
 *skycat-3.0.2-r2 (25 Sep 2009)
 
diff --git a/sci-astronomy/skycat/Manifest b/sci-astronomy/skycat/Manifest
index 620957ee1eda..1c05d117d787 100644
--- a/sci-astronomy/skycat/Manifest
+++ b/sci-astronomy/skycat/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX skycat-3.0.1-gcc43.patch 14345 RMD160 c5ecd0297985771a67cb006d903fde8782ef6869 SHA1 197536250bdc05e821ba2f2714b5e06fc59e10ec SHA256 5603d0e2ed5be2731806fcc641078d7ad53b3e429b4323a4a82d0cca86c3db41
 AUX skycat-3.0.1-m4.patch 4791 RMD160 643951b4bec86dfae40687eaa4d10969ff39c8e4 SHA1 48a4826349b6c905cae1130c47bd5c1757500d88 SHA256 08ad86b09220ab931264d7d7ec145193abec39d1ab168e3f4853696f5ef48f76
 AUX skycat-3.0.2-glibc-2.10.patch 692 RMD160 70f9bd04fad8e3241ba7c693c268ab0c8b1a390f SHA1 c37ee04f9f881ffb152498c1af5aedf255c82fb9 SHA256 3b336d4cf5958d8dc047ef7f9d6ae58f75e0d02006300e159cc50272d363a17f
 AUX skycat-3.0.2-makefile-qa.patch 4636 RMD160 4c8425b632110063c74128f27eeed7ead44116ee SHA1 37f96a8525c84a4797fd3c94bea7eee9c6660b4f SHA256 87614cecb158d13c0e0905247a4032c8ed7f2b722a5ae5d0e63afe2e6cdca377
 AUX skycat-3.0.2-systemlibs.patch 5290 RMD160 f6f3f3ada0b53a1a9fea6000c6e9ddedc63af098 SHA1 6474193397cbb3901337b2b9980625a8691dd68c SHA256 b510c3b97029b5619a81f4130c01df80ec18a34a2825e809811deef946afe4e2
 AUX skycat-3.0.2-tk8.5.patch 877 RMD160 35f2575f00b2f4bf2ddab84ebf2560f28d528378 SHA1 85fd1ed7040935567934b70e0e4c202d62f29686 SHA256 6a9048f16a88fca2db57efd2599220508bb283274766f0cb6b85e1c0c445a889
+AUX skycat-3.1.1-gcc45.patch 795 RMD160 155993020c11f39e05ba3d590e7bb89e8b6252a2 SHA1 2bb191682329da3940413f3bc18c71724dddaece SHA256 1a4afbc7b9611cbf883f92f0d06aa7751567311d70b8e9bb15d1e80df369dfaf
 DIST skycat-3.0.2.tar.gz 3200649 RMD160 1552cab99e1fcd0d38d4bab89e01da862e8982df SHA1 9c293017ee6b74478ff744fbfde5b2bfc4c1cd6e SHA256 ebacfc988b39a32e59a8947f67c8dacf468cdab1e80783576c26b7124dc1bd77
-EBUILD skycat-3.0.2-r1.ebuild 1350 RMD160 2397d61e834f242bee9397d2686bc74dcb40fc0f SHA1 ce8a0c02dec942b18afa0a36078f60bea3118113 SHA256 2b486048f02c2e868a2456ab35a8894e0655b928b2dfedbdf54aba747eafcb84
+DIST skycat-3.1.1.tar.gz 3031492 RMD160 8bd5fc7c43401491a220c4ade0e944119a765c66 SHA1 de6bb7f81d54ba320bf07d0982cfca6ffe4cd0e2 SHA256 3177228d85a2e8baf6feba5284577a9d158de8228ef76b84e96608dd58bfee73
 EBUILD skycat-3.0.2-r2.ebuild 1620 RMD160 b7573c7fa95275347c8c85cadb54804dba5258bb SHA1 0c259251101fae781d87c52a0a02d01176a12975 SHA256 2017270a5a4da969f3bc5aa87731844ad219f0e2732a7b5e8e60786a17716f5b
-EBUILD skycat-3.0.2.ebuild 1263 RMD160 b505f127b887c5aa3e92e731b37548c61cc133bb SHA1 655b13da1fde92a7b366606b425bd073015a71c6 SHA256 49fe21b048552f92c9fe27711c36bd0ac3d3f5c5308bfaebd4c4dd68e4883f7c
-MISC ChangeLog 1675 RMD160 8d2f531ce93cff2f5188fdb8ef5fbdc8f850e056 SHA1 8485c21fc0e19bcfe9eec96019ee962a0bc4d89e SHA256 4ca291bae0fdca7a39c8a8b64310d77b0738f83e15299f40d6b25add467083e5
+EBUILD skycat-3.1.1.ebuild 1617 RMD160 7a1293a30b05f85df23527c23e426b9c09223040 SHA1 5adad1db470fcdab6f779f3b4d22a803ea1bf921 SHA256 840c4f841ea95a02bcdf4782c3612161506ad643c9cc69e9433ed077b6378834
+MISC ChangeLog 1907 RMD160 2a3c8b171ac3c15448f55a9ab3a92e34c6e1d5f8 SHA1 2b51b04b9bc00f5c112c941e0b5f3f907b9b550e SHA256 f96495ac7493d57df187b5a39adccbdd67ca703826960507c7574d7e52a36af1
 MISC metadata.xml 374 RMD160 0b13913c5e501a31bed1eb36c4d706ac1c24a3c2 SHA1 9cc1a6ff766256ef07d4c438259dc7ed8595e36b SHA256 f011744f479399f80943e8c7b6499ccc47410a0fbbbee51cd25898b12bbfa729
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyc6lsACgkQ1ycZbhPLE2BoZACcCK4vJ/3bNiLlD+g5QwQ+zLk8
+pO4AoKgp7kBBoYIpTInVJuKNRF1V20i5
+=meOQ
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch b/sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch
new file mode 100644
index 000000000000..32b7f86656c8
--- /dev/null
+++ b/sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch
@@ -0,0 +1,30 @@
+--- astrotcl/generic/ImageIO.h.orig	2010-09-24 06:31:03.000000000 +0100
++++ astrotcl/generic/ImageIO.h	2010-09-24 06:32:06.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <iostream>
+ #include <cmath>
++#include <cstdlib>
+ #include "WCSRep.h"
+ #include "Mem.h"
+ 
+--- ./rtd/generic/histzero.c.orig	2010-09-24 06:36:08.000000000 +0100
++++ ./rtd/generic/histzero.c	2010-09-24 06:37:48.000000000 +0100
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "histeq.h"		/* define SubrangeLink */
+ 
+ static void merge_links();
+--- ./rtd/generic/histmap.c.orig	2010-09-24 06:35:59.000000000 +0100
++++ ./rtd/generic/histmap.c	2010-09-24 06:37:26.000000000 +0100
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "histeq.h"		/* define SubrangeLink, List */
+ 
+ 
diff --git a/sci-astronomy/skycat/skycat-3.0.2.ebuild b/sci-astronomy/skycat/skycat-3.0.2.ebuild
deleted file mode 100644
index 154ddf670acf..000000000000
--- a/sci-astronomy/skycat/skycat-3.0.2.ebuild
+++ /dev/null
@@ -1,51 +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/skycat/skycat-3.0.2.ebuild,v 1.1 2008/06/26 11:34:30 bicatali Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="ESO astronomical image visualizer with catalog access."
-HOMEPAGE="http://archive.eso.org/skycat"
-SRC_URI="ftp://ftp.eso.org/pub/archive/${PN}/Sources/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="threads"
-
-DEPEND="x11-libs/libXext
-	>=dev-tcltk/tclx-2.4
-	>=dev-tcltk/blt-2.4
-	>=dev-tcltk/itcl-3.3
-	>=dev-tcltk/iwidgets-4.0.1
-	>=dev-tcltk/tkimg-1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# fix buggy tcl.m4 for bash3
-	epatch "${FILESDIR}"/${PN}-3.0.1-m4.patch
-	# fix old style headers, set as error by new g++
-	epatch "${FILESDIR}"/${PN}-3.0.1-gcc43.patch
-	eautoconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable threads) \
-		|| die "econf failed"
-	emake
-	# a second time to make sure every dir passed
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README CHANGES VERSION
-	for d in tclutil astrotcl rtd cat skycat; do
-		docinto ${d}
-		for f in README CHANGES VERSION; do
-			newdoc ${f} ${f}.${d}
-		done
-	done
-}
diff --git a/sci-astronomy/skycat/skycat-3.0.2-r1.ebuild b/sci-astronomy/skycat/skycat-3.1.1.ebuild
index 9d9c9a4070ac..81cc3f77a336 100644
--- a/sci-astronomy/skycat/skycat-3.0.2-r1.ebuild
+++ b/sci-astronomy/skycat/skycat-3.1.1.ebuild
@@ -1,45 +1,52 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/skycat-3.0.2-r1.ebuild,v 1.2 2009/09/16 04:20:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/skycat-3.1.1.ebuild,v 1.1 2010/09/24 18:13:38 bicatali Exp $
 
+EAPI=2
 inherit eutils autotools
 
 DESCRIPTION="ESO astronomical image visualizer with catalog access."
 HOMEPAGE="http://archive.eso.org/skycat"
-SRC_URI="ftp://ftp.eso.org/pub/archive/${PN}/Sources/${P}.tar.gz"
+SRC_URI="http://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="threads"
 
-RDEPEND="${DEPEND}"
 DEPEND="x11-libs/libXext
 	>=dev-tcltk/tclx-2.4
 	>=dev-tcltk/blt-2.4
 	>=dev-tcltk/itcl-3.3
 	>=dev-tcltk/iwidgets-4.0.1
-	>=dev-tcltk/tkimg-1.3"
+	>=dev-tcltk/tkimg-1.3
+	sci-libs/cfitsio
+	sci-astronomy/wcstools"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# fix buggy tcl.m4 for bash3
 	epatch "${FILESDIR}"/${PN}-3.0.1-m4.patch
-	# fix old style headers, set as error by new g++
-	epatch "${FILESDIR}"/${PN}-3.0.1-gcc43.patch
-
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-gcc45.patch
+	#epatch "${FILESDIR}"/${PN}-3.0.2-glibc-2.10.patch
 	# need fix for tk-8.5
 	if has_version ">=dev-lang/tk-8.5" ; then
-		epatch "${FILESDIR}"/${P}-tk8.5.patch
+		epatch "${FILESDIR}"/${PN}-3.0.2-tk8.5.patch
 	fi
+	epatch "${FILESDIR}"/${PN}-3.0.2-makefile-qa.patch
+	# use system libs
+	epatch "${FILESDIR}"/${PN}-3.0.2-systemlibs.patch
+	rm -fr "${S}"/astrotcl/cfitsio/ "${S}"/astrotcl/libwcs/ \
+		|| die "Failed to remove included libs"
+	eautoreconf
+}
 
-	eautoconf
+src_configure() {
+	econf $(use_enable threads) --enable-merge
 }
 
 src_compile() {
-	econf $(use_enable threads)
 	emake
 	emake || die "emake failed"
 }