commit: 2c96e9024b8b1d8ada042bf78f7344bd9b6d77aa
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 00:19:20 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> 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/*
}
