From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 638D059CA3 for ; Mon, 14 Mar 2016 02:17:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D92A621C02B; Mon, 14 Mar 2016 02:17:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CB4F21C028 for ; Mon, 14 Mar 2016 02:17:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28F98340A9F for ; Mon, 14 Mar 2016 02:17:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5367E858 for ; Mon, 14 Mar 2016 02:17:42 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1457384647.7a4fe0e8abb0e9eb7a7356f0da05763369f34947.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/psfex/ X-VCS-Repository: proj/sci X-VCS-Files: sci-astronomy/psfex/psfex-3.17.0.ebuild sci-astronomy/psfex/psfex-3.9.1.ebuild sci-astronomy/psfex/psfex-9999.ebuild X-VCS-Directories: sci-astronomy/psfex/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 7a4fe0e8abb0e9eb7a7356f0da05763369f34947 X-VCS-Branch: master Date: Mon, 14 Mar 2016 02:17:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f529e37d-868c-4d0b-9a40-5e00a6971084 X-Archives-Hash: c8655272bd06134362a1900d600bc33b commit: 7a4fe0e8abb0e9eb7a7356f0da05763369f34947 Author: Sébastien Fabbro gentoo org> AuthorDate: Thu Mar 3 00:31:39 2016 +0000 Commit: Christoph Junghans gentoo 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/* }