commit: 7a4fe0e8abb0e9eb7a7356f0da05763369f34947
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 00:31:39 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 21:04:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a4fe0e8
sci-astronomy/psfex: modified to work with EAPI6 and new repo
sci-astronomy/psfex/psfex-3.17.0.ebuild | 70 ---------------------------------
sci-astronomy/psfex/psfex-3.9.1.ebuild | 70 ---------------------------------
sci-astronomy/psfex/psfex-9999.ebuild | 43 ++++++++------------
3 files changed, 17 insertions(+), 166 deletions(-)
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 db23a21..0000000
--- 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 db23a21..0000000
--- 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 db23a21..b8ab124 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/*
}
