commit: b1cb8d17de6fecab3e0001a30e67536d3b4c5137
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 00:15:35 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 21:04:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b1cb8d17
sci-astronomy/sextractor: modified to work with EAPI6 and new repo
.../sextractor/files/sextractor-configure.patch | 84 ----------------------
sci-astronomy/sextractor/sextractor-2.19.5.ebuild | 73 -------------------
.../sextractor/sextractor-2.8.6-r1.ebuild | 57 ---------------
sci-astronomy/sextractor/sextractor-9999.ebuild | 36 ++++------
4 files changed, 14 insertions(+), 236 deletions(-)
diff --git a/sci-astronomy/sextractor/files/sextractor-configure.patch
b/sci-astronomy/sextractor/files/sextractor-configure.patch
deleted file mode 100644
index dc8957b..0000000
--- a/sci-astronomy/sextractor/files/sextractor-configure.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- configure.ac.orig 2009-04-09 14:28:38.000000000 +0100
-+++ configure.ac 2009-07-28 18:25:38.000000000 +0100
-@@ -22,42 +22,19 @@
- # Include macros
- sinclude(acx_atlas.m4)
- sinclude(acx_fftw.m4)
--sinclude(acx_prog_cc_optim.m4)
- sinclude(acx_pthread.m4)
- sinclude(acx_urbi_resolve_dir.m4)
-
- # Display pakage and version number
- AC_MSG_RESULT([*********** Configuring: $PACKAGE $VERSION ($date)
**********])
-
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--
--# Backup and reset the input CFLAGS and LDFLAGS
--mycflags="$CFLAGS"
--CFLAGS=""
--myldflags="$LDFLAGS"
--LDFLAGS=""
--
--# Provide special option for the Linux Intel C compiler
--AC_MSG_CHECKING([for Linux Intel C compiler mode])
--AC_ARG_ENABLE(icc,
-- [AC_HELP_STRING([--enable-icc],
-- [Enable special mode for compilation with the Intel compiler \
--(off by default)])],
-- use_icc="yes"
-- cclist="icc $cclist"
-- AC_MSG_RESULT([yes]),
-- use_icc="no"
-- AC_MSG_RESULT([no]))
--
- # Checks for programs.
- # GCC is chosen last because it is likely to yield less optimized code
- AC_LANG(C)
--AC_PROG_CC([$cclist])
-+AC_PROG_CC
- # C Compiler: Check that it is ANSI C and POSIX-compliant
- AM_PROG_CC_STDC
- AC_ISC_POSIX
--ACX_PROG_CC_OPTIM
- AC_DISABLE_STATIC
- #AC_DISABLE_SHARED
- AC_PROG_LIBTOOL
-@@ -160,17 +137,6 @@
- use_gprof="no"
- AC_MSG_RESULT([no]))
-
--# Enable static linking
--AC_MSG_CHECKING([static linking])
--AC_ARG_ENABLE(static,
-- [AC_HELP_STRING([--enable-static],
-- [Enable static linking \
--(off by default)])],
-- use_static="yes"
-- AC_MSG_RESULT([yes]),
-- use_static="no"
-- AC_MSG_RESULT([no]))
--
- ################# Actions to complete in case of multhreading ################
- AC_DEFINE_UNQUOTED(THREADS_NMAX, $n_pthreads,[Maximum number of POSIX
threads])
- if test "$use_pthreads" = "yes"; then
-@@ -205,19 +171,9 @@
-
- # Link with gprof option
- if test "$use_gprof" = "yes"; then
-- if test "$use_icc" = "yes"; then
-- CFLAGS="$CFLAGS -pq"
-- else
-- CFLAGS="$CFLAGS -pg"
-- fi
- use_static="no"
- fi
-
--# Static linking option
--if test "$use_static" = "yes"; then
-- LDFLAGS="-static -shared-libgcc $LDFLAGS"
--fi
--
- # Override automatic CFLAGS and LDFLAGS with those of user
- #if test -n "$mycflags"; then
- #CFLAGS="$mycflags"
diff --git a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
b/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
deleted file mode 100644
index 6515bca..0000000
--- a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
+++ /dev/null
@@ -1,73 +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_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
-HOMEPAGE="http://www.astromatic.net/software/sextractor";
-
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="doc modelfit threads"
-
-RDEPEND="
- modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- if use modelfit; then
- 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
- 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/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
- acx_atlas.m4 || die
- AUTOTOOLS_AUTORECONF=1
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --with-atlas-incdir="${EPREFIX}/usr/include/atlas"
- $(use_enable modelfit model-fitting)
- $(use_enable threads)
- )
- autotools-utils_src_configure
-}
-
-src_install () {
- autotools-utils_src_install
- CONFDIR=/usr/share/sextractor
- insinto ${CONFDIR}
- doins config/*
- use doc && dodoc doc/*
-}
-
-pkg_postinst() {
- elog "SExtractor examples configuration files are located in"
- elog "${EROOT%/}/${CONFDIR} and are not loaded anymore by default."
-}
diff --git a/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild
b/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild
deleted file mode 100644
index cf35567..0000000
--- a/sci-astronomy/sextractor/sextractor-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
-HOMEPAGE="http://www.astromatic.net/software/sextractor";
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz";
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc threads"
-
-RDEPEND="
- sci-libs/atlas[lapack]
- sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-configure.patch
- 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
- 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/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
- acx_atlas.m4 || die "sed acx_atlas.m4 failed"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
- $(use_enable threads)
-}
-
-src_install () {
- default
- CONFDIR=/usr/share/sextractor
- insinto ${CONFDIR}
- doins config/*
- use doc && dodoc doc/*
-}
-
-pkg_postinst() {
- elog "SExtractor examples configuration files are located in"
- elog "${EROOT}/${CONFDIR} and are not loaded anymore by default."
-}
diff --git a/sci-astronomy/sextractor/sextractor-9999.ebuild
b/sci-astronomy/sextractor/sextractor-9999.ebuild
index 6515bca..7c29244 100644
--- a/sci-astronomy/sextractor/sextractor-9999.ebuild
+++ b/sci-astronomy/sextractor/sextractor-9999.ebuild
@@ -1,22 +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_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="Extract catalogs of sources from astronomical FITS images"
HOMEPAGE="http://www.astromatic.net/software/sextractor";
@@ -31,6 +24,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_prepare() {
+ default
if use modelfit; then
local mycblas=atlcblas myclapack=atlclapack
if use threads; then
@@ -45,22 +39,20 @@ src_prepare() {
-e "s/-llapack/-l${myclapack}/g" \
-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
acx_atlas.m4 || die
- AUTOTOOLS_AUTORECONF=1
+ eautoreconf
fi
- autotools-utils_src_prepare
+ subversion_src_prepare
}
src_configure() {
- local myeconfargs=(
- --with-atlas-incdir="${EPREFIX}/usr/include/atlas"
- $(use_enable modelfit model-fitting)
+ econf \
+ --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+ $(use_enable modelfit model-fitting) \
$(use_enable threads)
- )
- autotools-utils_src_configure
}
src_install () {
- autotools-utils_src_install
+ default
CONFDIR=/usr/share/sextractor
insinto ${CONFDIR}
doins config/*
