commit: 19bdcff2db04925b46190673097f28ded71dc509
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 00:35:58 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=19bdcff2
sci-astronomy/stuff: removed fftw dep, modified to work with EAPI6 and new repo
sci-astronomy/stuff/stuff-1.26.0.ebuild | 35 ---------------------------------
sci-astronomy/stuff/stuff-9999.ebuild | 31 +++++++++++++----------------
2 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/sci-astronomy/stuff/stuff-1.26.0.ebuild
b/sci-astronomy/stuff/stuff-1.26.0.ebuild
deleted file mode 100644
index 1f57f85..0000000
--- a/sci-astronomy/stuff/stuff-1.26.0.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="Tool for automatic generation of astronomical catalogs"
-HOMEPAGE="http://www.astromatic.net/software/stuff/";
-
-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/stuff/stuff-9999.ebuild
b/sci-astronomy/stuff/stuff-9999.ebuild
index 1f57f85..b7eff80 100644
--- a/sci-astronomy/stuff/stuff-9999.ebuild
+++ b/sci-astronomy/stuff/stuff-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="Tool for automatic generation of astronomical catalogs"
HOMEPAGE="http://www.astromatic.net/software/stuff/";
@@ -26,10 +19,14 @@ LICENSE="GPL-3"
SLOT="0"
IUSE="threads"
-RDEPEND="sci-libs/fftw:3.0"
+RDEPEND=""
DEPEND="${RDEPEND}"
+src_prepare() {
+ default
+ subversion_src_prepare
+}
+
src_configure() {
- local myeconfargs=( $(use_enable threads) )
- autotools-utils_src_configure
+ econf $(use_enable threads)
}
