From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 29DF859CA4 for ; Sun, 6 Mar 2016 19:41:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0EC521C0AC; Sun, 6 Mar 2016 19:41:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05F2021C0A8 for ; Sun, 6 Mar 2016 19:41:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C103C34095A for ; Sun, 6 Mar 2016 19:41:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5032318A5 for ; Sun, 6 Mar 2016 19:41:09 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1456953466.ba81c1dc554b8ecafc91a4705ec030a941d94883.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/swarp/ X-VCS-Repository: proj/sci X-VCS-Files: sci-astronomy/swarp/swarp-2.38.0.ebuild sci-astronomy/swarp/swarp-9999.ebuild X-VCS-Directories: sci-astronomy/swarp/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ba81c1dc554b8ecafc91a4705ec030a941d94883 X-VCS-Branch: master Date: Sun, 6 Mar 2016 19:41:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e07a91c2-15a9-4f00-8f69-89fdbf6eb9b9 X-Archives-Hash: 1101917556f642027482afe26d07129b commit: ba81c1dc554b8ecafc91a4705ec030a941d94883 Author: Sébastien Fabbro gentoo org> AuthorDate: Wed Mar 2 21:17:46 2016 +0000 Commit: Justin Lecher gentoo 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/* }