Fixed obsolete m4 macro (bug #471970), removed old

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

6 files changed, 11 insertions, 188 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index e371ffba84bd..424b611acbbe 100644
--- a/sci-astronomy/wcstools/ChangeLog
+++ b/sci-astronomy/wcstools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/wcstools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.26 2012/11/14 18:57:29 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.27 2013/06/07 23:45:03 bicatali Exp $
+
+  07 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> -wcstools-3.8.4.ebuild,
+  -wcstools-3.8.5.ebuild, -wcstools-3.8.6.ebuild,
+  files/wcstools-3.8.3-autotools.patch, wcstools-3.8.7.ebuild:
+  Fixed obsolete m4 macro (bug #471970), removed old
 
 *wcstools-3.8.7 (14 Nov 2012)
 
diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
index bba047b5a918..8293174f466a 100644
--- a/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
+++ b/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
@@ -4,7 +4,7 @@
 +AC_PREREQ([2.59])
 +AC_INIT(wcstools, 3.8.x , [http://tdc-www.harvard.edu/wcstools/])
 +AM_INIT_AUTOMAKE([foreign])
-+AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
 +
 +AC_PROG_CC
 +AC_PROG_LIBTOOL
diff --git a/sci-astronomy/wcstools/wcstools-3.8.4.ebuild b/sci-astronomy/wcstools/wcstools-3.8.4.ebuild
deleted file mode 100644
index 62ae3c2c0ce1..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.8.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.4.ebuild,v 1.1 2011/09/23 19:17:31 xarthisius Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="World Coordinate System library for astronomical FITS images"
-HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DOCS=( Readme Programs NEWS libned/NED_client )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.8.3-autotools.patch \
-		"${FILESDIR}"/${P}-overflows.patch \
-		"${FILESDIR}"/${P}-implicits.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.... Programs/${PV} Programs/" \
-		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.0000" ]] \
-		|| die "test gethead failed"
-	rm -f test.fits
-}
-
-src_install() {
-	default
-	doman Man/man1/*
-	newdoc libwcs/Readme Readme.libwcs
-	newdoc libwcs/NEWS NEWS.libwcs
-}
-
-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.5.ebuild b/sci-astronomy/wcstools/wcstools-3.8.5.ebuild
deleted file mode 100644
index 2aaa50502e80..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.8.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.5.ebuild,v 1.2 2012/08/05 20:42:30 bicatali Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib
-
-DESCRIPTION="World Coordinate System library for astronomical FITS images"
-HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( Readme Programs NEWS libned/NED_client )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.8.3-autotools.patch \
-		"${FILESDIR}"/${PN}-3.8.4-implicits.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.... Programs/${PV} Programs/" \
-		wcstools || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-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.0000" ]] \
-		|| die "test gethead failed"
-	rm test.fits
-}
-
-src_install() {
-	default
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.la
-	doman Man/man1/*
-	newdoc libwcs/Readme Readme.libwcs
-	newdoc libwcs/NEWS NEWS.libwcs
-}
-
-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.6.ebuild b/sci-astronomy/wcstools/wcstools-3.8.6.ebuild
deleted file mode 100644
index 4481dabc9d37..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.8.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.6.ebuild,v 1.1 2012/08/21 11:50:52 xarthisius Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib
-
-DESCRIPTION="World Coordinate System library for astronomical FITS images"
-HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( Readme Programs NEWS libned/NED_client )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.8.3-autotools.patch \
-		"${FILESDIR}"/${PN}-3.8.4-implicits.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.... Programs/${PV} Programs/" \
-		wcstools || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-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.0000" ]] \
-		|| die "test gethead failed"
-	rm test.fits
-}
-
-src_install() {
-	default
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.la
-	doman Man/man1/*
-	newdoc libwcs/Readme Readme.libwcs
-	newdoc libwcs/NEWS NEWS.libwcs
-}
-
-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.7.ebuild b/sci-astronomy/wcstools/wcstools-3.8.7.ebuild
index 7687240dfa11..c247fd840b17 100644
--- a/sci-astronomy/wcstools/wcstools-3.8.7.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.8.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.7.ebuild,v 1.1 2012/11/14 18:57:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.7.ebuild,v 1.2 2013/06/07 23:45:03 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils multilib