sci-astronomy/psfex: modified to work with EAPI6 and new repo

4 files changed, 17 insertions, 168 deletions

diff --git a/sci-astronomy/psfex/Manifest b/sci-astronomy/psfex/Manifest
deleted file mode 100644
index ebffaf240..000000000
--- a/sci-astronomy/psfex/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST psfex-3.17.0.tar.gz 2366378 SHA256 f5f10a7a3a928d5ed4b797cb79b1d21038dda3d9da291ef4bacc504c2b252f06 SHA512 571c819571156f962dede952e04c1582e40b47a54c9d32fa564a12b71e1d042fd3605feb46b393737d1a5a01026396d60d5cbbb0e69692a47821e33c7d5c32ea WHIRLPOOL 04e2229a3782e6900674ae8f40014d015724fd426304f3a083edd24cf3ea5f655d5f1a6bd5374510358bdaa7951d0142d084ac72ef3a583af11ae75a4553de58
-DIST psfex-3.9.1.tar.gz 2364495 SHA256 1758a1a40166ef59475d8fab6abda33ca0ed0a837531ff7ad577d8bce4e511f7 SHA512 5304d044b26c8e9c0ec5912326a1579650976a6710303d7822f5270bd23ce9e4b8ab8a06f50a212e4a3fda504436cd59db174021156a2158f299cd788e81fc00 WHIRLPOOL 28dc1cc454c103392392e367b92ca955d82d18d165e77290693329c3593066b11e621d8d97c5bcb1b1610d3a88372b95efa17bd8dc18647f105dc4b1bffbd359
diff --git a/sci-astronomy/psfex/psfex-3.17.0.ebuild b/sci-astronomy/psfex/psfex-3.17.0.ebuild
deleted file mode 100644
index db23a2197..000000000
--- a/sci-astronomy/psfex/psfex-3.17.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Extracts models of the Point Spread Function from FITS images"
-HOMEPAGE="http://www.astromatic.net/software/psfex"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc threads plplot"
-
-RDEPEND="
-	sci-libs/atlas[lapack,threads=]
-	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local mycblas=atlcblas  myclapack=atlclapack
-	if use threads; then
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \
-			mycblas=ptcblas
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] &&
-		myclapack=ptclapack
-	fi
-	# fix the configure and not the acx_atlas.m4. the eautoreconf will
-	# produce a configure giving  a wrong install Makefile target (to fix)
-	sed -i \
-		-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
-
-	# fix for newer plplot
-	sed -i -e 's/plcol(/plcol0(/g' src/cplot.c || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
-		$(use_enable plplot)
-		$(use_enable threads)
-	)
-	autotools-utils_src_configure
-}
-
-src_install () {
-	autotools-utils_src_install
-	use doc && dodoc doc/*
-}
diff --git a/sci-astronomy/psfex/psfex-3.9.1.ebuild b/sci-astronomy/psfex/psfex-3.9.1.ebuild
deleted file mode 100644
index db23a2197..000000000
--- a/sci-astronomy/psfex/psfex-3.9.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Extracts models of the Point Spread Function from FITS images"
-HOMEPAGE="http://www.astromatic.net/software/psfex"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc threads plplot"
-
-RDEPEND="
-	sci-libs/atlas[lapack,threads=]
-	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local mycblas=atlcblas  myclapack=atlclapack
-	if use threads; then
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \
-			mycblas=ptcblas
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] &&
-		myclapack=ptclapack
-	fi
-	# fix the configure and not the acx_atlas.m4. the eautoreconf will
-	# produce a configure giving  a wrong install Makefile target (to fix)
-	sed -i \
-		-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
-
-	# fix for newer plplot
-	sed -i -e 's/plcol(/plcol0(/g' src/cplot.c || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
-		$(use_enable plplot)
-		$(use_enable threads)
-	)
-	autotools-utils_src_configure
-}
-
-src_install () {
-	autotools-utils_src_install
-	use doc && dodoc doc/*
-}
diff --git a/sci-astronomy/psfex/psfex-9999.ebuild b/sci-astronomy/psfex/psfex-9999.ebuild
index db23a2197..b8ab1240b 100644
--- a/sci-astronomy/psfex/psfex-9999.ebuild
+++ b/sci-astronomy/psfex/psfex-9999.ebuild
@@ -1,23 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
+inherit subversion autotools
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib
+ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
+ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca"
+SRC_URI=""
+KEYWORDS=""
 
 DESCRIPTION="Extracts models of the Point Spread Function from FITS images"
 HOMEPAGE="http://www.astromatic.net/software/psfex"
@@ -33,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	local mycblas=atlcblas  myclapack=atlclapack
 	if use threads; then
 		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \
@@ -42,29 +35,27 @@ src_prepare() {
 	fi
 	# fix the configure and not the acx_atlas.m4. the eautoreconf will
 	# produce a configure giving  a wrong install Makefile target (to fix)
-	sed -i \
-		-e "s/-lcblas/-l${mycblas}/g" \
+	sed -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
+		-i acx_atlas.m4 || die
 
 	# fix for newer plplot
-	sed -i -e 's/plcol(/plcol0(/g' src/cplot.c || die
-	autotools-utils_src_prepare
+	sed -e 's/plcol(/plcol0(/g' -i src/cplot.c || die
+	eautoreconf
+	subversion_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
-		$(use_enable plplot)
+	econf \
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+		$(use_enable plplot) \
 		$(use_enable threads)
-	)
-	autotools-utils_src_configure
 }
 
 src_install () {
-	autotools-utils_src_install
+	default
 	use doc && dodoc doc/*
 }