6 files changed, 19 insertions, 149 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/Manifest b/sci-astronomy/swarp/Manifest
index 5e49ecec67d6..156d6f904498 100644
--- a/sci-astronomy/swarp/Manifest
+++ b/sci-astronomy/swarp/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX swarp-configure.patch 1484 RMD160 e7b00fc8e3a78ac5f56fff09bc9fc3cebc6d3717 SHA1 cb364b992a0f1169f21e81d35e15bc81b2fcc3c0 SHA256 bb54455e64366d92f8ca004bff52a1b6716fdaebb38c6cc56ceecb932c67cef9
 AUX swarp-nodoc.patch 445 RMD160 898c862041e9438a59049ac48a889c0413c0acf0 SHA1 9b92f8e6807d773179b7a5cfdad5638e1888a836 SHA256 9723b0757f68368c2aabf46a7417f5ca5c0dd2834c486de96f5f17b4ed273ba0
-DIST swarp-2.17.1.tar.gz 1962775 RMD160 240d23e4e49218914b816b448651b221b4f58586 SHA1 eadd57e58d3fb4255495c3e0741b1eb4a2842472 SHA256 34e815d44f3b1c3c7bfdeb01bbdcf32d1eac239527a0937c3ed2b6f7be34bcee
-DIST swarp-2.17.6.tar.gz 1969347 RMD160 2358756922918b49cc52367eac9e316f3598615c SHA1 4656f6010926936b248080da2bbcf38e5cd1c22c SHA256 44e1d166b06010fc636ad79a01f7db795a088cc3b5a34fe660423648a5a91da7
 DIST swarp-2.19.1.tar.gz 1962393 RMD160 bca92fcca950e94b558cbc457c87fe85ab07424e SHA1 b16ccc8f831fb7d7ae657770e32f920f75f8b056 SHA256 26e72defa0526e5be59e854bd54f54dc13b28f9ccede40571729c426b030d8cb
-EBUILD swarp-2.17.1.ebuild 942 RMD160 94fe0bf7ea28d1c532667bdd6357674dd22e8b0b SHA1 ba1aa262bfc41633cc1a04eae48b69dde94f9845 SHA256 300ad5c4a422eb9cedda74dbdabe6f2203934f8a3ccb53a801a19682174e918b
-EBUILD swarp-2.17.6.ebuild 906 RMD160 82175fbcefe4626cb9d8c5f4338bac13dcde0d7c SHA1 6c9d0d858ee1c9ba3b815ec0d0abafacb942498e SHA256 1efd2f294d2b97e97064375139b8b827faf41469558119cfd81298bb755c4d71
-EBUILD swarp-2.19.1.ebuild 862 RMD160 a480a18ee6d50fbfcb7980aaeae2232d82ce7854 SHA1 9d2c8a7ff1cca90fd1748b1b752c973b711b4c3c SHA256 8f95a186c58f95cfaa0e30ddbf427e362905cbdb2bfeb53f0d6fca1488322f8a
-MISC ChangeLog 1764 RMD160 06dca295ef9f8f946142ba47fb834a297476e361 SHA1 a3c0600b2df44f10d41a0d28486fcc43bcaec1bf SHA256 04cf705be75af58f2253dd488877e69e7849a77ec33ef0c89fd39919fabd6861
+EBUILD swarp-2.19.1.ebuild 733 RMD160 9671d06572a09aae6b14bba72e0e13c42800cad1 SHA1 17dd9f7f56452b53540ed196315d380210712cef SHA256 24cd91b0344972c917d58dc9c52f9ac1a4a034b1980e52d53236cf16679df97f
+MISC ChangeLog 1982 RMD160 96c03aa592ccd3fa0dcd99dbb5d639d41eaad3e1 SHA1 4e96aa66b61b93306c51a4eeb39cb689e9ba2543 SHA256 292729fa91ea647638d5a87451fa532d35b194a5fa6e626692ef02a546543bf8
 MISC metadata.xml 311 RMD160 e1abf16817060e5efc77245188be76e004b52016 SHA1 495e93df8371dc325a9ee95b1e8143fa6355c265 SHA256 dc854c36aee9cf94056cfd0739bb4df9926298efce3fee4771f8e69e43a03048
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk465hAACgkQ1ycZbhPLE2CBrACfaVWuFoB6CIJ5A48dWl0ROgEE
-Lb0AniPTB2bEg8QZX+iX4lQfVZoV8FNX
-=OWcf
+iEYEARECAAYFAk/0uCcACgkQ1ycZbhPLE2AkowCgsLfeIhfpzqemU1U545PDpiK7
+nMwAn0ers+yZCgHrVacdZui+Q6TjDIwn
+=1NkK
 -----END PGP SIGNATURE-----
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/*
 }