wcstools version bump. removed wcstools-3.6.2.ebuild, keywords the same as new one.

(Portage version: 2.1.2-r9)

7 files changed, 283 insertions, 31 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index 875e8eb5d82f..4b7654758d1e 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.2 2007/02/03 17:06:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.3 2007/02/21 16:45:37 bicatali Exp $
+
+*wcstools-3.6.7 (21 Feb 2007)
+
+  21 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/wcstools-3.6.7-autotools.patch,
+  +files/wcstools-3.6.7-codewarn.patch, -wcstools-3.6.2.ebuild,
+  +wcstools-3.6.7.ebuild:
+  Version bump. Cleaned the autotoolization in patches, removed old 
+  version.
 
 *wcstools-3.6.6 (02 Feb 2007)
 
diff --git a/sci-astronomy/wcstools/files/digest-wcstools-3.6.2 b/sci-astronomy/wcstools/files/digest-wcstools-3.6.2
deleted file mode 100644
index 44bd1e3b0f69..000000000000
--- a/sci-astronomy/wcstools/files/digest-wcstools-3.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8f04849e456df59dc51e7faeeb6e45f4 wcstools-3.6.2.tar.gz 636003
-RMD160 1afdfb238bda4bf02c24191a99b7d538e51ddf77 wcstools-3.6.2.tar.gz 636003
-SHA256 956c867ed6a6074249702f3a80256582b2e20b0a41eb37a0d8b59e0d073cd3d0 wcstools-3.6.2.tar.gz 636003
diff --git a/sci-astronomy/wcstools/files/digest-wcstools-3.6.7 b/sci-astronomy/wcstools/files/digest-wcstools-3.6.7
new file mode 100644
index 000000000000..1783434a6ae7
--- /dev/null
+++ b/sci-astronomy/wcstools/files/digest-wcstools-3.6.7
@@ -0,0 +1,3 @@
+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/wcstools-3.6.7-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.6.7-autotools.patch
new file mode 100644
index 000000000000..1b70ca14e220
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.6.7-autotools.patch
@@ -0,0 +1,191 @@
+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
+@@ -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])
++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.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
++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 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)
++
++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.7-codewarn.patch b/sci-astronomy/wcstools/files/wcstools-3.6.7-codewarn.patch
new file mode 100644
index 000000000000..71604171e2e8
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.6.7-codewarn.patch
@@ -0,0 +1,36 @@
+diff -Nur ../wcstools-3.6.7.orig/getdate.c ./getdate.c
+--- ../wcstools-3.6.7.orig/getdate.c	2007-01-10 19:59:34.000000000 +0000
++++ ./getdate.c	2007-02-21 15:33:41.000000000 +0000
+@@ -412,7 +412,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 -Nur ../wcstools-3.6.7.orig/libwcs/binread.c ./libwcs/binread.c
+--- ../wcstools-3.6.7.orig/libwcs/binread.c	2007-01-10 18:28:19.000000000 +0000
++++ ./libwcs/binread.c	2007-02-21 15:34:40.000000000 +0000
+@@ -1372,7 +1372,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 -Nur ../wcstools-3.6.7.orig/libwcs/catutil.c ./libwcs/catutil.c
+--- ../wcstools-3.6.7.orig/libwcs/catutil.c	2007-01-10 17:33:31.000000000 +0000
++++ ./libwcs/catutil.c	2007-02-21 15:35:46.000000000 +0000
+@@ -726,7 +726,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/wcstools-3.6.2.ebuild b/sci-astronomy/wcstools/wcstools-3.6.2.ebuild
deleted file mode 100644
index 48533a0195bc..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.6.2.ebuild,v 1.1 2005/10/02 15:22:55 ribosome Exp $
-
-inherit toolchain-funcs
-
-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="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install () {
-	dobin wcstools bin/* || die
-	dolib.a libwcs/*.a || die
-	dodoc Readme Programs Versions || die
-	doman Man/man1/* || die
-	insinto /usr/include/wcstools
-	doins libwcs/*.h || die
-}
diff --git a/sci-astronomy/wcstools/wcstools-3.6.7.ebuild b/sci-astronomy/wcstools/wcstools-3.6.7.ebuild
new file mode 100644
index 000000000000..8c1ec6e4102a
--- /dev/null
+++ b/sci-astronomy/wcstools/wcstools-3.6.7.ebuild
@@ -0,0 +1,43 @@
+# 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}
+}