sci-astronomy/sextractor: Move to EAPI=4 and autotools-util.eclass, Cleaned old

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 43 insertions, 81 deletions

diff --git a/sci-astronomy/sextractor/ChangeLog b/sci-astronomy/sextractor/ChangeLog
index eb52db6c9b71..ad9755431276 100644
--- a/sci-astronomy/sextractor/ChangeLog
+++ b/sci-astronomy/sextractor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/sextractor
-# Copyright 1999-2011 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/ChangeLog,v 1.4 2012/04/26 16:35:34 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> -sextractor-2.5.0.ebuild,
+  sextractor-2.8.6.ebuild, metadata.xml:
+  Move to EAPI=4 and autotools-util.eclass, Cleaned old
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
diff --git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
index 3fef9e73d55c..189b0b35216f 100644
--- a/sci-astronomy/sextractor/Manifest
+++ b/sci-astronomy/sextractor/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX sextractor-configure.patch 2252 RMD160 4ba075e8add3c29c2b9bd033b7e644c8a1a3e034 SHA1 aa2e4eaa02fd79fe7fd24731909d937b88dc3e50 SHA256 95a611a2a2857d784190958f9ebd9efbcc846cce55ee4cd2c6a1149f3837071e
-DIST sextractor-2.5.0.tar.gz 2321708 RMD160 336e3a47f57416ad50bbbdd2afb4ff7e858556d0 SHA1 84e111ea0796428d9336de7add3820575fd7d4cb SHA256 786f987818546d9b72fea7e786f040b63e31fbc46325deb58929251065573303
 DIST sextractor-2.8.6.tar.gz 3994622 RMD160 98319c54ab3af0d4a91c3ffa70e7d5148b06d67a SHA1 103ac2d51d9bae9fcbc5dda3031d82cd127f8250 SHA256 dde34594c2a1324f0951272e404e55d0d4cb0607f8ea18a61f2563bb67f494ac
-EBUILD sextractor-2.5.0.ebuild 1259 RMD160 aabca363e2397e20cf575e3cdca5b179ed1e99a1 SHA1 ee81b11e919b8d92fbd3df4938fe4fef01df4c2e SHA256 59fc535c4e6a80a4f02c44b67f0817c3c58e82bcf63207a13914b376934fe1cf
-EBUILD sextractor-2.8.6.ebuild 1389 RMD160 44e43048db937f2d82221a3eb4e05b3fea552948 SHA1 9759796e723b93d596c406d4019de2002515d8df SHA256 9429f1f79167979525f53bed6ab5d889e8aef84c2d8064faab40fa1ab66fd58c
-MISC ChangeLog 1410 RMD160 d04e6aed378a836eaf69169aebe6127b668ff6c9 SHA1 5dbf6f87726f0d718ce8a6fe25fc3ff4e9f98c41 SHA256 4e4f4c0a91a7bcaa5597a362eae015ad48de307bff65e29090d80a83bcfd6334
-MISC metadata.xml 565 RMD160 6ecadc21d64b23d9a38056647e5c8404818a344c SHA1 460aae80eb863d4c70190da9de4e08753b643c07 SHA256 43d21ac4ebaedaa0c98f80fc25857135752e5d9a1f9b25f29215a0960195107e
+EBUILD sextractor-2.8.6.ebuild 1322 RMD160 c95f6f2d2eda3d07de888e4e882653e28f814380 SHA1 96c607b0f5982998f821177720c24f2200043f6a SHA256 0d39ad158f34d579561e33d86da5acc7c2ce4f693b1d79302a0e3bc4e09dd836
+MISC ChangeLog 1577 RMD160 36a49a5bc83df7bd89e6ff037c515061b750cdc9 SHA1 648ebe9863666959dbfcc23aed6bc11eb5fa7a2c SHA256 5e26a6f38518350974fe49825a2f5ac1220962dd300ed54577e27fa0a29e36a3
+MISC metadata.xml 567 RMD160 47dd54f7ccdd069f91e4f727c242493e4b624a2b SHA1 07849bfd58ff6b09cef67aaa255ee134198e32e2 SHA256 397aac955127137afa16fbbe5d3b071181c2eaccf0f6d58a335a46ea9ebfb40f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk465c4ACgkQ1ycZbhPLE2A11ACcDm/Xb0VXWejyKIBGRNkVS62A
-uf8AoJ1/J+ZZfB+o9emuu4nYJcXQjOM0
-=nmMf
+iEYEAREKAAYFAk+ZeVwACgkQgAnW8HDreRZlMQCdHvLzSPZyUKvhHWyAo9ra+qPu
+yKgAoLIwGJ5AbiFQfIT49/joJLSedUbZ
+=axR6
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/sextractor/metadata.xml b/sci-astronomy/sextractor/metadata.xml
index 8b8931e595ae..b2219a08d147 100644
--- a/sci-astronomy/sextractor/metadata.xml
+++ b/sci-astronomy/sextractor/metadata.xml
@@ -1,8 +1,8 @@
 <?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">
   SExtractor (Source Extractor) is a program that builds a catalogue of
   objects from an astronomical image. Although it is particularly
   oriented towards reduction of large scale galaxy-survey data, it
diff --git a/sci-astronomy/sextractor/sextractor-2.5.0.ebuild b/sci-astronomy/sextractor/sextractor-2.5.0.ebuild
deleted file mode 100644
index c9eb4cdf10d7..000000000000
--- a/sci-astronomy/sextractor/sextractor-2.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/sextractor-2.5.0.ebuild,v 1.1 2009/02/17 20:44:23 bicatali Exp $
-
-EAPI=2
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images."
-HOMEPAGE="http://terapix.iap.fr/soft/sextractor"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	CONFDIR=/usr/share/${PN}/config
-	# change default configuration files location from current dir
-	sed -i -e "s:default\.:${CONFDIR}/default\.:" src/preflist.h || die
-	# buggy with >= O2
-	replace-flags -O[2-9] -O1
-	local myconf
-	[[ "$(tc-getCC)" == "icc" ]] & myconf="${myconf} --enable-icc"
-	econf "${myconf}" || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog HISTORY README THANKS
-	insinto ${CONFDIR}
-	doins config/* || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*
-	fi
-}
-
-pkg_postinst() {
-	elog "SExtractor configuration files are located"
-	elog "in ${CONFDIR} and loaded by default."
-}
diff --git a/sci-astronomy/sextractor/sextractor-2.8.6.ebuild b/sci-astronomy/sextractor/sextractor-2.8.6.ebuild
index 53d04ec30f47..67385ef0e175 100644
--- a/sci-astronomy/sextractor/sextractor-2.8.6.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.8.6.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/sextractor-2.8.6.ebuild,v 1.1 2009/07/28 17:39:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/sextractor-2.8.6.ebuild,v 1.2 2012/04/26 16:35:34 jlec Exp $
 
-EAPI=2
-inherit eutils autotools
+EAPI=4
 
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images."
-HOMEPAGE="http://astromatic.iap.fr/software/sextractor"
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
+HOMEPAGE="http://astromatic.iap.fr/software/sextractor/"
 SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
 
 LICENSE="CeCILL-2"
@@ -14,36 +17,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc threads"
 
-RDEPEND="virtual/cblas
-	>=sci-libs/lapack-atlas-3.8.0
+RDEPEND="
+	virtual/cblas
+	sci-libs/lapack-atlas
 	sci-libs/fftw:3.0"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-configure.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-configure.patch
 	# gentoo uses cblas instead of ptcblas (linked to threaded with eselect)
-	sed -i \
+	sed \
 		-e 's/ptcblas/cblas/g' \
-		acx_atlas.m4 || die "sed acx_atlas.m4 failed"
-	eautoreconf
+		-i acx_atlas.m4 || die "sed acx_atlas.m4 failed"
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas="/usr/$(get_libdir)/lapack/atlas" \
+	local myeconfargs=(
+		--with-atlas="/usr/$(get_libdir)/lapack/atlas"
 		$(use_enable threads)
+		)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog HISTORY README THANKS
-	CONFDIR=/usr/share/sextractor
-	insinto ${CONFDIR}
-	doins config/* || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/* || die
-	fi
+	autotools-utils_src_install
+
+	insinto /usr/share/sextractor
+	doins config/*
+
+	use doc && dodoc doc/*
 }
 
 pkg_postinst() {