4 files changed, 11 insertions, 39 deletions
diff --git a/sci-astronomy/weightwatcher/ChangeLog b/sci-astronomy/weightwatcher/ChangeLog
index 7f7b9f5d3..22ba374f5 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@gentoo.org> -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@gentoo.org>
@@ -19,4 +23,3 @@
 
   18 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> ChangeLog:
   Initial import
-
diff --git a/sci-astronomy/weightwatcher/Manifest b/sci-astronomy/weightwatcher/Manifest
deleted file mode 100644
index b852e581c..000000000
--- a/sci-astronomy/weightwatcher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST weightwatcher-1.8.10.tar.gz 403372 SHA256 7f8a09deb586bb118c79d7ebcb8c6958d9ea49862f7d5a2dfdf229c550e8f740 SHA512 de901299824cf80da98b79a2d5795a47f67d5160a8ff97150d62b655e80c372a48683f13101666d1ca623546fbe887e8c00936eeedc8f3a13d03cf3a625e1ee0 WHIRLPOOL 846ba019e32f850a2135a7db65cdbdfabf5c11dac9a25f2e76acc3cb92e579382f9994cddda38d5f788e0c5b351a0d4ff7b2f681773e52f764c4c443e6eb7cd8
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 5996e9386..000000000
--- 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 a290a7096..71aa61c05 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/*
 }