commit: ba81c1dc554b8ecafc91a4705ec030a941d94883 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Wed Mar 2 21:17:46 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Wed Mar 2 21:17:46 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ba81c1dc
sci-astronomy/swarp: cleanup to move in main tree Package-Manager: portage-2.2.27 sci-astronomy/swarp/swarp-2.38.0.ebuild | 41 --------------------------------- sci-astronomy/swarp/swarp-9999.ebuild | 34 ++++++++++++--------------- 2 files changed, 15 insertions(+), 60 deletions(-) diff --git a/sci-astronomy/swarp/swarp-2.38.0.ebuild b/sci-astronomy/swarp/swarp-2.38.0.ebuild deleted file mode 100644 index 71c254d..0000000 --- a/sci-astronomy/swarp/swarp-2.38.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit subversion - ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" - SRC_URI="" - KEYWORDS="" - AUTOTOOLS_AUTORECONF=1 -else - SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils - -DESCRIPTION="Resample and coadd astronomical FITS images" -HOMEPAGE="http://astromatic.iap.fr/software/swarp" - -LICENSE="GPL-3" -SLOT="0" - -IUSE="doc threads" - -RDEPEND="" -DEPEND="${RDEPEND}" - -src_configure() { - local myeconfargs=( $(use_enable threads) ) - autotools-utils_src_configure -} - -src_install () { - autotools-utils_src_install - use doc && dodoc doc/* -} diff --git a/sci-astronomy/swarp/swarp-9999.ebuild b/sci-astronomy/swarp/swarp-9999.ebuild index 71c254d..0ba8a64 100644 --- a/sci-astronomy/swarp/swarp-9999.ebuild +++ b/sci-astronomy/swarp/swarp-9999.ebuild @@ -1,26 +1,18 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -if [[ ${PV} == "9999" ]] ; then - inherit subversion - ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" - SRC_URI="" - KEYWORDS="" - AUTOTOOLS_AUTORECONF=1 -else - SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi +inherit subversion -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils +ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" +ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca" +SRC_URI="" +KEYWORDS="" DESCRIPTION="Resample and coadd astronomical FITS images" -HOMEPAGE="http://astromatic.iap.fr/software/swarp" +HOMEPAGE="http://www.astromatic.net/software/swarp" LICENSE="GPL-3" SLOT="0" @@ -30,12 +22,16 @@ IUSE="doc threads" RDEPEND="" DEPEND="${RDEPEND}" +src_prepare() { + default + subversion_src_prepare +} + src_configure() { - local myeconfargs=( $(use_enable threads) ) - autotools-utils_src_configure + econf $(use_enable threads) } src_install () { - autotools-utils_src_install + default use doc && dodoc doc/* }