[gentoo-commits] proj/sci:master commit in: sci-astronomy/weightwatcher/

[Sebastien Fabbro]

commit:     f020ef91b94a89f68a9c351dea17bc7a55f05d2d
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 20:54:31 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 20:54:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f020ef91

sci-astronomy/weightwatcher: EAPI-5, autotools-utils

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/weightwatcher/ChangeLog              |  7 ++++--
 .../weightwatcher/weightwatcher-1.8.10.ebuild      | 29 ----------------------
 .../weightwatcher/weightwatcher-9999.ebuild        | 13 +++++-----
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/sci-astronomy/weightwatcher/ChangeLog b/sci-astronomy/weightwatcher/ChangeLog
index 7f7b9f5..22ba374 100644
--- a/sci-astronomy/weightwatcher/ChangeLog
+++ b/sci-astronomy/weightwatcher/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/weightwatcher
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Feb 2014; Sébastien Fabbro <bicatali@g.o> -Manifest,
+  -weightwatcher-1.8.10.ebuild, weightwatcher-9999.ebuild:
+  sci-astronomy/weightwatcher: EAPI-5, autotools-utils
+
 *weightwatcher-9999 (09 Jul 2012)
 
   09 Jul 2012; Sébastien Fabbro <bicatali@g.o>
@@ -19,4 +23,3 @@
 
   18 Nov 2010; Sébastien Fabbro <bicatali@g.o> ChangeLog:
   Initial import
-

diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
deleted file mode 100644
index 5996e93..0000000
--- a/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
-HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*.pdf
-}

diff --git a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
index a290a70..71aa61c 100644
--- a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
+++ b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN=subversion
@@ -14,7 +14,10 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit ${_SVN} autotools
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit ${_SVN} autotools-utils
 
 DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
 HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
@@ -26,11 +29,7 @@ IUSE="doc"
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eautoreconf
-}
-
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }