Version bump. Added a patch removing segfault on imwcs (from fedora). Removed older and buggy versions

(Portage version: 2.1.2.7)

10 files changed, 41 insertions, 277 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index 4b7654758d1e..046a5ddec047 100644
--- a/sci-astronomy/wcstools/ChangeLog
+++ b/sci-astronomy/wcstools/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-astronomy/wcstools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.3 2007/02/21 16:45:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.4 2007/06/05 16:35:59 bicatali Exp $
+
+*wcstools-3.6.8 (05 Jun 2007)
+
+  05 Jun 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/wcstools-3.6.6-autotools.patch,
+  -files/wcstools-3.6.6-codewarn.patch,
+  -files/wcstools-3.6.7-autotools.patch,
+  +files/wcstools-3.6.8-autotools.patch,
+  +files/wcstools-3.6.8-imsetwcs.patch, -wcstools-3.6.6.ebuild,
+  -wcstools-3.6.7.ebuild, +wcstools-3.6.8.ebuild:
+  Version bump. Added a patch removing segfault on imwcs (from fedora).
+  Removed older and buggy versions
 
 *wcstools-3.6.7 (21 Feb 2007)
 
diff --git a/sci-astronomy/wcstools/files/digest-wcstools-3.6.6 b/sci-astronomy/wcstools/files/digest-wcstools-3.6.6
deleted file mode 100644
index bb2912a52b92..000000000000
--- a/sci-astronomy/wcstools/files/digest-wcstools-3.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 750f0829c699e20d58484ae989c00119 wcstools-3.6.6.tar.gz 770420
-RMD160 0cdce66766ca7042b6abfc54166c73a57152dce6 wcstools-3.6.6.tar.gz 770420
-SHA256 e6aaea1c3a1243091269edfc8c1cd7991bc2e7707f6f9015ee4e750b3ede1a33 wcstools-3.6.6.tar.gz 770420
diff --git a/sci-astronomy/wcstools/files/digest-wcstools-3.6.7 b/sci-astronomy/wcstools/files/digest-wcstools-3.6.7
deleted file mode 100644
index 1783434a6ae7..000000000000
--- a/sci-astronomy/wcstools/files/digest-wcstools-3.6.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 301be6880e514b7d66997375550fb708 wcstools-3.6.7.tar.gz 1424706
-RMD160 6eb20d7399555e734757e0daaaa1193c3453ead7 wcstools-3.6.7.tar.gz 1424706
-SHA256 455a25fd4ba5345627ca8407ec3f47b2681a0a7e8e176b9c0c288133976b0657 wcstools-3.6.7.tar.gz 1424706
diff --git a/sci-astronomy/wcstools/files/digest-wcstools-3.6.8 b/sci-astronomy/wcstools/files/digest-wcstools-3.6.8
new file mode 100644
index 000000000000..3d45162b9c99
--- /dev/null
+++ b/sci-astronomy/wcstools/files/digest-wcstools-3.6.8
@@ -0,0 +1,3 @@
+MD5 d20943cb5f939b633693d24c375f3730 wcstools-3.6.8.tar.gz 801764
+RMD160 4414c0ec30c2d3583ead35ac5df18a362da50427 wcstools-3.6.8.tar.gz 801764
+SHA256 f96b3b3c346a136877ef7fcc8a86fd994c4dbcacc637a454b29e99064ac1d729 wcstools-3.6.8.tar.gz 801764
diff --git a/sci-astronomy/wcstools/files/wcstools-3.6.6-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.6.6-autotools.patch
deleted file mode 100644
index e74c24c70728..000000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.6.6-autotools.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -Nur wcstools-3.6.6/configure.ac wcstools-3.6.6.new/configure.ac
---- wcstools-3.6.6/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ wcstools-3.6.6.new/configure.ac	2006-12-29 15:55:28.000000000 +0000
-@@ -0,0 +1,11 @@
-+AC_PREREQ([2.57])
-+AC_INIT(wcstools, 3.6.5, [http://tdc-www.harvard.edu/wcstools/])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_LIBTOOL
-+AC_C_CONST
-+AC_CHECK_LIB(m, sin)
-+AC_CONFIG_FILES([libwcs/Makefile Makefile])
-+AC_OUTPUT
-diff -Nur wcstools-3.6.6/libwcs/Makefile.am wcstools-3.6.6.new/libwcs/Makefile.am
---- wcstools-3.6.6/libwcs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ wcstools-3.6.6.new/libwcs/Makefile.am	2006-12-29 15:56:04.000000000 +0000
-@@ -0,0 +1,14 @@
-+lib_LTLIBRARIES = libwcs.la
-+wcsdir = $(pkgincludedir)/wcs
-+wcs_HEADERS = \
-+	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
-+libwcs_la_SOURCES = \
-+	imsetwcs.c imgetwcs.c matchstar.c findstar.c daoread.c wcscon.c \
-+	fitswcs.c wcsinit.c wcs.c ty2read.c webread.c tmcread.c \
-+	gscread.c gsc2read.c ujcread.c uacread.c ubcread.c ucacread.c \
-+	sdssread.c tabread.c binread.c ctgread.c actread.c catutil.c \
-+	imrotate.c fitsfile.c imhfile.c \
-+	hget.c hput.c imio.c dateutil.c imutil.c \
-+	worldpos.c tnxpos.c dsspos.c platepos.c \
-+	sortstar.c platefit.c iget.c fileutil.c polfit.c \
-+	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c
-diff -Nur wcstools-3.6.6/Makefile.am wcstools-3.6.6.new/Makefile.am
---- wcstools-3.6.6/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ wcstools-3.6.6.new/Makefile.am	2006-12-29 15:55:40.000000000 +0000
-@@ -0,0 +1,149 @@
-+AUTOMAKE_OPTIONS = foreign no-dependencies
-+SUBDIRS = libwcs
-+INCLUDES = -I$(top_srcdir)/libwcs
-+
-+bin_PROGRAMS = \
-+	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
-+	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
-+	keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \
-+	imstack imextract sumpix remap getcol getdate imfill imsmooth imresize \
-+	fileroot filename filext char2sp sp2char crlf isnum isrange simpos
-+
-+WCSLIBS = -L$(top_srcdir)/libwcs -lwcs
-+
-+addpix_SOURCES = addpix.c
-+addpix_LDADD = $(WCSLIBS)
-+
-+char2sp_SOURCES = char2sp.c
-+char2sp_LDADD = $(WCSLIBS)
-+
-+conpix_SOURCES = conpix.c
-+conpix_LDADD = $(WCSLIBS)
-+
-+cphead_SOURCES = cphead.c
-+cphead_LDADD = $(WCSLIBS)
-+
-+crlf_SOURCES = crlf.c
-+
-+delwcs_SOURCES = delwcs.c
-+delwcs_LDADD = $(WCSLIBS)
-+
-+delhead_SOURCES = delhead.c
-+delhead_LDADD = $(WCSLIBS)
-+
-+edhead_SOURCES = edhead.c
-+edhead_LDADD = $(WCSLIBS)
-+
-+filename_SOURCES = filename.c
-+
-+fileroot_SOURCES = fileroot.c
-+
-+filext_SOURCES = filext.c
-+
-+fixpix_SOURCES = fixpix.c
-+fixpix_LDADD = $(WCSLIBS)
-+
-+getcol_SOURCES = getcol.c
-+getcol_LDADD = $(WCSLIBS)
-+
-+getdate_SOURCES = getdate.c
-+getdate_LDADD = $(WCSLIBS)
-+
-+gethead_SOURCES = gethead.c
-+gethead_LDADD = $(WCSLIBS)
-+
-+getfits_SOURCES = getfits.c
-+getfits_LDADD = $(WCSLIBS)
-+
-+getpix_SOURCES = getpix.c
-+getpix_LDADD = $(WCSLIBS)
-+
-+gettab_SOURCES = gettab.c
-+gettab_LDADD = $(WCSLIBS)
-+
-+i2f_SOURCES = i2f.c
-+i2f_LDADD = $(WCSLIBS)
-+
-+imcat_SOURCES = imcat.c
-+imcat_LDADD = $(WCSLIBS)
-+
-+imfill_SOURCES = imfill.c
-+imfill_LDADD = $(WCSLIBS)
-+
-+imresize_SOURCES = imresize.c
-+imresize_LDADD = $(WCSLIBS)
-+
-+imsmooth_SOURCES = imsmooth.c
-+imsmooth_LDADD = $(WCSLIBS)
-+
-+imhead_SOURCES = imhead.c
-+imhead_LDADD = $(WCSLIBS)
-+
-+imrot_SOURCES = imrot.c
-+imrot_LDADD = $(WCSLIBS)
-+
-+imsize_SOURCES = imsize.c
-+imsize_LDADD = $(WCSLIBS)
-+
-+imstack_SOURCES = imstack.c
-+imstack_LDADD = $(WCSLIBS)
-+
-+imextract_SOURCES = imextract.c
-+imextract_LDADD = $(WCSLIBS)
-+
-+imstar_SOURCES = imstar.c
-+imstar_LDADD = $(WCSLIBS)
-+
-+isnum_SOURCES = isnum.c
-+isnum_LDADD = $(WCSLIBS)
-+
-+isrange_SOURCES = isrange.c
-+
-+imwcs_SOURCES = imwcs.c
-+imwcs_LDADD = $(WCSLIBS)
-+
-+immatch_SOURCES = immatch.c
-+immatch_LDADD = $(WCSLIBS)
-+
-+keyhead_SOURCES = keyhead.c
-+keyhead_LDADD = $(WCSLIBS)
-+
-+newfits_SOURCES = newfits.c
-+newfits_LDADD = $(WCSLIBS)
-+
-+remap_SOURCES = remap.c
-+remap_LDADD = $(WCSLIBS)
-+
-+scat_SOURCES = scat.c
-+scat_LDADD = $(WCSLIBS)
-+
-+sethead_SOURCES = sethead.c
-+sethead_LDADD = $(WCSLIBS)
-+
-+setpix_SOURCES = setpix.c
-+setpix_LDADD = $(WCSLIBS)
-+
-+sky2xy_SOURCES = sky2xy.c
-+sky2xy_LDADD = $(WCSLIBS)
-+
-+skycoor_SOURCES = skycoor.c
-+skycoor_LDADD = $(WCSLIBS)
-+
-+sp2char_SOURCES = sp2char.c
-+sp2char_LDADD = $(WCSLIBS)
-+
-+subpix_SOURCES = subpix.c
-+subpix_LDADD = $(WCSLIBS)
-+
-+sumpix_SOURCES = sumpix.c
-+sumpix_LDADD = $(WCSLIBS)
-+
-+wcshead_SOURCES = wcshead.c
-+wcshead_LDADD = $(WCSLIBS)
-+
-+xy2sky_SOURCES = xy2sky.c
-+xy2sky_LDADD = $(WCSLIBS)
-+
-+simpos_SOURCES = simpos.c
-+simpos_LDADD = $(WCSLIBS)
-+
diff --git a/sci-astronomy/wcstools/files/wcstools-3.6.6-codewarn.patch b/sci-astronomy/wcstools/files/wcstools-3.6.6-codewarn.patch
deleted file mode 100644
index a619358379aa..000000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.6.6-codewarn.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, 1);
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
diff --git a/sci-astronomy/wcstools/files/wcstools-3.6.7-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.6.8-autotools.patch
index 1b70ca14e220..1b70ca14e220 100644
--- a/sci-astronomy/wcstools/files/wcstools-3.6.7-autotools.patch
+++ b/sci-astronomy/wcstools/files/wcstools-3.6.8-autotools.patch
diff --git a/sci-astronomy/wcstools/files/wcstools-3.6.8-imsetwcs.patch b/sci-astronomy/wcstools/files/wcstools-3.6.8-imsetwcs.patch
new file mode 100644
index 000000000000..87e6d9589d82
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.6.8-imsetwcs.patch
@@ -0,0 +1,18 @@
+--- libwcs/imsetwcs.c.orig	2007-06-05 17:06:28.886476000 +0100
++++ libwcs/imsetwcs.c	2007-06-05 17:06:20.245936000 +0100
+@@ -854,13 +854,13 @@
+     if (gc) free ((char *)gc);
+ 
+     /* Free memory used for object names in reference catalog */
+-    if (gobj1 != NULL) {
++/*    if (gobj1 != NULL) {
+ 	for (i = 0; i < ns; i++) {
+ 	    if (gobj[i] != NULL) free (gobj[i]);
+ 	    gobj[i] = NULL;
+ 	    }
+ 	}
+-
++*/
+     /* Free image source arrays */
+     if (sx) free ((char *)sx);
+     if (sy) free ((char *)sy);
diff --git a/sci-astronomy/wcstools/wcstools-3.6.7.ebuild b/sci-astronomy/wcstools/wcstools-3.6.7.ebuild
deleted file mode 100644
index 8c1ec6e4102a..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.6.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.6.7.ebuild,v 1.1 2007/02/21 16:45:37 bicatali Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Astronomy Library to handle World Coordinate System for FITS images"
-HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="http://tdc-www.harvard.edu/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# fixed some warnings
-	epatch "${FILESDIR}"/${P}-codewarn.patch
-	# autotoolization
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-src_test() {
-	cd "${S}"
-	ebegin "Testing various wcstools programs"
-	./newfits -a 10 -j 248 41 test.fits || die "test newfits failed"
-	./sethead test.fits A=1 B=1 ||  die "test sethead failed"
-	[[ "$(./gethead test.fits RA)" == "16:32:00.000" ]] \
-		|| die "test gethead failed"
-	rm -f test.fits
-	eend
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doman Man/man1/*
-	dodoc Readme Programs NEWS
-	docinto libwcs
-	dodoc libwcs/{Readme,NEWS}
-}
diff --git a/sci-astronomy/wcstools/wcstools-3.6.6.ebuild b/sci-astronomy/wcstools/wcstools-3.6.8.ebuild
index e16fdfcaab98..36b1c08c9c59 100644
--- a/sci-astronomy/wcstools/wcstools-3.6.6.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.6.6.ebuild,v 1.1 2007/02/03 17:06:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.6.8.ebuild,v 1.1 2007/06/05 16:35:59 bicatali Exp $
 
 inherit eutils autotools
 
@@ -15,11 +15,12 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	# fixed some warnings
-	epatch "${FILESDIR}"/${P}-codewarn.patch
+	cd "${S}"
+	# fix a segfault (adapted from fedora)
+	epatch "${FILESDIR}"/${P}-imsetwcs.patch
 	# autotoolization
 	epatch "${FILESDIR}"/${P}-autotools.patch
-	cd "${S}"
+	sed -i -e 's/3.6.x/${PV}/' configure.ac || die "sed failed"
 	eautoreconf
 }
 
@@ -38,6 +39,6 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	doman Man/man1/*
 	dodoc Readme Programs NEWS
-	docinto libwcs
-	dodoc libwcs/{Readme,NEWS}
+	newdoc libwcs/Readme Readme.libwcs
+	newdoc libwcs/NEWS NEWS.libwcs
 }