* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sextractor/, sci-astronomy/sextractor/files/
@ 2016-03-07 20:06 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2016-03-07 20:06 UTC (permalink / raw
To: gentoo-commits
commit: fc75115e9cec3f2631140f323191232596ade9a3
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 21:01:33 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 21:02:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc75115e
sci-astronomy/sextractor: re-added
Package-Manager: portage-2.2.27
| 1 +
| 65 +++++++++++++++++++
| 32 ++++++++++
| 55 ++++++++++++++++
| 26 ++++++++
| 22 +++++++
| 73 ++++++++++++++++++++++
7 files changed, 274 insertions(+)
--git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
new file mode 100644
index 0000000..bf33f0f
--- /dev/null
+++ b/sci-astronomy/sextractor/Manifest
@@ -0,0 +1 @@
+DIST sextractor-2.19.5.tar.gz 4317039 SHA256 2a880e018585f905300d5919ab454b18640a5bef13deb5c4f03111ac4710b2c5 SHA512 aadd007facad983ea35bd7496a53520f987aa8e492259e428170354d262212e3c1a17c60bf6ea97b6056136b0bd02793e92e14b21cb40a0f8886245eeeac6f4d WHIRLPOOL cf499f4763ebf07d94ccb630030baa1b1e3e03972a9f214ee965c1f742548ee46fa4ce22203d1a6ee7c0817c2915d36483d1a7d7fcc04348beb559f5b5dd4464
--git a/sci-astronomy/sextractor/files/sextractor-2.19.5-fix-format-errors.patch b/sci-astronomy/sextractor/files/sextractor-2.19.5-fix-format-errors.patch
new file mode 100644
index 0000000..c20ce31
--- /dev/null
+++ b/sci-astronomy/sextractor/files/sextractor-2.19.5-fix-format-errors.patch
@@ -0,0 +1,65 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix format security errors
+--- a/src/catout.c
++++ b/src/catout.c
+@@ -999,7 +999,7 @@
+ break;
+
+ case ASCII_SKYCAT:
+- fprintf(ascfile, skycattail);
++ fprintf(ascfile, "%s", skycattail);
+ if (!prefs.pipe_flag)
+ fclose(ascfile);
+ break;
+--- a/src/xml.c
++++ b/src/xml.c
+@@ -696,7 +696,7 @@
+ name, ucd);
+ break;
+ case P_STRING:
+- sprintf(value, (char *)key[i].ptr);
++ sprintf(value, "%s", (char *)key[i].ptr);
+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\" arraysize=\"*\""
+ " ucd=\"%s\" value=\"%s\"/>\n",
+ name, ucd, *value? value: " ");
+@@ -705,13 +705,13 @@
+ n = *(key[i].nlistptr);
+ if (n)
+ {
+- sprintf(value, ((char **)key[i].ptr)[0]);
++ sprintf(value, "%s", ((char **)key[i].ptr)[0]);
+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\""
+ " arraysize=\"*\" ucd=\"%s\" value=\"%s",
+ name, ucd, *value? value: " ");
+ for (j=1; j<n; j++)
+ {
+- sprintf(value, ((char **)key[i].ptr)[j]);
++ sprintf(value, "%s", ((char **)key[i].ptr)[j]);
+ fprintf(file, ",%s", *value? value: " ");
+ }
+ fprintf(file, "\"/>\n");
+@@ -722,7 +722,7 @@
+ name, ucd);
+ break;
+ case P_KEY:
+- sprintf(value, key[i].keylist[*((int *)key[i].ptr)]);
++ sprintf(value, "%s", key[i].keylist[*((int *)key[i].ptr)]);
+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\" arraysize=\"*\""
+ " ucd=\"%s\" value=\"%s\"/>\n",
+ name, ucd, value);
+@@ -731,13 +731,13 @@
+ n = *(key[i].nlistptr);
+ if (n)
+ {
+- sprintf(value, key[i].keylist[((int *)key[i].ptr)[0]]);
++ sprintf(value, "%s", key[i].keylist[((int *)key[i].ptr)[0]]);
+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\""
+ " arraysize=\"*\" ucd=\"%s\" value=\"%s",
+ name, ucd, value);
+ for (j=1; j<n; j++)
+ {
+- sprintf(value, key[i].keylist[((int *)key[i].ptr)[j]]);
++ sprintf(value, "%s", key[i].keylist[((int *)key[i].ptr)[j]]);
+ fprintf(file, ",%s", value);
+ }
+ fprintf(file, "\"/>\n");
--git a/sci-astronomy/sextractor/files/sextractor-2.19.5-have-malloc.patch b/sci-astronomy/sextractor/files/sextractor-2.19.5-have-malloc.patch
new file mode 100644
index 0000000..dd10d4a
--- /dev/null
+++ b/sci-astronomy/sextractor/files/sextractor-2.19.5-have-malloc.patch
@@ -0,0 +1,32 @@
+Author: Justin Pryzby <justinpryzby@users.sf.net>
+Description: (guess) Define rpl_malloc if not there.
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -34,6 +34,8 @@
+ #include <time.h>
+ #include <sys/time.h>
+
++#include <sys/types.h>
++
+ #include "define.h"
+ #include "globals.h"
+
+@@ -153,3 +155,18 @@
+ }
+
+
++#if !HAVE_MALLOC
++#undef malloc
++
++// Allocate an N-byte block of memory from the heap. If N is zero,
++// allocate a 1-byte block.
++void *rpl_malloc(size_t n)
++{
++ void *malloc();
++ if (0==n) {
++ n = 1;
++ }
++
++ return malloc(n);
++}
++#endif
--git a/sci-astronomy/sextractor/files/sextractor-2.19.5-have-mmap.patch b/sci-astronomy/sextractor/files/sextractor-2.19.5-have-mmap.patch
new file mode 100644
index 0000000..1b65650
--- /dev/null
+++ b/sci-astronomy/sextractor/files/sextractor-2.19.5-have-mmap.patch
@@ -0,0 +1,55 @@
+Author: Justin Pryzby <justinpryzby@users.sf.net>
+Description: (guess) Use mmap only if it exists.
+--- a/src/fits/fitsbody.c
++++ b/src/fits/fitsbody.c
+@@ -64,9 +64,12 @@
+ ***/
+ PIXTYPE *alloc_body(tabstruct *tab, void (*func)(PIXTYPE *ptr, int npix))
+ {
++#ifdef HAVE_MMAP
+ FILE *file;
+ PIXTYPE *buffer;
+- size_t npix, size, sizeleft, spoonful;
++ size_t sizeleft, spoonful;
++#endif
++ size_t npix, size;
+
+ if (!body_ramflag)
+ {
+@@ -87,7 +90,9 @@
+ /* Decide if the data will go in physical memory or on swap-space */
+ npix = tab->tabsize/tab->bytepix;
+ size = npix*sizeof(PIXTYPE);
++#if !HAVE_MMAP
+ if (size < body_ramleft)
++#endif
+ {
+ /*-- There should be enough RAM left: try to do a malloc() */
+ if ((tab->bodybuf = malloc(size)))
+@@ -105,6 +110,7 @@
+ tab->bodybuf = NULL;
+ }
+
++#if HAVE_MMAP
+ if (size < body_vramleft)
+ {
+ /*-- Convert and copy the data to a swap file, and mmap() it */
+@@ -144,6 +150,7 @@
+ return NULL;
+ return (PIXTYPE *)tab->bodybuf;
+ }
++#endif
+
+ /* If no memory left at all: forget it! */
+ return NULL;
+@@ -270,8 +277,10 @@
+ size = (tab->tabsize/tab->bytepix)*sizeof(PIXTYPE);
+ if (tab->swapflag)
+ {
++#if HAVE_MMAP
+ if (munmap(tab->bodybuf, size))
+ warning("Can't unmap ", tab->cat->filename);
++#endif
+ tab->swapflag = 0;
+ tab->bodybuf = NULL;
+ body_vramleft += size;
--git a/sci-astronomy/sextractor/files/sextractor-2.19.5-sigbus.patch b/sci-astronomy/sextractor/files/sextractor-2.19.5-sigbus.patch
new file mode 100644
index 0000000..2796f63
--- /dev/null
+++ b/sci-astronomy/sextractor/files/sextractor-2.19.5-sigbus.patch
@@ -0,0 +1,26 @@
+Author: Justin Pryzby <justinpryzby@users.sf.net>
+Description: (guess) Handle the "sigbus" case only if it exists
+--- a/src/fits/fitscleanup.c
++++ b/src/fits/fitscleanup.c
+@@ -164,7 +164,9 @@
+ /* Catch CTRL-Cs */
+ signal(SIGINT, signal_function);
+ /* Catch bus errors */
++#ifdef SIGBUS // TODO: what if it is an enum?
+ signal(SIGBUS, signal_function);
++#endif
+ /* Catch segmentation faults */
+ signal(SIGSEGV, signal_function);
+ /* Catch floating exceptions */
+@@ -195,9 +197,11 @@
+ case SIGINT:
+ fprintf(stderr, "^C\n");
+ exit(-1);
++#ifdef SIGBUS
+ case SIGBUS:
+ fprintf(stderr, "bus error\n");
+ exit(-1);
++#endif
+ case SIGSEGV:
+ fprintf(stderr, "segmentation fault\n");
+ exit(-1);
--git a/sci-astronomy/sextractor/metadata.xml b/sci-astronomy/sextractor/metadata.xml
new file mode 100644
index 0000000..87b74a0
--- /dev/null
+++ b/sci-astronomy/sextractor/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>sci-astronomy@gentoo.org</email>
+<name>Gentoo Astronomy Project</name>
+</maintainer>
+<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
+ performs rather well on moderately crowded star fields. It has the
+ ability to automatically separate stars and galaxy using neural
+ networks.
+</longdescription>
+<use>
+<flag name="modelfit">
+ Enable profile model fitting, needs <pkg>sci-libs/atlas</pkg>
+ and <pkg>sci-libs/fftw</pkg>
+</flag>
+</use>
+</pkgmetadata>
--git a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
new file mode 100644
index 0000000..ebd8ef3
--- /dev/null
+++ b/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit 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"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="doc modelfit test threads"
+
+RDEPEND="
+ modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )"
+DEPEND="${RDEPEND}
+ modelfit? ( ${AUTOTOOLS_DEPEND} )"
+
+REQUIRED_USE="test? ( modelfit )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-format-errors.patch"
+ "${FILESDIR}/${P}-have-malloc.patch"
+ "${FILESDIR}/${P}-have-mmap.patch"
+ "${FILESDIR}/${P}-sigbus.patch"
+)
+
+src_prepare() {
+ default
+ 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
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf \
+ --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+ $(use_enable modelfit model-fitting) \
+ $(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."
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sextractor/, sci-astronomy/sextractor/files/
@ 2020-10-04 13:23 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-10-04 13:23 UTC (permalink / raw
To: gentoo-commits
commit: f168985a2c3d92aa131dea9393a9e3f29dcabdc1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 13:21:19 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 13:21:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f168985a
sci-astronomy/sextractor: Fix -fno-common
Closes: https://bugs.gentoo.org/707468
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
| 277 +++++++++++++++++++++
| 64 ++---
2 files changed, 311 insertions(+), 30 deletions(-)
--git a/sci-astronomy/sextractor/files/sextractor-2.19.5-fno-common.patch b/sci-astronomy/sextractor/files/sextractor-2.19.5-fno-common.patch
new file mode 100644
index 00000000000..1150fe366f5
--- /dev/null
+++ b/sci-astronomy/sextractor/files/sextractor-2.19.5-fno-common.patch
@@ -0,0 +1,277 @@
+--- a/src/clean.c
++++ b/src/clean.c
+@@ -44,6 +44,7 @@
+
+ /*------------------------------- variables ---------------------------------*/
+
++objliststruct *cleanobjlist;
+ static LONG *cleanvictim;
+
+
+--- a/src/clean.h
++++ b/src/clean.h
+@@ -33,7 +33,7 @@
+
+ /*------------------------------- variables ---------------------------------*/
+
+-objliststruct *cleanobjlist; /* laconic, isn't it? */
++extern objliststruct *cleanobjlist; /* laconic, isn't it? */
+
+ /*------------------------------- functions ---------------------------------*/
+
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -40,6 +40,8 @@
+ #include "extract.h"
+ #include "plist.h"
+
++PIXTYPE *dumscan;
++
+ /*------------------------- Static buffers for lutz() -----------------------*/
+
+ static infostruct *info, *store;
+--- a/src/extract.h
++++ b/src/extract.h
+@@ -37,7 +37,7 @@
+ status; /* Extraction status */
+
+ /*--------------------------------- variables -------------------------------*/
+-PIXTYPE *dumscan;
++extern PIXTYPE *dumscan;
+
+ /*------------------------------- structures --------------------------------*/
+ /* Temporary object parameters during extraction */
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -44,6 +44,8 @@
+ #include "filter.h"
+ #include "image.h"
+
++filterstruct *thefilter;
++
+ /******************************** convolve ***********************************/
+ /*
+ Convolve a scan line with an array.
+--- a/src/filter.h
++++ b/src/filter.h
+@@ -43,7 +43,7 @@
+ struct structbpann *bpann;
+ } filterstruct;
+
+-filterstruct *thefilter;
++extern filterstruct *thefilter;
+
+ /*------------------------------- functions ---------------------------------*/
+ void convolve(picstruct *, PIXTYPE *, int y),
+--- a/src/fits/fitscat.c
++++ b/src/fits/fitscat.c
+@@ -42,6 +42,10 @@
+ #include "fitscat_defs.h"
+ #include "fitscat.h"
+
++float ctg[37], stg[37];
++char gstr[MAXCHAR];
++int bswapflag;
++
+ /****** about_cat **************************************************************
+ PROTO int about_cat(catstruct *cat, FILE *stream)
+ PURPOSE Print some info about a catalog.
+--- a/src/fits/fitscat_defs.h
++++ b/src/fits/fitscat_defs.h
+@@ -86,7 +86,7 @@
+ typedef int LONG; /* for DEC-Alpha... */
+
+ /*----------------------------- Internal constants --------------------------*/
+-char gstr[MAXCHAR];
++extern char gstr[MAXCHAR];
+
+ /*----------------------------- External constants --------------------------*/
+
+--- a/src/fits/fitscat.h
++++ b/src/fits/fitscat.h
+@@ -333,6 +333,6 @@
+ warning(char *msg1, char *msg2);
+
+
+-int bswapflag;
++extern int bswapflag;
+
+ #endif
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -30,13 +30,13 @@
+
+ /*----------------------- miscellaneous variables ---------------------------*/
+
+-sexcatstruct thecat;
+-picstruct thefield1,thefield2, thewfield1,thewfield2;
+-objstruct flagobj;
+-obj2struct flagobj2;
++extern sexcatstruct thecat;
++extern picstruct thefield1,thefield2, thewfield1,thewfield2;
++extern objstruct flagobj;
++extern obj2struct flagobj2;
+ extern obj2struct outobj2;
+-float ctg[37], stg[37];
+-char gstr[MAXCHAR];
++extern float ctg[37], stg[37];
++extern char gstr[MAXCHAR];
+
+ /*------------------------------- functions ---------------------------------*/
+ extern void alloccatparams(void),
+--- a/src/plist.c
++++ b/src/plist.c
+@@ -38,6 +38,11 @@
+ #include "prefs.h"
+ #include "plist.h"
+
++int plistexist_value, plistexist_dvalue, plistexist_cdvalue,
++ plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
++ plistoff_value, plistoff_dvalue, plistoff_cdvalue,
++ plistoff_flag[MAXFLAG], plistoff_wflag, plistoff_dthresh, plistoff_var,
++ plistsize;
+
+ /******************************** createblank *******************************
+ PROTO int createblank(int no, objliststruct *objlist)
+--- a/src/plist.h
++++ b/src/plist.h
+@@ -47,7 +47,7 @@
+
+ /*-------------------------------- globals ----------------------------------*/
+
+-int plistexist_value, plistexist_dvalue, plistexist_cdvalue,
++extern int plistexist_value, plistexist_dvalue, plistexist_cdvalue,
+ plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
+ plistoff_value, plistoff_dvalue, plistoff_cdvalue,
+ plistoff_flag[MAXFLAG], plistoff_wflag, plistoff_dthresh, plistoff_var,
+--- a/src/preflist.h
++++ b/src/preflist.h
+@@ -39,7 +39,7 @@
+ #endif
+
+ /*-------------------------------- initialization ---------------------------*/
+- int idummy;
++extern int idummy;
+
+ pkeystruct key[] =
+ {
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -56,6 +56,9 @@
+ #include "preflist.h"
+ #include "fits/fitscat.h"
+
++prefstruct prefs;
++double ddummy;
++int idummy;
+
+ /********************************* dumpprefs ********************************/
+ /*
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -249,7 +249,7 @@
+ int nthreads; /* Number of active threads */
+ } prefstruct;
+
+- prefstruct prefs;
++extern prefstruct prefs;
+
+ /*-------------------------------- protos -----------------------------------*/
+ extern int cistrcmp(char *cs, char *ct, int mode);
+--- a/src/psf.c
++++ b/src/psf.c
+@@ -47,6 +47,9 @@
+
+ /*------------------------------- variables ---------------------------------*/
+
++psfstruct *psf,*thedpsf,*thepsf;
++psfitstruct *thepsfit,*thedpsfit;
++PIXTYPE *checkmask;
+
+ extern keystruct objkey[];
+ extern objstruct outobj;
+--- a/src/psf.h
++++ b/src/psf.h
+@@ -102,9 +102,9 @@
+ } psfitstruct;
+
+ /*----------------------------- Global variables ----------------------------*/
+-psfstruct *psf,*thedpsf,*thepsf;
+-psfitstruct *thepsfit,*thedpsfit;
+-PIXTYPE *checkmask;
++extern psfstruct *psf,*thedpsf,*thepsf;
++extern psfitstruct *thepsfit,*thedpsfit;
++extern PIXTYPE *checkmask;
+
+ /*-------------------------------- functions --------------------------------*/
+ extern void compute_pos(int *pnpsf,int *pconvflag,int *pnpsfflag,
+--- a/src/retina.c
++++ b/src/retina.c
+@@ -42,6 +42,7 @@
+ #include "image.h"
+ #include "retina.h"
+
++retistruct *theretina;
+
+ /******************************** readretina *********************************/
+ /*
+--- a/src/retina.h
++++ b/src/retina.h
+@@ -38,7 +38,7 @@
+ struct structbpann *bpann; /* The neural network */
+ } retistruct;
+
+-retistruct *theretina;
++extern retistruct *theretina;
+
+ /*------------------------------- functions ---------------------------------*/
+
+--- a/src/sexhead1.h
++++ b/src/sexhead1.h
+@@ -26,8 +26,8 @@
+ *
+ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+-int idummy;
+-double ddummy;
++extern int idummy;
++extern double ddummy;
+
+ keystruct headkey1[] = {
+ {"EPOCH ", "",
+--- a/src/som.c
++++ b/src/som.c
+@@ -41,6 +41,8 @@
+ #include "prefs.h"
+ #include "som.h"
+
++somstruct *thesom;
++
+ /********************************* som_phot **********************************/
+ /*
+ Perform SOM-fitting on a detected source: returns node number of the
+--- a/src/som.h
++++ b/src/som.h
+@@ -70,7 +70,7 @@
+ float stderror; /* Global reduced error */
+ } somstruct;
+
+-somstruct *thesom;
++extern somstruct *thesom;
+
+ /*---------------------------------- protos --------------------------------*/
+
+--- a/src/xml.c
++++ b/src/xml.c
+@@ -50,6 +50,11 @@
+ xmlstruct *xmlstack = NULL;
+ int nxml=0, nxmlmax=0;
+
++sexcatstruct thecat;
++picstruct thefield1,thefield2, thewfield1,thewfield2;
++objstruct flagobj;
++obj2struct flagobj2;
++
+ /****** init_xml ************************************************************
+ PROTO int init_xml(void)
+ PURPOSE Initialize a set of meta-data kept in memory before being written to the
--git a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
index 834a57a2649..784c9d8c33f 100644
--- a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
AUTOTOOLS_AUTO_DEPEND=no
@@ -10,65 +10,69 @@ inherit 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"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-3"
SLOT="0"
-
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc modelfit test threads"
+REQUIRED_USE="test? ( modelfit )"
RESTRICT="!test? ( test )"
RDEPEND="
!games-misc/sex
- modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )"
+ modelfit? (
+ sci-libs/atlas[lapack,threads=]
+ sci-libs/fftw:3.0=
+ )"
DEPEND="${RDEPEND}
modelfit? ( ${AUTOTOOLS_DEPEND} )"
-REQUIRED_USE="test? ( modelfit )"
-
PATCHES=(
- "${FILESDIR}/${P}-fix-format-errors.patch"
- "${FILESDIR}/${P}-have-malloc.patch"
- "${FILESDIR}/${P}-have-mmap.patch"
- "${FILESDIR}/${P}-sigbus.patch"
+ "${FILESDIR}"/${P}-fix-format-errors.patch
+ "${FILESDIR}"/${P}-have-malloc.patch
+ "${FILESDIR}"/${P}-have-mmap.patch
+ "${FILESDIR}"/${P}-sigbus.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
default
+
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
- eautoreconf
+ local mycblas=atlcblas
+ local 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
+ eautoreconf
fi
}
src_configure() {
econf \
- --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+ --with-atlas-incdir="${EPREFIX}"/usr/include/atlas \
$(use_enable modelfit model-fitting) \
$(use_enable threads)
}
src_install() {
default
- CONFDIR=/usr/share/sextractor
- insinto ${CONFDIR}
- doins config/*
- use doc && dodoc doc/*
+
+ insinto /usr/share/sextractor
+ doins -r config/.
+ use doc && dodoc -r doc/.
}
pkg_postinst() {
elog "SExtractor examples configuration files are located in"
- elog "${EROOT%/}/${CONFDIR} and are not loaded anymore by default."
+ elog "${EROOT}/usr/share/sextractor and are not loaded anymore by default."
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-04 13:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-04 13:23 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sextractor/, sci-astronomy/sextractor/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2016-03-07 20:06 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox