Version bump

(Portage version: 2.1.3.14)

6 files changed, 87 insertions, 175 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index 5418e0996486..e4b935c408e8 100644
--- a/sci-astronomy/wcstools/ChangeLog
+++ b/sci-astronomy/wcstools/ChangeLog
@@ -1,6 +1,15 @@
 # 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.5 2007/09/11 11:21:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.6 2007/10/18 12:05:42 bicatali Exp $
+
+*wcstools-3.7.1 (18 Oct 2007)
+
+  18 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/wcstools-3.6.8-autotools.patch,
+  -files/wcstools-3.6.8-imsetwcs.patch,
+  +files/wcstools-3.7.1-autotools.patch, -wcstools-3.6.8.ebuild,
+  +wcstools-3.7.1.ebuild:
+  Version bump
 
 *wcstools-3.7.0 (11 Sep 2007)
 
diff --git a/sci-astronomy/wcstools/files/digest-wcstools-3.6.8 b/sci-astronomy/wcstools/files/digest-wcstools-3.6.8
deleted file mode 100644
index 3d45162b9c99..000000000000
--- a/sci-astronomy/wcstools/files/digest-wcstools-3.6.8
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-wcstools-3.7.1 b/sci-astronomy/wcstools/files/digest-wcstools-3.7.1
new file mode 100644
index 000000000000..260dc9e2a262
--- /dev/null
+++ b/sci-astronomy/wcstools/files/digest-wcstools-3.7.1
@@ -0,0 +1,3 @@
+MD5 d48091a18599417704ee5352850123c9 wcstools-3.7.1.tar.gz 846999
+RMD160 98b2908fa4d3a8e07b0d31558da900c43ef3fee5 wcstools-3.7.1.tar.gz 846999
+SHA256 1313d1d572299a3ad3c79d636e78c936118af2a06da421f3e0186c920b8d49a0 wcstools-3.7.1.tar.gz 846999
diff --git a/sci-astronomy/wcstools/files/wcstools-3.6.8-imsetwcs.patch b/sci-astronomy/wcstools/files/wcstools-3.6.8-imsetwcs.patch
deleted file mode 100644
index 87e6d9589d82..000000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.6.8-imsetwcs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/files/wcstools-3.6.8-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.7.1-autotools.patch
index 1b70ca14e220..a42dd1d484af 100644
--- a/sci-astronomy/wcstools/files/wcstools-3.6.8-autotools.patch
+++ b/sci-astronomy/wcstools/files/wcstools-3.7.1-autotools.patch
@@ -1,191 +1,114 @@
-diff -Nur ../wcstools-3.6.7.orig/configure.ac ./configure.ac
---- ../wcstools-3.6.7.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ ./configure.ac	2007-02-21 16:29:33.000000000 +0000
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2007-10-18 12:55:35.947099866 +0100
 @@ -0,0 +1,11 @@
 +AC_PREREQ([2.59])
-+AC_INIT(wcstools, 3.6.x, [http://tdc-www.harvard.edu/wcstools/])
-+AM_INIT_AUTOMAKE([dist-bzip2])
++AC_INIT(wcstools, 3.7.1, [http://tdc-www.harvard.edu/wcstools/])
++AM_INIT_AUTOMAKE([foreign])
 +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_CONFIG_FILES([libwcs/Makefile libned/Makefile Makefile])
 +AC_OUTPUT
-diff -Nur ../wcstools-3.6.7.orig/libwcs/Makefile.am ./libwcs/Makefile.am
---- ../wcstools-3.6.7.orig/libwcs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./libwcs/Makefile.am	2007-02-21 16:29:54.000000000 +0000
-@@ -0,0 +1,17 @@
-+lib_LTLIBRARIES = libwcs.la
-+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 \
-+	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c
-+
-+wcsdir = $(includedir)/wcs
-+wcs_HEADERS = \
-+	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
-+
-+noinst_HEADERS = fitsfile1.h wcscat1.h
-diff -Nur ../wcstools-3.6.7.orig/Makefile.am ./Makefile.am
---- ../wcstools-3.6.7.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./Makefile.am	2007-02-21 16:29:44.000000000 +0000
-@@ -0,0 +1,151 @@
-+SUBDIRS = libwcs
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2007-10-18 12:59:52.693731023 +0100
+@@ -0,0 +1,71 @@
++SUBDIRS = libwcs libned
 +INCLUDES = -I$(top_srcdir)/libwcs
 +
++bin_SCRIPTS = wcstools
++
 +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 bincat
-+
-+WCSLIBS = -L$(top_srcdir)/libwcs -lwcs
-+
-+addpix_SOURCES = addpix.c
-+addpix_LDADD = $(WCSLIBS)
-+
-+bincat_SOURCES = bincat.c
-+bincat_LDADD = $(WCSLIBS)
-+
-+char2sp_SOURCES = char2sp.c
-+char2sp_LDADD = $(WCSLIBS)
-+
-+conpix_SOURCES = conpix.c
-+conpix_LDADD = $(WCSLIBS)
-+
-+cphead_SOURCES = cphead.c
-+cphead_LDADD = $(WCSLIBS)
++	fileroot filename filext char2sp sp2char crlf isnum isrange simpos bincat \
++	nedname nedpos
 +
++# these ones don't need libwcs
 +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
++isrange_SOURCES = isrange.c
 +
-+fixpix_SOURCES = fixpix.c
-+fixpix_LDADD = $(WCSLIBS)
++LDADD = $(top_builddir)/libwcs/libwcs.la
 +
++bincat_SOURCES = bincat.c
 +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)
++imsize_SOURCES = imsize.c
++imstar_SOURCES = imstar.c
++imwcs_SOURCES = imwcs.c
++immatch_SOURCES = immatch.c
++scat_SOURCES = scat.c
++setpix_SOURCES = setpix.c
++skycoor_SOURCES = skycoor.c
++sumpix_SOURCES = sumpix.c
++xy2sky_SOURCES = xy2sky.c
++simpos_SOURCES = simpos.c
 +
++addpix_SOURCES = addpix.c
++char2sp_SOURCES = char2sp.c
++conpix_SOURCES = conpix.c
++cphead_SOURCES = cphead.c
++delwcs_SOURCES = delwcs.c
++delhead_SOURCES = delhead.c
++edhead_SOURCES = edhead.c
++fixpix_SOURCES = fixpix.c
++i2f_SOURCES = i2f.c
 +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)
++nedname_SOURCES = nedname.c
++nedname_LDADD = $(top_builddir)/libned/libned.la $(top_builddir)/libwcs/libwcs.la
++nedpos_SOURCES = nedpos.c
++nedpos_LDADD = $(top_builddir)/libned/libned.la $(top_builddir)/libwcs/libwcs.la
+--- libwcs/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ libwcs/Makefile.am	2007-10-18 12:20:44.266637126 +0100
+@@ -0,0 +1,17 @@
++lib_LTLIBRARIES = libwcs.la
++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 \
++	skybotread.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 \
++	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c
 +
-+simpos_SOURCES = simpos.c
-+simpos_LDADD = $(WCSLIBS)
++wcsdir = $(includedir)/wcs
++wcs_HEADERS = \
++	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
 +
++noinst_HEADERS = fitsfile1.h wcscat1.h
+--- libned/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ libned/Makefile.am	2007-10-18 12:53:04.194451975 +0100
+@@ -0,0 +1,3 @@
++lib_LTLIBRARIES = libned.la
++libned_la_SOURCES = \
++	ned_cli.c ned_cif.c ned_err.c ned_sk.c
diff --git a/sci-astronomy/wcstools/wcstools-3.6.8.ebuild b/sci-astronomy/wcstools/wcstools-3.7.1.ebuild
index 36b1c08c9c59..72ddaa4708ed 100644
--- a/sci-astronomy/wcstools/wcstools-3.6.8.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.7.1.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.8.ebuild,v 1.1 2007/06/05 16:35:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.1.ebuild,v 1.1 2007/10/18 12:05:42 bicatali Exp $
 
 inherit eutils autotools
 
@@ -16,29 +16,27 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# fix a segfault (adapted from fedora)
-	epatch "${FILESDIR}"/${P}-imsetwcs.patch
-	# autotoolization
+	epatch "${FILESDIR}"/${PN}-3.7.0-fix-warnings.patch
+	epatch "${FILESDIR}"/${PN}-3.7.0-fix-leaks.patch
 	epatch "${FILESDIR}"/${P}-autotools.patch
-	sed -i -e 's/3.6.x/${PV}/' configure.ac || die "sed failed"
+	sed -i -e 's/3.7.x/${PV}/' configure.ac || die "sed failed"
 	eautoreconf
 }
 
 src_test() {
 	cd "${S}"
-	ebegin "Testing various wcstools programs"
-	./newfits -a 10 -j 248 41 test.fits || die "test newfits failed"
+	einfo "Testing various wcstools programs"
+	./newfits -a 10 -j 248 41 -p 0.15 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
-	newdoc libwcs/Readme Readme.libwcs
-	newdoc libwcs/NEWS NEWS.libwcs
+	doman Man/man1/* || die "doman failed"
+	dodoc Readme Programs NEWS libned/NED_CLIENT || die "dodoc failed"
+	newdoc libwcs/Readme Readme.libwcs || die "newdoc failed"
+	newdoc libwcs/NEWS NEWS.libwcs || die "newdoc failed"
 }