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 D08F659CA3 for ; Mon, 14 Mar 2016 02:18:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2074121C033; Mon, 14 Mar 2016 02:17:53 +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 37EC721C032 for ; Mon, 14 Mar 2016 02:17:47 +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 6E4F8340B29 for ; Mon, 14 Mar 2016 02:17:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7791585A 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: <1457384648.01631f080546646efd6be1d55bfab2b9f81f5f56.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/skymaker/ X-VCS-Repository: proj/sci X-VCS-Files: sci-astronomy/skymaker/skymaker-3.10.5.ebuild sci-astronomy/skymaker/skymaker-9999.ebuild X-VCS-Directories: sci-astronomy/skymaker/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 01631f080546646efd6be1d55bfab2b9f81f5f56 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: 305c64aa-0126-4322-8daf-250b8c1ec46e X-Archives-Hash: a4fb3b786e818c007bab59f7ed5465a4 commit: 01631f080546646efd6be1d55bfab2b9f81f5f56 Author: Sébastien Fabbro gentoo org> AuthorDate: Thu Mar 3 00:39:02 2016 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Mar 7 21:04:08 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=01631f08 sci-astronomy/skymaker: modified to work with EAPI6 and new repo sci-astronomy/skymaker/skymaker-3.10.5.ebuild | 35 --------------------------- sci-astronomy/skymaker/skymaker-9999.ebuild | 30 ++++++++++------------- 2 files changed, 13 insertions(+), 52 deletions(-) diff --git a/sci-astronomy/skymaker/skymaker-3.10.5.ebuild b/sci-astronomy/skymaker/skymaker-3.10.5.ebuild deleted file mode 100644 index f44f47f..0000000 --- a/sci-astronomy/skymaker/skymaker-3.10.5.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="Program that simulates astronomical images" -HOMEPAGE="http://www.astromatic.net/software/skymaker" - -LICENSE="GPL-3" -SLOT="0" -IUSE="threads" - -RDEPEND="sci-libs/fftw:3.0" -DEPEND="${RDEPEND}" - -src_configure() { - local myeconfargs=( $(use_enable threads) ) - autotools-utils_src_configure -} diff --git a/sci-astronomy/skymaker/skymaker-9999.ebuild b/sci-astronomy/skymaker/skymaker-9999.ebuild index f44f47f..171e6c8 100644 --- a/sci-astronomy/skymaker/skymaker-9999.ebuild +++ b/sci-astronomy/skymaker/skymaker-9999.ebuild @@ -1,23 +1,15 @@ -# 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 - -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="Program that simulates astronomical images" HOMEPAGE="http://www.astromatic.net/software/skymaker" @@ -29,7 +21,11 @@ IUSE="threads" RDEPEND="sci-libs/fftw:3.0" DEPEND="${RDEPEND}" +src_prepare() { + default + subversion_src_prepare +} + src_configure() { - local myeconfargs=( $(use_enable threads) ) - autotools-utils_src_configure + econf $(use_enable threads) }