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

[Sebastien Fabbro]

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

sci-astronomy/scamp: EAPI-5, autotools-utils, fixed plplot flag

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/scamp/ChangeLog             |  7 +++++--
 sci-astronomy/scamp/metadata.xml          | 10 +++++-----
 sci-astronomy/scamp/scamp-1.7.0-r2.ebuild | 24 +++++++++++++++---------
 sci-astronomy/scamp/scamp-9999.ebuild     | 26 +++++++++++++++++---------
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 8803b13..9e79b66 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/scamp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.7 2011/08/04 18:32:22 bicatali Exp $
 
+  27 Feb 2014; Sébastien Fabbro <bicatali@g.o> metadata.xml,
+  scamp-1.7.0-r2.ebuild, scamp-9999.ebuild:
+  sci-astronomy/scamp: EAPI-5, autotools-utils, fixed plplot flag
+
   14 Jun 2013; Justin Lecher <jlec@g.o> scamp-9999.ebuild, metadata.xml:
   Drop KEYWORDS of live ebuilds
 
@@ -90,4 +94,3 @@
 
   19 Sep 2006; Sebastien Fabbro <seb@×××××××.pt> +scamp-1.2.11.ebuild:
   Initial import.
-

diff --git a/sci-astronomy/scamp/metadata.xml b/sci-astronomy/scamp/metadata.xml
index a02cbff..edd8754 100644
--- a/sci-astronomy/scamp/metadata.xml
+++ b/sci-astronomy/scamp/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
-  <longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   SCAMP computes astrometric and photometric solutions from SExtractor catalogs
   and stores them in header files. These headers files can be read by SWarp to
   coadd images.
 </longdescription>
-  <use>
-    <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
-  </use>
+<use>
+  <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
+</use>
 </pkgmetadata>

diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
index 9c0c2e4..a0b3afa 100644
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
@@ -2,8 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-inherit eutils autotools
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils multilib
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
@@ -15,9 +19,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads plplot"
 
 RDEPEND=">=sci-astronomy/cdsclient-3.4
-	sci-libs/atlas[lapack]
+	sci-libs/atlas[lapack,threads=]
 	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot )"
+	plplot? ( sci-libs/plplot:= )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -38,17 +42,19 @@ src_prepare() {
 		 acx_atlas.m4 || die
 	epatch "${FILESDIR}"/${P}-plplot599.patch
 	sed -i -e 's/doc//' Makefile.am || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
-		$(use_with plplot) \
+	local myeconfargs=(
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
+		$(use_with plplot)
 		$(use_enable threads)
+	)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }

diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index 49729d3..8ce3177 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-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 multilib
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
@@ -23,10 +26,11 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="doc plplot threads"
 
-RDEPEND=">=sci-astronomy/cdsclient-3.4
-	sci-libs/atlas[lapack]
+RDEPEND="
+	>=sci-astronomy/cdsclient-3.4
+	sci-libs/atlas[lapack,threads=]
 	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot )"
+	plplot? ( sci-libs/plplot:= )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -41,18 +45,22 @@ src_prepare() {
 		-e "s/-lcblas/-l${mycblas}/g" \
 		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
 		-e "s/-llapack/-l${myclapack}/g" \
+		-e "s/\(lapack_lib=\).*/\1${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
 		acx_atlas.m4 || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+	local myeconfargs=(
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
+		$(use_enable plplot)
 		$(use_enable threads)
+	)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }