Switch to EAPI4, removed old, keyword amd64-linux, x86-linux

(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64)

5 files changed, 13 insertions, 138 deletions

diff --git a/sci-astronomy/swarp/ChangeLog b/sci-astronomy/swarp/ChangeLog
index da855a4c7da9..d6ebc20a88b1 100644
--- a/sci-astronomy/swarp/ChangeLog
+++ b/sci-astronomy/swarp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/swarp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/swarp/ChangeLog,v 1.6 2011/08/04 18:33:44 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/swarp/ChangeLog,v 1.7 2012/07/04 21:39:45 bicatali Exp $
+
+  04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/swarp-configure.patch, -swarp-2.17.1.ebuild, -swarp-2.17.6.ebuild,
+  swarp-2.19.1.ebuild:
+  Switch to EAPI4, removed old, keyword amd64-linux, x86-linux
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
diff --git a/sci-astronomy/swarp/files/swarp-configure.patch b/sci-astronomy/swarp/files/swarp-configure.patch
deleted file mode 100644
index af62726761de..000000000000
--- a/sci-astronomy/swarp/files/swarp-configure.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- configure.ac.orig	2009-03-26 22:58:33.000000000 +0000
-+++ configure.ac	2009-03-26 22:59:45.000000000 +0000
-@@ -21,41 +21,16 @@
- 
- # Include macros
- sinclude(acx_pthread.m4)
--sinclude(acx_prog_cc_optim.m4)
- sinclude(acx_urbi_resolve_dir.m4)
- 
- # Display pakage and version number
- AC_MSG_RESULT([*********** Configuring:  $PACKAGE $VERSION ($date) **********])
- 
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--
--# Backup and reset the input CFLAGS and LDFLAGS
--mycflags="$CFLAGS"
--CFLAGS=""
--myldflags="$LDFLAGS"
--LDFLAGS=""
--
--# Provide special option for the Linux Intel C compiler
--AC_MSG_CHECKING([for Linux Intel C compiler mode])
--AC_ARG_ENABLE(icc,
--	[AC_HELP_STRING([--enable-icc],
--	[Enable special mode for compilation with the Intel compiler \
--(off by default)])],
--        use_icc="yes"
--        cclist="icc $cclist"
--	AC_MSG_RESULT([yes]),
--        use_icc="no"
--	AC_MSG_RESULT([no]))
--
- # Checks for programs.
--# GCC is chosen last because it is likely to yield less optimized code
--AC_PROG_CC([$cclist])
- # C Compiler: Check that it is ANSI C
- AM_PROG_CC_STDC
- # C Compiler: Check that it is POSIX-compliant
- AC_ISC_POSIX
--ACX_PROG_CC_OPTIM
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- 
-@@ -65,9 +40,6 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(malloc.h unistd.h sys/mman.h)
--if test $use_icc = "yes" -a $CC = "icc"; then
--AC_CHECK_HEADERS(mathimf.h)
--fi
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
diff --git a/sci-astronomy/swarp/swarp-2.17.1.ebuild b/sci-astronomy/swarp/swarp-2.17.1.ebuild
deleted file mode 100644
index f37f3d5c16db..000000000000
--- a/sci-astronomy/swarp/swarp-2.17.1.ebuild
+++ /dev/null
@@ -1,36 +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/swarp/swarp-2.17.1.ebuild,v 1.1 2009/02/17 20:54:23 bicatali Exp $
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="Resample and coadd astronomical FITS images"
-HOMEPAGE="http://terapix.iap.fr/soft/swarp"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc threads mpi"
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	use mpi || export MPICC="$(tc-getCC)"
-	local myconf
-	# --disable-threads is buggy
-	use threads && myconf="--enable-threads"
-	econf \
-		$(use_enable mpi) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/* || die
-	fi
-}
diff --git a/sci-astronomy/swarp/swarp-2.17.6.ebuild b/sci-astronomy/swarp/swarp-2.17.6.ebuild
deleted file mode 100644
index a2c2be5c4b5b..000000000000
--- a/sci-astronomy/swarp/swarp-2.17.6.ebuild
+++ /dev/null
@@ -1,36 +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/swarp/swarp-2.17.6.ebuild,v 1.3 2010/06/08 20:22:04 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="Resample and coadd astronomical FITS images"
-HOMEPAGE="http://astromatic.iap.fr/software/swarp"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc threads"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-configure.patch
-	epatch "${FILESDIR}"/${PN}-nodoc.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable threads)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/* || die
-	fi
-}
diff --git a/sci-astronomy/swarp/swarp-2.19.1.ebuild b/sci-astronomy/swarp/swarp-2.19.1.ebuild
index e48542cb1aeb..10cd4a5a1b0d 100644
--- a/sci-astronomy/swarp/swarp-2.19.1.ebuild
+++ b/sci-astronomy/swarp/swarp-2.19.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/swarp/swarp-2.19.1.ebuild,v 1.1 2010/09/24 04:37:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/swarp/swarp-2.19.1.ebuild,v 1.2 2012/07/04 21:39:45 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils autotools
 
 DESCRIPTION="Resample and coadd astronomical FITS images"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads"
 RDEPEND=""
 DEPEND="${RDEPEND}"
@@ -26,10 +26,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/* || die
-	fi
+	default
+	use doc && dodoc doc/*
 }