commit: 01631f080546646efd6be1d55bfab2b9f81f5f56
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 00:39:02 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> 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)
}
