Removed old versions and changed remap to wcsremap, closing bug #280028

(Portage version: 2.2_rc38/cvs/Linux x86_64)

4 files changed, 20 insertions, 64 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index fd4fd433639d..2a20ece020ee 100644
--- a/sci-astronomy/wcstools/ChangeLog
+++ b/sci-astronomy/wcstools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/wcstools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.13 2009/07/16 18:59:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.14 2009/08/12 19:18:04 bicatali Exp $
+
+  12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -wcstools-3.7.6-r1.ebuild, -files/wcstools-3.7.6-autotools.patch,
+  wcstools-3.7.7.ebuild, +files/wcstools-3.7-autotools.patch:
+  Removed old versions and changed remap to wcsremap, closing bug #280028
 
 *wcstools-3.7.7 (16 Jul 2009)
 
diff --git a/sci-astronomy/wcstools/files/wcstools-3.7.6-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.7-autotools.patch
index 040e97dc8745..eb01336bc702 100644
--- a/sci-astronomy/wcstools/files/wcstools-3.7.6-autotools.patch
+++ b/sci-astronomy/wcstools/files/wcstools-3.7-autotools.patch
@@ -2,7 +2,7 @@
 +++ configure.ac	2008-11-03 09:59:35.000000000 +0000
 @@ -0,0 +1,11 @@
 +AC_PREREQ([2.59])
-+AC_INIT(wcstools, 3.7.6, [http://tdc-www.harvard.edu/wcstools/])
++AC_INIT(wcstools, 3.7.x, [http://tdc-www.harvard.edu/wcstools/])
 +AM_INIT_AUTOMAKE([foreign])
 +AM_CONFIG_HEADER(config.h)
 +
@@ -53,12 +53,12 @@
 +	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 wcsgetdate imfill imsmooth imresize \
-+	fileroot filename filext char2sp sp2char wcscrlf isnum isrange isfits \
++	imstack imextract sumpix remap getcol getdate imfill imsmooth imresize \
++	fileroot filename filext char2sp sp2char crlf isnum isrange isfits \
 +	simpos nedpos bincat nedname
 +
 +# these ones don't need libwcs
-+wcscrlf_SOURCES = crlf.c
++crlf_SOURCES = crlf.c
 +filename_SOURCES = filename.c
 +fileroot_SOURCES = fileroot.c
 +filext_SOURCES = filext.c
@@ -68,7 +68,7 @@
 +
 +bincat_SOURCES = bincat.c
 +getcol_SOURCES = getcol.c
-+wcsgetdate_SOURCES = getdate.c
++getdate_SOURCES = getdate.c
 +gethead_SOURCES = gethead.c
 +getfits_SOURCES = getfits.c
 +getpix_SOURCES = getpix.c
diff --git a/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild b/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild
deleted file mode 100644
index c1c849fdb6f0..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild,v 1.2 2009/01/09 22:44:05 josejx Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="World Coordinate System library for astronomical 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.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.0-fix-leaks.patch
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	sed -i -e 's/3.7.x/${PV}/' "${S}"/configure.ac || die "sed failed"
-	eautoreconf
-	# avoid colliding with fixdos and getdate (also in autotools patch)
-	sed -i \
-		-e 's/getdate/wcsgetdate/' \
-		-e 's/crlf/wcscrlf/' \
-		wcstools || die
-}
-
-src_test() {
-	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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	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"
-}
-
-pkg_postinst() {
-	elog "The following execs have been renamed to avoid colliding"
-	elog "with other packages:"
-	elog " getdate -> wcsgetdate"
-	elog " crlf -> wcscrlf"
-}
diff --git a/sci-astronomy/wcstools/wcstools-3.7.7.ebuild b/sci-astronomy/wcstools/wcstools-3.7.7.ebuild
index 1ffce4e752bd..3fbb0ad8bc4a 100644
--- a/sci-astronomy/wcstools/wcstools-3.7.7.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.7.ebuild,v 1.1 2009/07/16 18:59:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.7.ebuild,v 1.2 2009/08/12 19:18:04 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -16,14 +16,15 @@ IUSE=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.7.0-fix-leaks.patch
-	epatch "${FILESDIR}"/${PN}-3.7.6-autotools.patch
-	sed -i -e 's/3.7.x/${PV}/' "${S}"/configure.ac || die "sed failed"
-	eautoreconf
-	# avoid colliding with fixdos and getdate (also in autotools patch)
+	epatch "${FILESDIR}"/${PN}-3.7-autotools.patch
+	# avoid colliding with fixdos, getdate and remap from other packages
 	sed -i \
 		-e 's/getdate/wcsgetdate/' \
 		-e 's/crlf/wcscrlf/' \
-		wcstools || die
+		-e 's/remap/wcsremap/' \
+		wcstools Makefile.am || die
+	sed -i -e 's/3.7.x/${PV}/' "${S}"/configure.ac || die "sed failed"
+	eautoreconf
 }
 
 src_test() {
@@ -47,5 +48,6 @@ pkg_postinst() {
 	elog "The following execs have been renamed to avoid colliding"
 	elog "with other packages:"
 	elog " getdate -> wcsgetdate"
-	elog " crlf -> wcscrlf"
+	elog " crlf    -> wcscrlf"
+	elog " remap   -> wcsremap"
 }