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 0CD1259CA3 for ; Mon, 14 Mar 2016 02:17:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5135CE089C; Mon, 14 Mar 2016 02:17:45 +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 AC2A4E089D for ; Mon, 14 Mar 2016 02:17:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A30B8340ACE for ; Mon, 14 Mar 2016 02:17:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08FB8854 for ; Mon, 14 Mar 2016 02:17:42 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1457384646.2c96e9024b8b1d8ada042bf78f7344bd9b6d77aa.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/weightwatcher/ X-VCS-Repository: proj/sci X-VCS-Files: sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild sci-astronomy/weightwatcher/weightwatcher-9999.ebuild X-VCS-Directories: sci-astronomy/weightwatcher/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 2c96e9024b8b1d8ada042bf78f7344bd9b6d77aa X-VCS-Branch: master Date: Mon, 14 Mar 2016 02:17:42 +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: cf01872a-dd63-4ec4-af79-69145d095272 X-Archives-Hash: b6d968a70844a5c7a9d71363e4dfc1e0 commit: 2c96e9024b8b1d8ada042bf78f7344bd9b6d77aa Author: Sébastien Fabbro gentoo org> AuthorDate: Thu Mar 3 00:19:20 2016 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Mar 7 21:04:06 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2c96e902 sci-astronomy/weightwatcher: modified to work with EAPI6 and new repo .../weightwatcher/weightwatcher-1.12.ebuild | 35 ---------------------- .../weightwatcher/weightwatcher-9999.ebuild | 28 ++++++++--------- 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild deleted file mode 100644 index 9f90ed1..0000000 --- a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild +++ /dev/null @@ -1,35 +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="" -else - SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -#AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils - -DESCRIPTION="Combine weight maps and polygon for astronomical images weighting" -HOMEPAGE="http://www.astromatic.net/software/weightwatcher/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="doc" - -RDEPEND="" -DEPEND="${RDEPEND}" - -src_install () { - autotools-utils_src_install - use doc && dodoc doc/* -} diff --git a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild index 9f90ed1..ec80710 100644 --- a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild +++ b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild @@ -1,23 +1,16 @@ -# 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="" -else - SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi +inherit subversion -#AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 +ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" +ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca" -inherit autotools-utils +SRC_URI="" +KEYWORDS="" DESCRIPTION="Combine weight maps and polygon for astronomical images weighting" HOMEPAGE="http://www.astromatic.net/software/weightwatcher/" @@ -29,7 +22,12 @@ IUSE="doc" RDEPEND="" DEPEND="${RDEPEND}" +src_prepare() { + default + subversion_src_prepare +} + src_install () { - autotools-utils_src_install + default use doc && dodoc doc/* }