From 80af1e25462e8f08484b82b17d9e67ac5a9c4712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Fabbro?= Date: Thu, 17 Nov 2016 00:33:05 +0000 Subject: sci-astronomy/astrometry: fixed a few issues and cleanup * missing slashes in configuration (bug #595024) * QA implicit declarations (bug #595162) * download page and upstream release metadata * remove extra USE flag, it needs graphics in all cases (bug #595160) Package-Manager: portage-2.3.2 --- sci-astronomy/astrometry/astrometry-0.67-r1.ebuild | 107 --------------------- sci-astronomy/astrometry/astrometry-0.67-r2.ebuild | 107 +++++++++++++++++++++ .../astrometry/files/astrometry-0.67-qsortr.patch | 10 ++ sci-astronomy/astrometry/metadata.xml | 6 +- 4 files changed, 120 insertions(+), 110 deletions(-) delete mode 100644 sci-astronomy/astrometry/astrometry-0.67-r1.ebuild create mode 100644 sci-astronomy/astrometry/astrometry-0.67-r2.ebuild create mode 100644 sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch (limited to 'sci-astronomy') diff --git a/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild b/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild deleted file mode 100644 index f46ffd0dfcef..000000000000 --- a/sci-astronomy/astrometry/astrometry-0.67-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils toolchain-funcs python-single-r1 - -MYP=${PN}.net-${PV} - -DESCRIPTION="Automated astrometric calibration programs and service" -HOMEPAGE="http://astrometry.net/" -SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.gz" - -LICENSE="BSD GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples extra" - -RDEPEND=" - dev-python/astropy[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - sci-astronomy/wcslib:0= - sci-libs/cfitsio:0= - sci-libs/gsl:0= - sys-libs/zlib:0= - extra? ( - media-libs/libpng:0 - media-libs/netpbm - virtual/jpeg:0 - x11-libs/cairo )" -DEPEND="${RDEPEND} - dev-lang/swig:0 - virtual/pkgconfig" - -S="${WORKDIR}/${MYP}" - -PATCHES=( - "${FILESDIR}/${P}-soname.patch" - "${FILESDIR}/${P}-dynlink.patch" -) - -src_prepare() { - default - # fix python scripts - python_fix_shebang "${S}" - sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i util/Makefile || die - sed -e "s|python setup.py|${EPYTHON} setup.py|" -i {libkd,sdss,blind}/Makefile || die - sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die - sed -e "s|python < /dev/null - ./test || die "failed tests in ${d}" - popd ${d} > /dev/null - done -} - -ap_make() { - emake \ - INSTALL_DIR="${ED}usr" \ - DATA_INSTALL_DIR="${ED}usr/share/astrometry" \ - LIB_INSTALL_DIR="${ED}usr/$(get_libdir)" \ - ETC_INSTALL_DIR="${ED}etc" \ - MAN1_INSTALL_DIR="${ED}usr/share/man/man1" \ - DOC_INSTALL_DIR="${ED}usr/share/doc/${PF}" \ - EXAMPLE_INSTALL_DIR="${ED}usr/share/doc/${PF}/examples" \ - PY_BASE_INSTALL_DIR="${ED}$(python_get_sitedir)/astrometry" \ - PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \ - FINAL_DIR="${EPREFIX}usr" \ - DATA_FINAL_DIR="${EPREFIX}usr/share/astrometry" \ - $@ -} - -src_install() { - ap_make install-core - ap_make -C util install - use extra && ap_make -C blind install-extra - - # remove cfitsio duplicates and non installable libraries - rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die - rm "${ED}"/usr/$(get_libdir)/lib*.a || die - - # remove license file - rm "${ED}"/usr/share/doc/${PF}/LICENSE || die - use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples -} diff --git a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild new file mode 100644 index 000000000000..d3149dc959a5 --- /dev/null +++ b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils toolchain-funcs python-single-r1 + +MYP=${PN}.net-${PV} + +DESCRIPTION="Automated astrometric calibration programs and service" +HOMEPAGE="http://astrometry.net/" +SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz" + +LICENSE="BSD GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="examples" + +RDEPEND=" + dev-python/astropy[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + media-libs/libpng:0 + media-libs/netpbm + sci-astronomy/wcslib:0= + sci-libs/cfitsio:0= + sci-libs/gsl:0= + sys-libs/zlib:0= + virtual/jpeg:0 + x11-libs/cairo" +DEPEND="${RDEPEND} + dev-lang/swig:0 + virtual/pkgconfig" + +S="${WORKDIR}/${MYP}" + +PATCHES=( + "${FILESDIR}"/${P}-soname.patch + "${FILESDIR}"/${P}-dynlink.patch + "${FILESDIR}"/${P}-qsortr.patch +) + +src_prepare() { + default + # fix python scripts + python_fix_shebang "${S}" + sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i util/Makefile || die + sed -e "s|python setup.py|${EPYTHON} setup.py|" -i {libkd,sdss,blind}/Makefile || die + sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die + sed -e "s|python < /dev/null + ./test || die "failed tests in ${d}" + popd ${d} > /dev/null + done +} + +ap_make() { + emake \ + INSTALL_DIR="${ED%/}/usr" \ + DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \ + LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \ + ETC_INSTALL_DIR="${ED%/}/etc" \ + MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \ + DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \ + EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \ + PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \ + PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \ + FINAL_DIR="${EPREFIX%/}/usr" \ + DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \ + $@ +} + +src_install() { + ap_make install-core + ap_make -C util install + ap_make -C blind install-extra + + # remove duplicates and non installable libraries + rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die + rm "${ED}"/usr/$(get_libdir)/lib*.a || die + rm "${ED}"/usr/share/doc/${PF}/LICENSE || die + + use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples +} diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch b/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch new file mode 100644 index 000000000000..6a7868884eaa --- /dev/null +++ b/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch @@ -0,0 +1,10 @@ +--- a/util/test_qsort_r.c 2016-11-17 00:21:29.211561563 +0000 ++++ b/util/test_qsort_r.c 2016-11-17 00:21:43.281493095 +0000 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "cutest.h" + diff --git a/sci-astronomy/astrometry/metadata.xml b/sci-astronomy/astrometry/metadata.xml index a08f005b1f63..2e748354d4f7 100644 --- a/sci-astronomy/astrometry/metadata.xml +++ b/sci-astronomy/astrometry/metadata.xml @@ -12,7 +12,7 @@ calibration meta-data, plus lists of known objects falling inside the field of view. - - Add extra tools for astrometry.net, specifically for plots - + + dstndstn/astrometry.net + -- cgit v1.2.3