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

[Sebastien Fabbro]

commit:     29d454bb00cf20c670b64ac4c265ce36dc38bcfa
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 19:57:47 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 19:57:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=29d454bb

sci-astronomy/sextractor: EAPI-5, autotools-utils, missing threads on atlas

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/sextractor/ChangeLog                 |  7 +++++--
 .../sextractor/sextractor-2.8.6-r1.ebuild          |  5 +++--
 sci-astronomy/sextractor/sextractor-9999.ebuild    | 22 ++++++++++++++--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/sci-astronomy/sextractor/ChangeLog b/sci-astronomy/sextractor/ChangeLog
index fc4b8f9..b5426c1 100644
--- a/sci-astronomy/sextractor/ChangeLog
+++ b/sci-astronomy/sextractor/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/sextractor
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/ChangeLog,v 1.3 2011/08/04 18:32:38 bicatali Exp $
 
+  27 Feb 2014; Sébastien Fabbro <bicatali@g.o>
+  sextractor-2.8.6-r1.ebuild, sextractor-9999.ebuild:
+  sci-astronomy/sextractor: EAPI-5, autotools-utils, missing threads on atlas
+
 *sextractor-9999 (04 Jul 2012)
 
   04 Jul 2012; Sébastien Fabbro <bicatali@g.o>
@@ -51,4 +55,3 @@
 	
   26 Nov 2005; Sebastien Fabbro <seb@×××××××.pt> +sextractor-2.4.4.ebuild:
   Initial import. Close bug #65684
-

diff --git a/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild b/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild
index f6e4a0c..e70d3e3 100644
--- a/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit eutils autotools
 
 DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads"
 
-RDEPEND="sci-libs/atlas[lapack]
+RDEPEND="
+	sci-libs/atlas[lapack]
 	sci-libs/fftw:3.0"
 DEPEND="${RDEPEND}"
 

diff --git a/sci-astronomy/sextractor/sextractor-9999.ebuild b/sci-astronomy/sextractor/sextractor-9999.ebuild
index d79f690..c09faac 100644
--- a/sci-astronomy/sextractor/sextractor-9999.ebuild
+++ b/sci-astronomy/sextractor/sextractor-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,9 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit ${_SVN} autotools
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit ${_SVN} autotools-utils
 
 DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
 HOMEPAGE="http://www.astromatic.net/software/sextractor"
@@ -24,7 +26,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc modelfit threads"
 
-RDEPEND="modelfit? ( sci-libs/atlas[lapack] sci-libs/fftw:3.0 )"
+RDEPEND="
+	modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -42,19 +45,22 @@ src_prepare() {
 			-e "s/-llapack/-l${myclapack}/g" \
 			-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
 			acx_atlas.m4 || die
-		eautoreconf
+		AUTOTOOLS_AUTORECONF=1
 	fi
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
-		$(use_enable modelfit model-fitting) \
+	local myeconfargs=(
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
+		$(use_enable modelfit model-fitting)
 		$(use_enable threads)
+	)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	default
+	autotools-utils_src_install
 	CONFDIR=/usr/share/sextractor
 	insinto ${CONFDIR}
 	doins config/*