Version bump

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 19 insertions, 68 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index 9dedfbff8112..b8f876807c83 100644
--- a/sci-astronomy/wcstools/ChangeLog
+++ b/sci-astronomy/wcstools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-astronomy/wcstools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.19 2011/04/10 15:10:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.20 2011/05/03 22:37:08 bicatali Exp $
+
+*wcstools-3.8.3 (03 May 2011)
+
+  03 May 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -wcstools-3.8.1-r1.ebuild, -wcstools-3.8.2.ebuild,
+  -files/wcstools-3.8.2-autotools.patch, +wcstools-3.8.3.ebuild,
+  +files/wcstools-3.8.3-autotools.patch:
+  Version bump
 
 *wcstools-3.8.2 (10 Apr 2011)
 
diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.2-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
index b0105ebc1e29..bba047b5a918 100644
--- a/sci-astronomy/wcstools/files/wcstools-3.8.2-autotools.patch
+++ b/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
@@ -2,7 +2,7 @@
 +++ configure.ac	2011-04-10 15:54:07.000000000 +0100
 @@ -0,0 +1,11 @@
 +AC_PREREQ([2.59])
-+AC_INIT(wcstools, 3.8.2 , [http://tdc-www.harvard.edu/wcstools/])
++AC_INIT(wcstools, 3.8.x , [http://tdc-www.harvard.edu/wcstools/])
 +AM_INIT_AUTOMAKE([foreign])
 +AM_CONFIG_HEADER(config.h)
 +
diff --git a/sci-astronomy/wcstools/wcstools-3.8.1-r1.ebuild b/sci-astronomy/wcstools/wcstools-3.8.1-r1.ebuild
deleted file mode 100644
index d8701007de35..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.1-r1.ebuild,v 1.1 2010/09/10 10:25:59 xarthisius 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}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-implicits.patch \
-		"${FILESDIR}"/${P}-invalid_free.patch \
-		"${FILESDIR}"/${P}-overflows.patch
-
-	# avoid colliding with fixdos, getdate and remap from other packages
-	sed -i \
-		-e 's/getdate/wcsgetdate/' \
-		-e 's/crlf/wcscrlf/' \
-		-e 's/remap/wcsremap/' \
-		-e "s/3.7.x/${PV}/" \
-		wcstools || die
-	eautoreconf
-}
-
-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
-	doman Man/man1/* || die
-	dodoc Readme Programs NEWS libned/NED_client || die
-	newdoc libwcs/Readme Readme.libwcs || die
-	newdoc libwcs/NEWS NEWS.libwcs || die
-}
-
-pkg_postinst() {
-	elog "The following execs have been renamed to avoid colliding"
-	elog "with other packages:"
-	elog " getdate -> wcsgetdate"
-	elog " crlf    -> wcscrlf"
-	elog " remap   -> wcsremap"
-}
diff --git a/sci-astronomy/wcstools/wcstools-3.8.2.ebuild b/sci-astronomy/wcstools/wcstools-3.8.3.ebuild
index 7fd372eb4e8e..594859c95ac2 100644
--- a/sci-astronomy/wcstools/wcstools-3.8.2.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.2.ebuild,v 1.1 2011/04/10 15:10:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.3.ebuild,v 1.1 2011/05/03 22:37:08 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils autotools
 
 DESCRIPTION="World Coordinate System library for astronomical FITS images"
@@ -16,7 +16,7 @@ IUSE=""
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-3.8.2-autotools.patch \
+		"${FILESDIR}"/${PN}-3.8.3-autotools.patch \
 		"${FILESDIR}"/${PN}-3.8.1-format.patch \
 		"${FILESDIR}"/${PN}-3.8.1-invalid_free.patch \
 		"${FILESDIR}"/${PN}-3.8.1-overflows.patch
@@ -26,7 +26,7 @@ src_prepare() {
 		-e 's/getdate/wcsgetdate/' \
 		-e 's/crlf/wcscrlf/' \
 		-e 's/remap/wcsremap/' \
-		-e "s/3.7.x/${PV}/" \
+		-e "s/3.... Programs/${PV} Programs/" \
 		wcstools || die
 	eautoreconf
 }
@@ -41,11 +41,11 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	doman Man/man1/* || die
-	dodoc Readme Programs NEWS libned/NED_client || die
-	newdoc libwcs/Readme Readme.libwcs || die
-	newdoc libwcs/NEWS NEWS.libwcs || die
+	emake DESTDIR="${D}" install
+	doman Man/man1/*
+	dodoc Readme Programs NEWS libned/NED_client
+	newdoc libwcs/Readme Readme.libwcs
+	newdoc libwcs/NEWS NEWS.libwcs
 }
 
 pkg_postinst() {