commit: 8d9d0ff89910ae6e6caccdcf93245cddf3e9219a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 16:32:14 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 16:32:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9d0ff8
sci-astronomy/astrometry: remove last-rited pkg
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sci-astronomy/astrometry/Manifest | 3 -
sci-astronomy/astrometry/astrometry-0.67-r2.ebuild | 108 -------------------
sci-astronomy/astrometry/astrometry-0.70.ebuild | 108 -------------------
sci-astronomy/astrometry/astrometry-0.72.ebuild | 115 ---------------------
.../astrometry/files/astrometry-0.67-dynlink.patch | 78 --------------
.../astrometry/files/astrometry-0.67-qsortr.patch | 10 --
.../astrometry/files/astrometry-0.67-soname.patch | 25 -----
.../astrometry/files/astrometry-0.72-dynlink.patch | 92 -----------------
sci-astronomy/astrometry/metadata.xml | 18 ----
9 files changed, 557 deletions(-)
diff --git a/sci-astronomy/astrometry/Manifest
b/sci-astronomy/astrometry/Manifest
deleted file mode 100644
index 2c1665c77d8..00000000000
--- a/sci-astronomy/astrometry/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astrometry.net-0.67.tar.gz 10941863 BLAKE2B
16c88e9040d2cecec831fd4775f8b5a3b8e10223e2f17b185f92fe222ab1f4cbea8ec5fae9af661cc069987e7cddcfee9e1bdd88a77ffce8db8fb66afad124ba
SHA512
f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
-DIST astrometry.net-0.70.tar.gz 11195158 BLAKE2B
f0de1cd592873194199810e095d81559754f73bf433cbf803c63c1d4b81db15722c61e3d5ee3798f8f3e5d9b4f67e87ab2e38edaac8639665ec5a9348337fb0e
SHA512
27e1dd27d69427bdff46613723423048959e447662126d25c8b2fbab571d09b834e4085e5a4a9a9f6e8122ff0868a1762a335086de8f674f49fdbc7374299409
-DIST astrometry.net-0.72.tar.gz 11339766 BLAKE2B
91dfe1e49c21a7d0a6b1a39c32d3f50ceafd2d1aa9b75c151d71faef4511164292546013a103d277f127e0391310f40521e6ec9bf83660734cb60c8ed415b3fd
SHA512
6fa63ea1075b267ebbe0a5aea4c66679b552350b206f098fb64f69f0e13fb9f8cf9c12e3fbc18942a444165cfd68251201dee9e18d6ebb01a2f16899675c70ff
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
deleted file mode 100644
index 75a92d3581f..00000000000
--- a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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
- ${PYTHON_DEPS}"
-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 <<EOF|${EPYTHON} <<EOF|" -i util/simplexy.c || die
- sed -e "s|python -V|${EPYTHON} -V|" -i Makefile || die
- # respect use compilation flags
- sed -e '/-O3/d' -e '/-fomit-frame-pointer/d' -i util/makefile.common ||
die
- # as-needed
- sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" -i
util/Makefile || die
- export SYSTEM_GSL=yes
-}
-
-src_compile() {
- tc-export CC RANLIB AR
- # fragile makefiles, build targets sequentially
- emake
- emake py
- emake extra
- emake report.txt
-}
-
-src_test() {
- emake test
- local d
- for d in util blind libkd; do
- pushd ${d} > /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="${D}/$(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/astrometry-0.70.ebuild
b/sci-astronomy/astrometry/astrometry-0.70.ebuild
deleted file mode 100644
index d17b0d7aaf9..00000000000
--- a/sci-astronomy/astrometry/astrometry-0.70.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- dev-lang/swig:0
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.67-soname.patch
- "${FILESDIR}"/${PN}-0.67-dynlink.patch
- "${FILESDIR}"/${PN}-0.67-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 <<EOF|${EPYTHON} <<EOF|" -i util/simplexy.c || die
- sed -e "s|python -V|${EPYTHON} -V|" -i Makefile || die
- # respect use compilation flags
- sed -e '/-O3/d' -e '/-fomit-frame-pointer/d' -i util/makefile.common ||
die
- # as-needed
- sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" -i
util/Makefile || die
- export SYSTEM_GSL=yes
-}
-
-src_compile() {
- tc-export CC RANLIB AR
- # fragile makefiles, build targets sequentially
- emake
- emake py
- emake extra
- emake report.txt
-}
-
-src_test() {
- emake test
- local d
- for d in util blind libkd; do
- pushd ${d} > /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="${D}/$(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/astrometry-0.72.ebuild
b/sci-astronomy/astrometry/astrometry-0.72.ebuild
deleted file mode 100644
index b0fe8ea5b2a..00000000000
--- a/sci-astronomy/astrometry/astrometry-0.72.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# this could be a multiple python package
-# but the way it is packaged makes it very time consuming.
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-python/astropy[${PYTHON_USEDEP}]
- dev-python/fitsio[${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
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- dev-lang/swig:0
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.67-soname.patch
- "${FILESDIR}"/${PN}-0.67-qsortr.patch
-)
-# "${FILESDIR}"/${PN}-0.72-dynlink.patch
-
-src_prepare() {
- default
- # respect user compilation flags
- sed -e '/-O3/d' \
- -e '/-fomit-frame-pointer/d' \
- -i util/makefile.common || die
- # fix underlinking
- sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" \
- -i util/Makefile || die
- export SYSTEM_GSL=yes
-}
-
-src_compile() {
- tc-export CC RANLIB AR
- # fragile makefiles, build targets sequentially
- emake
- emake py
- emake extra
- emake report.txt
-}
-
-src_test() {
- emake test
- local d
- for d in util blind libkd; do
- pushd ${d} > /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="${D}/$(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
- # cfitsio
- rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die
- # cfitsio utilities
- rm
"${ED}"/usr/bin/{fitsverify,imarith,imstat,liststruc,modhead,tablist,tabmerge}
|| die
- rm "${ED}"/usr/$(get_libdir)/lib*.a || die
- rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r "${ED}"/usr/share/doc/${PF}/examples || die
- fi
-}
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
b/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
deleted file mode 100644
index 64b87c033ca..00000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Author: Ole Streicher <oleb...@debian.org>
-Description: Dynamically link to libastrometry.so, when possible
---- a/blind/Makefile
-+++ b/blind/Makefile
-@@ -43,9 +43,7 @@
- LDLIBS := $(LDLIBS_DEF)
- LDLIBS += $(ANFILES_LIB)
-
--SLIB := $(ENGINE_LIB)
--SLIB += $(CATS_SLIB)
--SLIB += $(ANFILES_SLIB)
-+SLIB := $(ENGINE_SO)
-
- CAIRO_SLIB := $(COMMON)/cairoutils.o
- CAIRO_SLIB += $(SLIB)
-@@ -131,7 +129,7 @@
- resort-xylist.o
-
- BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree2.o hpquads.o \
-- quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \
-+ quad-builder.o codefile.o codetree.o unpermute-stars.o \
- unpermute-quads.o merge-index.o
- ENGINE_OBJS += $(BUILD_INDEX_OBJS)
-
-@@ -147,8 +145,8 @@
- $(AR) rc $@ $(ENGINE_OBJS)
- $(RANLIB) $@
-
--$(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
-- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS)
-+$(ENGINE_SO): $(ENGINE_LIB) $(CATS_SLIB) $(ANFILES_SLIB)
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0
-Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDLIBS) -lpthread
- ln -s $@.0 $@
-
- # old and miscellaneous executables that aren't part of the pipeline.
---- a/util/Makefile
-+++ b/util/Makefile
-@@ -86,8 +86,7 @@
-
- LDFLAGS += $(LDFLAGS_DEF)
-
--LDLIBS := $(LDLIBS_DEF)
--LDLIBS += $(ANFILES_LIB)
-+LDLIBS := $(LDLIBS_DEF) -lm
-
- SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
-
-@@ -122,8 +121,7 @@
- ANUTILS_H_PATH := $(addprefix $(INCLUDE_DIR)/,$(ANUTILS_H))
-
- ifndef NO_QFITS
--ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \
-- tic.o
-+ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o
- ANUTILS_DEPS += $(QFITS_LIB)
- endif
-
-@@ -164,7 +162,7 @@
- ALL_OBJ += wcs-pv2sip.o
-
- _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB)
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
- INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \
- python setup.py build_ext -v --inplace --build-temp .
- util.py: util.i lanczos.i
---- a/libkd/Makefile
-+++ b/libkd/Makefile
-@@ -90,8 +90,7 @@
- PYSPHEREMATCH_OBJ := pyspherematch.o
-
- spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
-- SLIB="$(SLIB)" \
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
- INC="$(INC)" \
- CFLAGS="$(CFLAGS)" \
- python setup.py build_ext --inplace --force --build-temp .
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch
b/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch
deleted file mode 100644
index 6a7868884ea..00000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <stdlib.h>
-
- #include "cutest.h"
-
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch
b/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch
deleted file mode 100644
index 595dd79a2f4..00000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Ole Streicher <oleb...@debian.org>
-Description: Add SONAME to libastrometry.so
---- a/blind/Makefile
-+++ b/blind/Makefile
-@@ -148,7 +148,8 @@
- $(RANLIB) $@
-
- $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
-- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -o $@ $^ $(LDLIBS)
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS)
-+ ln -s $@.0 $@
-
- # old and miscellaneous executables that aren't part of the pipeline.
- OLDEXECS := plotquads rawstartree checkquads
-@@ -233,8 +234,8 @@
- done
- mkdir -p '$(LIB_INSTALL_DIR)'
- @for x in $(INSTALL_LIB); do \
-- echo cp $$x '$(LIB_INSTALL_DIR)'; \
-- cp $$x '$(LIB_INSTALL_DIR)'; \
-+ echo cp -d $$x* '$(LIB_INSTALL_DIR)'; \
-+ cp -d $$x* '$(LIB_INSTALL_DIR)'; \
- done
- mkdir -p '$(PY_INSTALL_DIR)'
- @for x in $(PYTHON_INSTALL); do \
diff --git a/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch
b/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch
deleted file mode 100644
index 371a2129bd5..00000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Ole Streicher <oleb...@debian.org>
-Date: Thu, 1 Dec 2016 21:18:56 +0100
-Subject: Dynamically link to libastrometry.so, when possible
-
----
- blind/Makefile | 10 ++++------
- libkd/Makefile | 3 +--
- util/Makefile | 8 +++-----
- 3 files changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/blind/Makefile b/blind/Makefile
-index 33895df..6e7c55c 100644
---- a/blind/Makefile
-+++ b/blind/Makefile
-@@ -43,9 +43,7 @@ LDFLAGS := $(LDFLAGS_DEF)
- LDLIBS := $(LDLIBS_DEF)
- LDLIBS += $(ANFILES_LIB)
-
--SLIB := $(ENGINE_LIB)
--SLIB += $(CATS_SLIB)
--SLIB += $(ANFILES_SLIB)
-+SLIB := $(ENGINE_SO)
-
- CAIRO_SLIB := $(COMMON)/cairoutils.o
- CAIRO_SLIB += $(SLIB)
-@@ -131,7 +129,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
- resort-xylist.o
-
- BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree2.o hpquads.o \
-- quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \
-+ quad-builder.o codefile.o codetree.o unpermute-stars.o \
- unpermute-quads.o merge-index.o
- ENGINE_OBJS += $(BUILD_INDEX_OBJS)
-
-@@ -147,8 +145,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
- $(AR) rc $@ $(ENGINE_OBJS)
- $(RANLIB) $@
-
--$(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
-- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS)
-+$(ENGINE_SO): $(ENGINE_LIB) $(CATS_SLIB) $(ANFILES_SLIB)
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0
-Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDLIBS) -lpthread
- ln -s $@.0 $@
-
- # old and miscellaneous executables that aren't part of the pipeline.
-diff --git a/libkd/Makefile b/libkd/Makefile
-index f535986..0442518 100644
---- a/libkd/Makefile
-+++ b/libkd/Makefile
-@@ -90,8 +90,7 @@ py: pyspherematch
- PYSPHEREMATCH_OBJ := pyspherematch.o
-
- spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
-- SLIB="$(SLIB)" \
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
- INC="$(INC)" \
- CFLAGS="$(CFLAGS)" \
- $(PYTHON) setup.py build_ext --inplace --force --build-temp .
-diff --git a/util/Makefile b/util/Makefile
-index f88df1b..0ecf716 100644
---- a/util/Makefile
-+++ b/util/Makefile
-@@ -86,8 +86,7 @@ CFLAGS += -I.
-
- LDFLAGS += $(LDFLAGS_DEF)
-
--LDLIBS := $(LDLIBS_DEF)
--LDLIBS += $(ANFILES_LIB)
-+LDLIBS := $(LDLIBS_DEF) -lm
-
- SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
-
-@@ -122,8 +121,7 @@ ANUTILS_H := an-bool.h an-endian.h an-opts.h
an-thread-pthreads.h \
- ANUTILS_H_PATH := $(addprefix $(INCLUDE_DIR)/,$(ANUTILS_H))
-
- ifndef NO_QFITS
--ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \
-- tic.o
-+ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o
- ANUTILS_DEPS += $(QFITS_LIB)
- endif
-
-@@ -164,7 +162,7 @@ wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB)
- ALL_OBJ += wcs-pv2sip.o
-
- _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB)
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
- INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \
- $(PYTHON) setup.py build_ext -v --inplace --build-temp .
- util.py: util.i lanczos.i
diff --git a/sci-astronomy/astrometry/metadata.xml
b/sci-astronomy/astrometry/metadata.xml
deleted file mode 100644
index 2e748354d4f..00000000000
--- a/sci-astronomy/astrometry/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-astron...@gentoo.org</email>
- <name>Gentoo Astronomy Project</name>
- </maintainer>
- <longdescription lang="en">
- If you have astronomical imaging of the sky with celestial
- coordinates you do not know—or do not trust—then Astrometry.net is
- for you. Input an image and we'll give you back astrometric
- calibration meta-data, plus lists of known objects falling inside
- the field of view.
-</longdescription>
-<upstream>
- <remote-id type="github">dstndstn/astrometry.net</remote-id>
-</upstream>
-</pkgmetadata>
