aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS├ębastien Fabbro <bicatali@gentoo.org>2016-03-03 00:39:02 +0000
committerS├ębastien Fabbro <bicatali@gentoo.org>2016-03-07 21:04:08 +0000
commit01631f080546646efd6be1d55bfab2b9f81f5f56 (patch)
tree55d9a9a863b7b45345c3fe4850396c1d9204b27a /sci-astronomy
parentsci-astronomy/stuff: removed fftw dep, modified to work with EAPI6 and new repo (diff)
downloadsci-01631f080546646efd6be1d55bfab2b9f81f5f56.tar.gz
sci-01631f080546646efd6be1d55bfab2b9f81f5f56.tar.bz2
sci-01631f080546646efd6be1d55bfab2b9f81f5f56.zip
sci-astronomy/skymaker: modified to work with EAPI6 and new repo
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/skymaker/Manifest1
-rw-r--r--sci-astronomy/skymaker/skymaker-3.10.5.ebuild35
-rw-r--r--sci-astronomy/skymaker/skymaker-9999.ebuild30
3 files changed, 13 insertions, 53 deletions
diff --git a/sci-astronomy/skymaker/Manifest b/sci-astronomy/skymaker/Manifest
deleted file mode 100644
index 7c0f22fc7..000000000
--- a/sci-astronomy/skymaker/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skymaker-3.10.5.tar.gz 508938 SHA256 a16f9c2bd653763b5e1629e538d49f63882c46291b479b4a4997de84d8e9fb0f SHA512 98bb5a75c21475c6ecf16cb7de333db7faae95fd32c4ac311b44ddf637ffec2c80061b056b070b8d21b1a5a46c0a5a82855e417d25a9d8de02aad2167cb45b43 WHIRLPOOL 485cf8ad6b38b3ec3c5b9544b5c98ffcd24f485630c1228a8a95ef62b3c2b1618aea16cd6ee222cd89ae2080d313dc55eb88aebd2eaadc61b7e378d12bf66fe8
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 f44f47f96..000000000
--- 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 f44f47f96..171e6c83d 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)
}