From a51122da68d85be0774250aa8622f0fdebf208e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ctibor=20Bran=C4=8D=C3=ADk?= Date: Thu, 3 Nov 2016 22:55:26 +0100 Subject: Removing sci-astronomy/astrometry. Version in Portage is more up-to-date. --- sci-astronomy/astrometry/Manifest | 1 - sci-astronomy/astrometry/astrometry-0.64.ebuild | 92 ---------------------- .../astrometry/files/0.64-as-needed.patch | 87 -------------------- .../astrometry/files/0.64-respect-user-flags.patch | 12 --- sci-astronomy/astrometry/metadata.xml | 15 ---- 5 files changed, 207 deletions(-) delete mode 100644 sci-astronomy/astrometry/Manifest delete mode 100644 sci-astronomy/astrometry/astrometry-0.64.ebuild delete mode 100644 sci-astronomy/astrometry/files/0.64-as-needed.patch delete mode 100644 sci-astronomy/astrometry/files/0.64-respect-user-flags.patch delete mode 100644 sci-astronomy/astrometry/metadata.xml (limited to 'sci-astronomy') diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest deleted file mode 100644 index 8f93369..0000000 --- a/sci-astronomy/astrometry/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST astrometry.net-0.64.tar.gz 10933852 SHA256 4b9b8e9d7133a7bcc1f85298cf5762699dce70548be0cb91165286fc6677136d SHA512 b9c42c84020f970c4bfb503486adfdafe679d1cf7bec6f1ada8416de4c951e316a0cdb07501642259a02c7d3feefba3819551482888ff9891fb47dee6febd304 WHIRLPOOL 3f3879b91b9878b67ca3b414d086f0c025c10fddfd838dbcf719374ab5ec87e1d9291ca122e0d6c5bf339e52a30e1ac1bc56e98da46016b889d4be90d5deb073 diff --git a/sci-astronomy/astrometry/astrometry-0.64.ebuild b/sci-astronomy/astrometry/astrometry-0.64.ebuild deleted file mode 100644 index 72a45aa..0000000 --- a/sci-astronomy/astrometry/astrometry-0.64.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $id$ - -EAPI=5 - -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="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples extra python" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - sci-astronomy/wcslib - sci-libs/cfitsio - sci-libs/gsl - sys-libs/zlib - virtual/pyfits[${PYTHON_USEDEP}] - 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}" - -src_prepare() { - epatch "${FILESDIR}"/0.64-as-needed.patch - epatch "${FILESDIR}"/0.64-respect-user-flags.patch - python_fix_shebang "${S}" - sed "s|python setup-util.py|${EPYTHON} setup-util.py|" "${S}"/util/Makefile -i || die - sed "s|python setup.py|${EPYTHON} setup.py|" "${S}"/{libkd,sdss,blind}/Makefile -i || die - sed "s|python -c|${EPYTHON} -c|" "${S}"/blind/Makefile -i || die - sed "s|python -V|${EPYTHON} -V|" "${S}"/Makefile -i || die -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - RANLIB=$(tc-getRANLIB) \ - AR=$(tc-getAR) \ - all report.txt - if use extra; then - emake \ - CC=$(tc-getCC) \ - RANLIB=$(tc-getRANLIB) \ - AR=$(tc-getAR) \ - extra - fi - - if use python; then - emake \ - CC=$(tc-getCC) \ - RANLIB=$(tc-getRANLIB) \ - AR=$(tc-getAR) \ - py - fi -} - -src_install() { - export INSTALL_DIR="${ED}"/usr - export DATA_INSTALL_DIR="${INSTALL_DIR}"/share/"${PN}"/data - export BIN_INSTALL_DIR="${INSTALL_DIR}"/bin - export INCLUDE_INSTALL_DIR="${INSTALL_DIR}"/include/"${PN}" - export LIB_INSTALL_DIR="${INSTALL_DIR}"/lib - python_export python2.7 - export PY_BASE_INSTALL_DIR="${LIB_INSTALL_DIR}"/"${EPYTHON}"/"${PN}" - export PY_BASE_LINK_DIR=../lib/"${EPYTHON}"/"${PN}" - export ETC_INSTALL_DIR="${INSTALL_DIR}"/share/"${PN}"/etc - export DOC_INSTALL_DIR="${INSTALL_DIR}"/share/doc/"${PF}" - export UPS_INSTALL_DIR="${DOC_INSTALL_DIR}"/ups - export EXAMPLES_INSTALL_DIR="${DOC_INSTALL_DIR}"/examples - - emake install-core - use extra && emake -C blind install-extra - - # remove cfitsio duplicates - rm ${INSTALL_DIR}/bin/{fitscopy,imcopy,listhead} || die -} diff --git a/sci-astronomy/astrometry/files/0.64-as-needed.patch b/sci-astronomy/astrometry/files/0.64-as-needed.patch deleted file mode 100644 index 5352939..0000000 --- a/sci-astronomy/astrometry/files/0.64-as-needed.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -uN util/Makefile util.new/Makefile ---- util/Makefile 2015-12-03 19:56:28.689770871 +0100 -+++ util.new/Makefile 2015-12-03 20:03:54.439977807 +0100 -@@ -156,7 +156,7 @@ - DEP_OBJ += $(addsuffix .o,$(PROGS)) - - an-pnmtofits: an-pnmtofits.o $(ANFILES_SLIB) -- $(CC) -o $@ $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -+ $(CC) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@ - ALL_OBJ += an-pnmtofits.o - - wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB) -@@ -253,32 +253,32 @@ - @echo - @echo "Testing canonicalize_file_name..." - @echo "Testing canonicalize_file_name..." >> os-features.log -- (($(CC) -o os-features-test-canonicalize \ -- $(CPPFLAGS) $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \ -+ (($(CC) $(LDFLAGS) \ -+ $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \ - ./os-features-test-canonicalize >> os-features.log && \ - echo "#define NEED_CANONICALIZE_FILE_NAME 0") \ - || echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp - @echo - @echo "Testing declare qsort_r..." - @echo "Testing declare qsort_r..." >> os-features.log -- (($(CC) -o os-features-test-declare-qsort \ -- $(CPPFLAGS) $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ -+ (($(CC) $(LDFLAGS) \ -+ $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \ - ./os-features-test-declare-qsort >> os-features.log && \ - echo "#define NEED_DECLARE_QSORT_R 1") \ - || echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp - @echo - @echo "Testing qsort_r..." - @echo "Testing qsort_r..." >> os-features.log -- (($(CC) -o os-features-test-qsort \ -- $(CPPFLAGS) $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ -+ (($(CC) $(LDFLAGS) \ -+ $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \ - ./os-features-test-qsort >> os-features.log && \ - echo "#define NEED_QSORT_R 0") \ - || echo "#define NEED_QSORT_R 1") >> $@.tmp - @echo - @echo "Testing swap qsort_r..." - @echo "Testing swap qsort_r..." >> os-features.log -- (($(CC) -Werror -o os-features-test-swap-qsort \ -- $(CPPFLAGS) $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ -+ (($(CC) $(LDFLAGS) -Werror \ -+ $(CFLAGS) -DTEST_SWAP_QSORT_R $^ -o os-features-test-swap-qsort >> os-features.log && \ - ./os-features-test-swap-qsort >> os-features.log && \ - echo "#define NEED_SWAP_QSORT_R 0") \ - || echo "#define NEED_SWAP_QSORT_R 1") >> $@.tmp -@@ -287,8 +287,8 @@ - @echo " NETPBM_INC is $(NETPBM_INC_ORIG)" - @echo " NETPBM_LIB is $(NETPBM_LIB_ORIG)" - @echo "Testing netpbm..." >> os-features.log -- (($(CC) -o os-features-test-netpbm \ -- $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \ -+ (($(CC) $(LDFLAGS) \ -+ $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm $(NETPBM_LIB_ORIG) >> os-features.log && \ - ./os-features-test-netpbm >> os-features.log && \ - echo "#define HAVE_NETPBM 1") \ - || echo "#define HAVE_NETPBM 0") >> $@.tmp -@@ -314,8 +314,8 @@ - @echo " NETPBM_LIB_ORIG is $(NETPBM_LIB_ORIG)" - ( \ - echo "# This file is generated by util/Makefile."; \ -- (($(CC) -o os-features-test-netpbm-make \ -- $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \ -+ (($(CC) $(LDFLAGS) \ -+ $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm-make $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \ - ./os-features-test-netpbm-make >> os-features-makefile.log && \ - echo "HAVE_NETPBM := yes") \ - || (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \ -diff -uN util/makefile.tests util.new/makefile.tests ---- util/makefile.tests 2015-12-03 19:56:28.689770871 +0100 -+++ util.new/makefile.tests 2015-12-03 20:04:49.151881458 +0100 -@@ -37,7 +37,7 @@ - $(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@ - - test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS) -- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -o $@ - - $(ALL_TEST_FILES_O) $(ALL_TEST_FILES_MAIN_O) test.o: %.o: %.c - $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) -c $< -I$(COMMON) diff --git a/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch b/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch deleted file mode 100644 index ab55cbb..0000000 --- a/sci-astronomy/astrometry/files/0.64-respect-user-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- util/makefile.common 2015-10-26 16:32:56.000000000 +0100 -+++ util/makefile.common.new 2015-12-03 20:29:01.368257244 +0100 -@@ -241,9 +228,6 @@ - else - - ifeq ($(OPTIMIZE),yes) -- # speedy! -- FLAGS_DEF += -O3 -- FLAGS_DEF += -fomit-frame-pointer - # turn off asserts: - FLAGS_DEF += $(ASSERT) - diff --git a/sci-astronomy/astrometry/metadata.xml b/sci-astronomy/astrometry/metadata.xml deleted file mode 100644 index 3de66c7..0000000 --- a/sci-astronomy/astrometry/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - sci-astronomy - - 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. - - - Add extra tools, specifically for plots - - -- cgit v1.2.3