[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/swarp/, sci-astronomy/swarp/files/

[Sebastien Fabbro]

commit:     813655152cc53e90128b19461416ad7958bd2a63
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 21:11:46 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 23:13:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81365515

sci-astronomy/swarp: Version bump and cleanup

Package-Manager: portage-2.2.27

 sci-astronomy/swarp/Manifest                       |  2 +-
 sci-astronomy/swarp/files/swarp-nodoc.patch        | 11 -----------
 .../{swarp-2.19.1.ebuild => swarp-2.38.0.ebuild}   | 22 +++++++++-------------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/sci-astronomy/swarp/Manifest b/sci-astronomy/swarp/Manifest
index 085dae0..48df37c 100644
--- a/sci-astronomy/swarp/Manifest
+++ b/sci-astronomy/swarp/Manifest
@@ -1 +1 @@
-DIST swarp-2.19.1.tar.gz 1962393 SHA256 
26e72defa0526e5be59e854bd54f54dc13b28f9ccede40571729c426b030d8cb SHA512 
26c5f7522d9b4f6e7d58a818dad62c0eb811f7bbe6e0547a8200f0d4e19bca4f7dc55043d459814abd4b255f75147b975a3bfe9595334ef8c1b0e0b51d31ce9f
 WHIRLPOOL 
84049875eeeba67c579fbad84d0d792d7829a9d74d35483e8933910709e0fb3f91ccf589b5bf46683998bcb06f5c3a46c3d184010835e013dbed9afddd16be6d
+DIST swarp-2.38.0.tar.gz 2063462 SHA256 
f54a637f6c17ef2d94f767da641afea9bec726c31501cb828d9b948b1507c7c4 SHA512 
80f4ade59738df3d4c9b47bda04148b53c6ba995d523fa8d1e02fb5d952b6078a53cc7d273849a033505de127a4f318b95adf2bf5a2dc38e8cc9bdaf5658487a
 WHIRLPOOL 
e328be5011ac0a89858ce7420d57715f2a178012b81f649953f63bbac6ae5a75c86905c01f58c4bc0a2149b41291e3092e40dbfd302667a1fcb7b2aa9688ac40

diff --git a/sci-astronomy/swarp/files/swarp-nodoc.patch 
b/sci-astronomy/swarp/files/swarp-nodoc.patch
deleted file mode 100644
index dd8471e..0000000
--- a/sci-astronomy/swarp/files/swarp-nodoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig   2010-06-08 21:48:23.000000000 +0100
-+++ Makefile.am        2010-06-08 21:48:34.000000000 +0100
-@@ -2,7 +2,7 @@
- # Copyright (C) 2003-2009 Emmanuel Bertin.
- AUTOMAKE_OPTIONS      = foreign no-dependencies
- SUBDIRS                       = man src
--dist_pkgdata_DATA     = doc xsl/swarp.xsl
-+dist_pkgdata_DATA     = xsl/swarp.xsl
- EXTRA_DIST            = AUTHORS BUGS ChangeLog COPYRIGHT HISTORY INSTALL \
-                         README THANKS TODO \
-                         acx_pthread.m4 acx_prog_cc_optim.m4 \

diff --git a/sci-astronomy/swarp/swarp-2.19.1.ebuild 
b/sci-astronomy/swarp/swarp-2.38.0.ebuild
similarity index 52%
rename from sci-astronomy/swarp/swarp-2.19.1.ebuild
rename to sci-astronomy/swarp/swarp-2.38.0.ebuild
index 9884a43..16fd61b 100644
--- a/sci-astronomy/swarp/swarp-2.19.1.ebuild
+++ b/sci-astronomy/swarp/swarp-2.38.0.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
-inherit eutils autotools
+EAPI=6
 
 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";
+HOMEPAGE="http://www.astromatic.net/software/swarp";
+SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz";
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-LICENSE="CeCILL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
 IUSE="doc threads"
+
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-nodoc.patch
-       eautoreconf
-}
-
 src_configure() {
        econf $(use_enable threads)
 }
 
-src_install() {
+src_install () {
        default
        use doc && dodoc doc/*
 }