gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-astronomy
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
40 files changed, 223 insertions, 1757 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 320fb35ce17e..278528afd7fe 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest
deleted file mode 100644
index 49ea95393f02..000000000000
--- a/sci-astronomy/astrometry/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX astrometry-0.67-dynlink.patch 2411 BLAKE2B 7e1a0c92f8fdb9e44e703a05428f7a7359ea64a07aabac3d1e0604c0a4b8ced531f2698c9718d469d9dc7b5bde03dea0a4fbce82348c3322b744f0ae5c4c669d SHA512 ac82c83efd419519c08eed4ff487fcc5daaab7c12bb4807d501229b5c75e327a422fbbc9fa0bcd5e41516ec26f74a17081bc985aac9b4bb77baf09712f6f85bc
-AUX astrometry-0.67-qsortr.patch 248 BLAKE2B 2d96b16873efaf0e8672194d3fd3d993ca1e10783a77feba19d4de5288b1a4c594ea466a38e03894f70c3bd002f3681640c103af3287d97d430a7a205596db61 SHA512 99ce5cf9d2d11946a012ff65d6cd4ee7f167ded5f04d5d0f1d68de621f427a0d7e88302c1ebe534296d9dbda3adf608497c40a1bbf82178e3824093dfa510a03
-AUX astrometry-0.67-soname.patch 791 BLAKE2B 16f857ebd419fc244296171318308f1698ac037258d9219cec4f879057886a869958175933e73c60201d236a8fb220558892a5f3f4cc125b354433722de25982 SHA512 5e0ecc865986e3a9b065cff57cabe8cc67eb8ae46794ee91215e128d9dfeecff40c7621952246d1bcdcc54514b5eb556c93b099ddefcdb82318b52def835f656
-AUX astrometry-0.72-dynlink.patch 3070 BLAKE2B 11c307d6cd5dff61579d4df7f1a739e9dbcc833f5fae0902be303ab4ba5be506e584f859a6958e83e869ce2f8d207e611a694ae4923f7b9c539650b0a8021432 SHA512 a472dd33cb896ea51cb713e1fad8dedeac2cec546799bd5be606083ffa357963a972e9a32819af7a4373e9316a9ce82c0d70abd46b4c056f4a49f53bba13eb3d
-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
-EBUILD astrometry-0.67-r2.ebuild 2902 BLAKE2B 5c474dd9f454ea1d1c9f5e829287df72e1b4e70f2f7bdc292a39f73984bb50e136d6330254e62de74724536a3ee122f5251938828e3c2a1c4de63afb0bad7627 SHA512 4a3e93b13ce0bf2d2fd0781d117c80d125b05d7cfe62ec8e7a5a5cef379a65e5950a1437fe1de7aade5e153d560416e2a3d96aa44a0dbd0cf9e70d55d24fbab7
-EBUILD astrometry-0.70.ebuild 2920 BLAKE2B 79de16af77557bdc4fc2616d93a61171d373cf1777eb188691d041f4dc8dee1b472fa5795a62a8857f9587fab1eee68f3306d8f1b0771093b5e4546e21c8e006 SHA512 fbaf7d16b82a0886eab8d93182226f4282eeb4dc0c0eeea59a92417c265c63b09df54d9b313ba21db35c86f71af7d5367dfaa3071d7efce44f5e21d1e2c91f4e
-EBUILD astrometry-0.72.ebuild 2867 BLAKE2B 204a15edf7833f28e7315e15b1ec95441cc4aed0057dcd5cfefb628e6bba5b13d2baf50671cb5732a52668219fe2e0f445218ffa0841138abd0c8614d483e809 SHA512 8a9b103128e64cbca9a0a59de55c979463f9005f503b5cb21dec0cc571f90817488abda23d6c28e583bf94e3afb01ab0eca086db5638e2ca2cbdcb120cc9991f
-MISC metadata.xml 691 BLAKE2B f1870bd79eebbcbaa332319bdeffe22d62819eba971770258e41f4abb2bcd3e3946372da9dead4a58748bcc84b372f1a1b48d5eb5fe876fb9c90edc61ff202d5 SHA512 af5a3566d247a3f46bb641602822563a2f58d73e13c83dc3e1d4de32b28a7534979848931993c4b7d9c89c2e3f96c88ba488c3288bd4f9c42b3bc550c12f33f6
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 75a92d3581f5..000000000000
--- 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 d17b0d7aaf93..000000000000
--- 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 b0fe8ea5b2ae..000000000000
--- 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 64b87c033ca5..000000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Author: Ole Streicher <olebole@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 6a7868884eaa..000000000000
--- 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 595dd79a2f46..000000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Ole Streicher <olebole@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 371a2129bd58..000000000000
--- a/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Ole Streicher <olebole@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 2e748354d4f7..000000000000
--- 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-astronomy@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>
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
deleted file mode 100644
index 8156039b6eed..000000000000
--- a/sci-astronomy/casacore/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch 1586 BLAKE2B b5c312d2b178780315f876ab18fe92248a4a61dc9ed88e268d84410c8256bfd03b6d011c64e5e636a0dc851410f0c6fce4c37282db55203028ba3927ad11767f SHA512 b551689d2591d56a2b032a4c3bd8b5e1f2206d362017095291aa6cb00a6ee3dd8fbe2d9e2675b95bb994b5e4622067d1b1e5bddcff6bb6658f83400789e6dae6
-AUX casacore-2.3.0-disable-known-test-failures.patch 4983 BLAKE2B 502930bba3497b473b7eb2a0af44d5d9a6247a5ce92edd4521c9746186741b1a4ee6b28b2d454c323ad1cd8033d6f4e34f6310bbb31e513e190be079f4002f1a SHA512 cd796961ef98facd5eb82f515b7ea001dddd758ca06c202b81d6de8dccdcefa1bbaf98d6635318cff45381feabd75fd13c10fa47338acfb96b582624f70d047c
-AUX casacore-2.3.0-disable-tests-that-require-data-tables.patch 7001 BLAKE2B 4ae4c1b38b3183d951b7c24b7f9edd2ffcf8a9333a3e487384cfb1fc4d2e84ec5b7c99feb4b39ef0c5dedb1ba6b5566d67a13d16d300180071fd5a6445e88545 SHA512 322f6373fb3d46416141da2c631285dae8c32114b67dc2a466a31576353ddc39341363911f63c3116d0dfa35975bb370188519b8483ca3863040b05d4d1031dd
-AUX casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch 1417 BLAKE2B a5b6e5030ea054c6745cc1337117a0beb45905f2fd10ef640c18dd93f5ab203f0a5dceb2874448b8591782f53e5be5b9b4bccb17041278585bb75605acce4073 SHA512 dc9c51afb107914cb5525dd2ba298716011e7e059893798235511637efada0ed23b5af1b35146a0841a18d4da2262ea933bb0e1745f07cd2d96cbc9566ae4e21
-AUX casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch 10447 BLAKE2B baae376b0a16c631afc0a2e780f912c2ccf515c3d457c56019b90fc9007ec5c2b779940fd8f902908ba2b3e2c33e6b38dd635acc24262ff0c031c4d05933f785 SHA512 57ee53e982ae4322e6fc9cb4c625190dd18abb5e0e728b72bba4a36be524dc80537c4d93e6fe6a51b6387d6df1a676bed2221d9d5ca87139c64c32f20d190af9
-AUX casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch 3593 BLAKE2B bc1d15401fd8023822b423b9b1aa7ee8192bd1920be310fa48cae2ff8a65cfd6b2e3e5a66a14f86843ea68d8464fdec9f5148b2df13d8b1a6d8cfe5fd6ff1df4 SHA512 d1db6bb4f92993fd09d948ba7f344adede3681ab9bc6c30aa743f454dd162900448dd7d5d710eb2f15fa421d95e5361d6c5c13fc8699b0994d7a5fdb7ba22f02
-AUX casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch 1612 BLAKE2B 8729efea8e689e06ffef0fccff6753f5344106899951d15c03f6f439438101f935b5494c022d6d55d1a5b899095d2c2c3e0e1b64b2089bf177453a08fa0f47e9 SHA512 266c26f6b7bbf8f7aa613c4b2fd97c3f8d8101a481218b1e6e3168e0341cfb9834766fa7d45d9f1d1504d86d483025da5f51346137147743060bdc3ee663a0f7
-AUX casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch 1693 BLAKE2B 88bf1165d4794a4931b09ad109b7959daf72a2fd0ac4d524340f2110cdaaa9a910102643a2b6756cd82d2fb37a060a0b85fdaa80d83989ab44002ae85d2dc7fa SHA512 4124f2861800f4bd4e98bc88b08d6b62869dae1e646ca269a87d7d9631306aa25b64c2c6e263e71d7ae16f56c0a1e0a574a8e310984b67fee924fedefc4211f3
-AUX casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch 572 BLAKE2B 40de151c45734a717998a13de863c0273a703333a8ce3d1434c0d9a95fdd451cbff390b2f9c78c7cd6e1ed069b3620b6c4abfa1f51462cdc3f7719a08b837e04 SHA512 f4f262c3ccc2b2ffd4d769faf0153861f9d4bca832a89d359bc9d9dbe7ee4ec2f4ef55970d5dc2ba821a7cf9a2d0246492f2e9e0bff5428684b282bc076f21ba
-DIST casacore-2.3.0.tar.gz 10326408 BLAKE2B f69083409963e65dcc06b2165c7a594f03f341badbfd1f5cb4c760db0cd4e49027df941efb03a817f1e60dd27111c8e614df8db787b2cc31f2b8539d5ba7ff11 SHA512 48d09e74b0c3885eb9f7bd048f0fd158397f7c6aa2bf9f713af9dbfcf3ce2c5ba0abb9500d3fe1d32977a35e0941b273fbfd8ee69c991a19df264f5f5a28cbb0
-EBUILD casacore-2.3.0-r1.ebuild 3182 BLAKE2B a7c56617809c1ce8f50e8c95fa2050bb174c457ba9c46ff36475f9547f8ce53974320954ef6fde276e1ecc0754f07e02a64c3b3d377fb750c6e9b7bf9ce25099 SHA512 8096df46b71aa2bff3d010994db49e8111201d79e00a6015acad329ee879f007547c3caeaaebb230b75dc1564e357b66c144ab7dfc231f7538bcd3370a8086cb
-MISC metadata.xml 780 BLAKE2B 759a9e9b85579d58fa683581c11abf2361c57ac12422fd972308c006efac83f99a1d9782c5242cf9ff4db855e1d17f5019adccb429e1d441b6558ead41ea13a4 SHA512 f272b80dc21facc305d8b68320107c7ee837102c09c0e86dbb56de6a24ac6307172f8a2c5127c5b0af3843120e376652394f720cfa205e60c1e1f5c6f35889da
diff --git a/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild b/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
deleted file mode 100644
index 53af61053de3..000000000000
--- a/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit cmake-utils eutils toolchain-funcs fortran-2 python-r1
-
-DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
-HOMEPAGE="https://github.com/casacore/casacore"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+c++11 +data doc fftw hdf5 openmp python threads test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sci-astronomy/wcslib:0=
-	sci-libs/cfitsio:0=
-	sys-libs/readline:0=
-	virtual/blas:=
-	virtual/lapack:=
-	data? ( sci-astronomy/casa-data )
-	fftw? ( sci-libs/fftw:3.0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:0=[python,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( sci-astronomy/casa-data	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-disable-class-and-collaboration-graph-generation.patch
-	"${FILESDIR}"/${PN}-2.3.0-disable-known-test-failures.patch
-	"${FILESDIR}"/${PN}-2.3.0-disable-tests-that-require-data-tables.patch
-	"${FILESDIR}"/${PN}-2.3.0-do-not-install-test-and-demonstration-executables.patch
-	"${FILESDIR}"/${PN}-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch
-	"${FILESDIR}"/${PN}-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch
-	"${FILESDIR}"/${PN}-2.3.0-loose-some-tests-tFFTServer-tests.patch
-	"${FILESDIR}"/${PN}-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch
-	"${FILESDIR}"/${PN}-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch
-)
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && [[ ${MERGE_TYPE} != binary ]]; then
-		use c++11 && [[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) && \
-				die "You are using gcc but gcc-4.7 or higher is required for C++11"
-	fi
-	use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -e '/python-py/s/^.*$/find_package(Boost REQUIRED COMPONENTS python)/' \
-		-i python3/CMakeLists.txt || die
-}
-
-src_configure() {
-	has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-	local mycmakeargs=(
-		-DENABLE_SHARED=ON
-		-DBUILD_PYTHON=OFF
-		-DDATA_DIR="${EPREFIX}/usr/share/casa/data"
-		-DBUILD_TESTING="$(usex test)"
-		-DCXX11="$(usex c++11)"
-		-DUSE_FFTW3="$(usex fftw)"
-		-DUSE_HDF5="$(usex hdf5)"
-		-DUSE_OPENMP="$(usex openmp)"
-		-DUSE_THREADS="$(usex threads)"
-	)
-	python_set_options() {
-		if python_is_python3; then
-			mycmakeargs+=(
-				-DPYTHON3_EXECUTABLE="${PYTHON}"
-				-DBUILD_PYTHON3=ON
-			)
-		else
-			mycmakeargs+=(
-				-DPYTHON2_EXECUTABLE="${PYTHON}"
-				-DBUILD_PYTHON=ON
-			)
-		fi
-	}
-	use python && python_foreach_impl python_set_options
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen doxygen.cfg || die
-	fi
-}
-
-src_install(){
-	cmake-utils_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/html
-		docompress -x /usr/share/doc/${PF}/html
-	fi
-}
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch b/sci-astronomy/casacore/files/casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch
deleted file mode 100644
index d06af1e6e319..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-disable-class-and-collaboration-graph-generation.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Benda Xu <heroxbd@gentoo.org>
-Date: Thu, 11 Sep 2014 18:20:44 +0900
-Subject: Disable class and collaboration graph generation
-
-The graphviz-generated class and collaboration graph
-occupies 1GB disk space.  It is too big to deal with.  We turn them
-off only to save space.  Output image format is specified as svg to
-further save space (bug #751947).
----
- doxygen.cfg | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doxygen.cfg b/doxygen.cfg
-index 9071e88..94b7ccb 100644
---- a/doxygen.cfg
-+++ b/doxygen.cfg
-@@ -2103,7 +2103,7 @@ DOT_FONTPATH           =
- # The default value is: YES.
- # This tag requires that the tag HAVE_DOT is set to YES.
- 
--CLASS_GRAPH            = YES
-+CLASS_GRAPH            = NO
- 
- # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
- # graph for each documented class showing the direct and indirect implementation
-@@ -2112,7 +2112,7 @@ CLASS_GRAPH            = YES
- # The default value is: YES.
- # This tag requires that the tag HAVE_DOT is set to YES.
- 
--COLLABORATION_GRAPH    = YES
-+COLLABORATION_GRAPH    = NO
- 
- # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
- # groups, showing the direct groups dependencies.
-@@ -2215,7 +2215,7 @@ DIRECTORY_GRAPH        = NO
- # The default value is: png.
- # This tag requires that the tag HAVE_DOT is set to YES.
- 
--DOT_IMAGE_FORMAT       = png
-+DOT_IMAGE_FORMAT       = svg
- 
- # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
- # enable generation of interactive SVG images that allow zooming and panning.
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-disable-known-test-failures.patch b/sci-astronomy/casacore/files/casacore-2.3.0-disable-known-test-failures.patch
deleted file mode 100644
index c26619f28c27..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-disable-known-test-failures.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Fri, 2 Dec 2016 11:11:28 +0100
-Subject: Disable known test failures
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Disable tPath test
-
-sbuild gets HOME variable leaked into the build environment.  Debian
-uses sbuild as official build farm.  Until the cause is pinned down,
-this test is disabled.
-
- 98/425 Test #101: tPath ...............................***Failed    0.64 sec
-1,16d0
-< expanded: /home/heroxbd
-< expected: /«PKGBUILDDIR»
-< absolute: /home/heroxbd
-< expected: /«PKGBUILDDIR»
-< expanded: /home/heroxbd/test/test2
-< expected: /«PKGBUILDDIR»/test/test2
-< absolute: /home/heroxbd/test/test2
-< expected: /«PKGBUILDDIR»/test/test2
-< expanded: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-< absolute: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-< expanded: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-< absolute: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-33a18
-> OK
-FAIL (output not verified): ./tPath
-
-Disable tLSQaips and tLSQFit tests
-
-These tests fail, probably due to the test itself. From
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838424#15
-
-I'm not sure what to do about the other two tests that fail on arm64,
-"tLSQaips" and "tLSQFit", because those two generate a load of output
-text containing floating-point numbers and compare that text with an
-expected output. It might not be so easy to make that work on all
-architectures. Perhaps one could simply disable those two tests.
-Preferably one would still run them, so that we can see what happens
-in the logs, but not have the build fail if only those tests fail.
----
- casa/IO/test/CMakeLists.txt              | 4 ++--
- casa/OS/test/CMakeLists.txt              | 9 ++++-----
- images/Images/test/CMakeLists.txt        | 2 +-
- lattices/LatticeMath/test/CMakeLists.txt | 2 +-
- scimath/Fitting/test/CMakeLists.txt      | 4 ++--
- tables/TaQL/test/CMakeLists.txt          | 4 ++--
- 6 files changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/casa/IO/test/CMakeLists.txt b/casa/IO/test/CMakeLists.txt
-index 188a6c4..3187b60 100644
---- a/casa/IO/test/CMakeLists.txt
-+++ b/casa/IO/test/CMakeLists.txt
-@@ -3,9 +3,9 @@ tAipsIOCarray
- tAipsIO
- tBucketBuffered
- tBucketCache
--tBucketFile
-+# tBucketFile # https://github.com/casacore/casacore/issues/73
- tBucketMapped
--tByteIO
-+# tByteIO # https://github.com/casacore/casacore/issues/73
- tByteSink
- tByteSinkSource
- tFilebufIO
-diff --git a/casa/OS/test/CMakeLists.txt b/casa/OS/test/CMakeLists.txt
-index 520ceed..e5c9ee3 100644
---- a/casa/OS/test/CMakeLists.txt
-+++ b/casa/OS/test/CMakeLists.txt
-@@ -3,10 +3,10 @@ tCanonicalConversion
- tConversion
- tConversionPerf
- tDataConversion
--tDirectory
-+# tDirectory # https://github.com/casacore/casacore/issues/73
- tDirectoryIterator
- tEnvVar
--tFile
-+# tFile # https://github.com/casacore/casacore/issues/73
- tHostInfo
- tIBMConversion
- tLECanonicalConversion
-@@ -14,10 +14,9 @@ tMemory
- tMemoryTrace
- tModcompConversion
- tMutex
--tPath
- tPrecTimer
--tRegularFile
--tSymLink
-+# tRegularFile # https://github.com/casacore/casacore/issues/73
-+# tSymLink # https://github.com/casacore/casacore/issues/73
- tTime
- tTimer
- tVAXConversion
-diff --git a/images/Images/test/CMakeLists.txt b/images/Images/test/CMakeLists.txt
-index 4115c29..6865919 100644
---- a/images/Images/test/CMakeLists.txt
-+++ b/images/Images/test/CMakeLists.txt
-@@ -69,7 +69,7 @@ tMIRIADImage
- # tPagedImage2 # requires geodetic/Observatories
- # tRebinImage # requires geodetic/Observatories
- tSubImage
--tTempImage
-+# tTempImage # https://github.com/casacore/casacore/issues/543
- )
- 
- foreach (test ${tests})
-diff --git a/lattices/LatticeMath/test/CMakeLists.txt b/lattices/LatticeMath/test/CMakeLists.txt
-index 47e5c76..23f254f 100644
---- a/lattices/LatticeMath/test/CMakeLists.txt
-+++ b/lattices/LatticeMath/test/CMakeLists.txt
-@@ -11,7 +11,7 @@ tLatticeHistograms
- tLatticeMathUtil
- tLatticeSlice1D
- tLatticeStatistics
--tLatticeStatsDataProvider
-+# tLatticeStatsDataProvider # tries to allocate a 1024*1024*1024 array, which is at least 4GiB 
- tLatticeTwoPtCorr
- # tLattStatsSpecialize
- )
-diff --git a/scimath/Fitting/test/CMakeLists.txt b/scimath/Fitting/test/CMakeLists.txt
-index 35d258f..de69738 100644
---- a/scimath/Fitting/test/CMakeLists.txt
-+++ b/scimath/Fitting/test/CMakeLists.txt
-@@ -3,8 +3,8 @@ dConstraints
- dLSQFit
- tFitGaussian
- tLinearFitSVD
--tLSQaips
--tLSQFit
-+#tLSQaips
-+#tLSQFit
- tNonLinearFitLM
- )
- 
-diff --git a/tables/TaQL/test/CMakeLists.txt b/tables/TaQL/test/CMakeLists.txt
-index 9cf5223..1fcd338 100644
---- a/tables/TaQL/test/CMakeLists.txt
-+++ b/tables/TaQL/test/CMakeLists.txt
-@@ -35,8 +35,8 @@ tTaQLNode
- # Only test scripts, no test programs.
- set (testscripts
- ttaql
--tTableGramCretab
--tTableGramAlttab
-+# tTableGramCretab # https://github.com/casacore/casacore/issues/541
-+# tTableGramAlttab # https://github.com/casacore/casacore/issues/541
- tTableGramUpdate
- tTableGramMasked
- tTableGramNull
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-disable-tests-that-require-data-tables.patch b/sci-astronomy/casacore/files/casacore-2.3.0-disable-tests-that-require-data-tables.patch
deleted file mode 100644
index b7e39f2528a9..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-disable-tests-that-require-data-tables.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-From: Benda Xu <heroxbd@gentoo.org>
-Date: Wed, 10 Sep 2014 10:00:43 +0900
-Subject: Disable tests that require data tables
-
-The data tables are not available during the build of casacore (yet).
----
- coordinates/Coordinates/test/CMakeLists.txt | 12 ++++-----
- images/Images/test/CMakeLists.txt           | 40 ++++++++++++++---------------
- images/Regions/test/CMakeLists.txt          |  8 +++---
- lattices/LatticeMath/test/CMakeLists.txt    |  2 +-
- meas/MeasUDF/test/CMakeLists.txt            |  2 +-
- measures/Measures/test/CMakeLists.txt       | 37 ++++++++++++--------------
- measures/TableMeasures/test/CMakeLists.txt  |  2 +-
- ms/MSOper/test/CMakeLists.txt               |  6 ++---
- ms/MeasurementSets/test/CMakeLists.txt      |  2 +-
- 9 files changed, 53 insertions(+), 58 deletions(-)
-
-diff --git a/coordinates/Coordinates/test/CMakeLists.txt b/coordinates/Coordinates/test/CMakeLists.txt
-index bd1c996..248b395 100644
---- a/coordinates/Coordinates/test/CMakeLists.txt
-+++ b/coordinates/Coordinates/test/CMakeLists.txt
-@@ -1,18 +1,18 @@
- set (tests
--dCoordinates
-+#dCoordinates # requires geodetic/Observatories
- dRemoveAxes
- dWorldMap
- tCoordinate
--tCoordinateSystem
--tCoordinateUtil
-+# tCoordinateSystem # requires geodetic/Observatories
-+# tCoordinateUtil # requires geodetic/Observatories
- tDirectionCoordinate
--tFrequencyAligner
-+# tFrequencyAligner # requires geodetic/Observatories
- tGaussianConvert
- tLinearCoordinate
- tLinearXform
--tObsInfo
-+# tObsInfo # requires geodetic/Observatories
- tProjection
--tSpectralCoordinate
-+# tSpectralCoordinate # requires geodetic/Observatories
- tStokesCoordinate
- tQualityCoordinate
- tTabularCoordinate
-diff --git a/images/Images/test/CMakeLists.txt b/images/Images/test/CMakeLists.txt
-index 302d798..4115c29 100644
---- a/images/Images/test/CMakeLists.txt
-+++ b/images/Images/test/CMakeLists.txt
-@@ -35,39 +35,39 @@ endforeach (file)
- 
- set (tests
- dImageInterface
--dImageStatistics
--dImageSummary
-+# dImageStatistics # requires geodetic/Observatories
-+# dImageSummary # requires geodetic/Observatories
- dPagedImage
- tExtendImage
--tFITSErrorImage
-+# tFITSErrorImage #
- tFITSExtImage
- tFITSExtImageII
- tFITSImage
- tFITSImgParser
--tFITSQualityImage
-+# tFITSQualityImage #
- tHDF5Image
--tImageAttrHandler
--tImageBeamSet
--tImageConcat
--tImageEmpty
--tImageExpr
--tImageExpr2
--tImageExpr2Gram
--tImageExpr3Gram
-+# tImageAttrHandler # requires geodetic/Observatories
-+# tImageBeamSet #
-+# tImageConcat # needs casacore-data
-+# tImageEmpty # requires geodetic/Observatories
-+# tImageExpr
-+# tImageExpr2
-+# tImageExpr2Gram # requires geodetic/Observatories
-+# tImageExpr3Gram # requires geodetic/Observatories
- tImageExprGram
- tImageExprParse
- tImageExprParse_addDir
- tImageInfo
--tImageProxy
--tImageRegrid
-+# tImageProxy
-+# tImageRegrid # requires geodetic/Observatories
- tImageStatistics
--tImageStatistics2
--tImageUtilities
--tLELSpectralIndex
-+# tImageStatistics2 # requires geodetic/Observatories
-+# tImageUtilities # requires geodetic/Observatories
-+# tLELSpectralIndex # requires geodetic/Observatories
- tMIRIADImage
--tPagedImage
--tPagedImage2
--tRebinImage
-+# tPagedImage # requires geodetic/Observatories
-+# tPagedImage2 # requires geodetic/Observatories
-+# tRebinImage # requires geodetic/Observatories
- tSubImage
- tTempImage
- )
-diff --git a/images/Regions/test/CMakeLists.txt b/images/Regions/test/CMakeLists.txt
-index b94c391..1201346 100644
---- a/images/Regions/test/CMakeLists.txt
-+++ b/images/Regions/test/CMakeLists.txt
-@@ -9,12 +9,12 @@ foreach (file ${datafiles})
- endforeach (file)
- 
- set (tests
--tImageRegion
-+# tImageRegion
- tRegionHandler
--tWCBox
--tWCEllipsoid
-+# tWCBox # requires geodetic/Observatories
-+# tWCEllipsoid
- tWCExtension
--tWCLELMask
-+# tWCLELMask # requires geodetic/Observatories
- tWCUnion
- )
- 
-diff --git a/lattices/LatticeMath/test/CMakeLists.txt b/lattices/LatticeMath/test/CMakeLists.txt
-index 0d869d5..47e5c76 100644
---- a/lattices/LatticeMath/test/CMakeLists.txt
-+++ b/lattices/LatticeMath/test/CMakeLists.txt
-@@ -13,7 +13,7 @@ tLatticeSlice1D
- tLatticeStatistics
- tLatticeStatsDataProvider
- tLatticeTwoPtCorr
--tLattStatsSpecialize
-+# tLattStatsSpecialize
- )
- 
- foreach (test ${tests})
-diff --git a/meas/MeasUDF/test/CMakeLists.txt b/meas/MeasUDF/test/CMakeLists.txt
-index a2ecd9a..b06ee99 100644
---- a/meas/MeasUDF/test/CMakeLists.txt
-+++ b/meas/MeasUDF/test/CMakeLists.txt
-@@ -1,5 +1,5 @@
- set (tests
-- tmeas
-+# tmeas # requires casacore-data
- )
- 
- foreach (test ${tests})
-diff --git a/measures/Measures/test/CMakeLists.txt b/measures/Measures/test/CMakeLists.txt
-index c10a670..261adb1 100644
---- a/measures/Measures/test/CMakeLists.txt
-+++ b/measures/Measures/test/CMakeLists.txt
-@@ -1,25 +1,25 @@
- set (tests
- dM1950_2000
--dMeasure
--tEarthField
--tEarthMagneticMachine
--tMBaseline
--tMDirection
--tMEarthMagnetic
--tMFrequency
--tMeasComet
--tMeasIERS
--tMeasJPL
-+# dMeasure # geodetic/TAI_UTC
-+# tEarthField # geodetic/IGRF
-+# tEarthMagneticMachine # geodetic/IGRF
-+# tMBaseline # geodetic/IGRF
-+# tMDirection
-+# tMEarthMagnetic # geodetic/IGRF
-+# tMFrequency
-+# tMeasComet # ephemerides/VGEO
-+# tMeasIERS # geodetic/IERS*
-+# tMeasJPL # ephemerides/DE200
- tMeasMath
--tMeasure
-+# tMeasure # geodetic/TAI_UTC
- tMeasureHolder
--tMuvw
--tParAngleMachine
--tQuality
-+# tMuvw # geodetic/TAI_UTC
-+# tParAngleMachine # geodetic/TAI_UTC
-+# tQuality
- tRecordTransformable
- tStokes
- tUVWMachine
--tVelocityMachine
-+# tVelocityMachine # geodetic/TAI_UTC
- )
- 
- foreach (test ${tests})
-@@ -29,9 +29,4 @@ foreach (test ${tests})
-     add_dependencies(check ${test})
- endforeach (test)
- 
--if (SOFA_FOUND)
--    add_executable (tIAU2000 SofaTest.cc tIAU2000.cc)
--    target_link_libraries (tIAU2000 casa_measures ${SOFA_LIBRARY})
--    add_test (tIAU2000 ${CMAKE_SOURCE_DIR}/cmake/cmake_assay ./tIAU2000)
--    add_dependencies(check tIAU2000)
--endif (SOFA_FOUND)
-+# tIAU2000 disabled for missing geodetic/TAI_UTC
-diff --git a/measures/TableMeasures/test/CMakeLists.txt b/measures/TableMeasures/test/CMakeLists.txt
-index e7c4af1..84e7d6d 100644
---- a/measures/TableMeasures/test/CMakeLists.txt
-+++ b/measures/TableMeasures/test/CMakeLists.txt
-@@ -1,6 +1,6 @@
- set (tests
- tTableQuantum
--tTableMeasures
-+# tTableMeasures # geodetic/{IERSeop{2000,97},IERSpredict{,2000},TAI_UTC}
- dVarRefMdirCol
- )
- 
-diff --git a/ms/MSOper/test/CMakeLists.txt b/ms/MSOper/test/CMakeLists.txt
-index e53aec3..81912cd 100644
---- a/ms/MSOper/test/CMakeLists.txt
-+++ b/ms/MSOper/test/CMakeLists.txt
-@@ -1,9 +1,9 @@
- set (tests
--tMSDerivedValues
--tMSKeys
-+# tMSDerivedValues # geodetic/IERSpredict
-+# tMSKeys
- tMSMetaData
- tMSReader
--tMSSummary
-+# tMSSummary
- )
- 
- foreach (test ${tests})
-diff --git a/ms/MeasurementSets/test/CMakeLists.txt b/ms/MeasurementSets/test/CMakeLists.txt
-index 6e66aad..8150ad4 100644
---- a/ms/MeasurementSets/test/CMakeLists.txt
-+++ b/ms/MeasurementSets/test/CMakeLists.txt
-@@ -15,7 +15,7 @@ tMeasurementSet
- tMSColumns
- tMSDataDescBuffer
- tMSFieldBuffer
--tMSFieldEphem
-+#tMSFieldEphem requires casacore-data
- tMSIter
- tMSMainBuffer
- tMSPolBuffer
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch b/sci-astronomy/casacore/files/casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch
deleted file mode 100644
index ab9004dc3ecf..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-do-not-install-test-and-demonstration-executables.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Benda Xu <heroxbd@gentoo.org>
-Date: Fri, 24 Oct 2014 18:26:54 +0900
-Subject: Do not install test and demonstration executables
-
-casacore_{assay,floatcheck} are removed and only used with scons.
-measuresdata.csh and ms2uvfits should be included in casacore-doc as examples.
-change measuresdata.csh shebang to /usr/bin/tcsh as in Debian.
----
- measures/apps/CMakeLists.txt | 2 +-
- msfits/apps/CMakeLists.txt   | 5 -----
- 2 files changed, 1 insertion(+), 6 deletions(-)
- delete mode 100644 msfits/apps/CMakeLists.txt
-
-diff --git a/measures/apps/CMakeLists.txt b/measures/apps/CMakeLists.txt
-index fcf2184..1bbf19f 100644
---- a/measures/apps/CMakeLists.txt
-+++ b/measures/apps/CMakeLists.txt
-@@ -7,4 +7,4 @@ endforeach(prog findmeastable)
- add_executable (measuresdata  measuresdata/measuresdata.cc)
- target_link_libraries (measuresdata casa_measures ${CASACORE_ARCH_LIBS})
- install(TARGETS measuresdata DESTINATION bin)
--install(PROGRAMS measuresdata/measuresdata-update DESTINATION bin)
-+install(PROGRAMS DESTINATION bin)
-diff --git a/msfits/apps/CMakeLists.txt b/msfits/apps/CMakeLists.txt
-deleted file mode 100644
-index d2775c8..0000000
---- a/msfits/apps/CMakeLists.txt
-+++ /dev/null
-@@ -1,5 +0,0 @@
--foreach(prog ms2uvfits)
--    add_executable (${prog}  ${prog}.cc)
--    target_link_libraries (${prog} casa_msfits ${CASACORE_ARCH_LIBS})
--    install(TARGETS ${prog} DESTINATION bin)
--endforeach(prog ms2uvfits)
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch b/sci-astronomy/casacore/files/casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch
deleted file mode 100644
index 2f07fe3bcf85..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-fix-FTBFS-tStatisticsUtilities-tLatticeStatistics-and-tLC.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From: Edmund Grimley Evans <edmund.grimley.evans@gmail.com>
-Date: Thu, 1 Jun 2017 22:34:46 +0100
-Subject: Fix FTBFS tStatisticsUtilities,
- tLatticeStatistics and tLCEllipsoid on arm64
-
-The tests "tStatisticsUtilities" and "tLatticeStatistics" can be made
-to pass on arm64 with these adjustments to the expected accuracy.
-
-The test "tLCEllipsoid" seems to be converting ellipses into bitmaps.
-I'm guessing it gives different output on amd64 and arm64 because the
-real curve passes through a critical point and numerical inaccuracy
-puts it on different sides of the point on the two architectures. One
-way to fix that might be to use non-round numbers in the parameters so
-that the curve does not pass through a critical point. That's what I
-tried to do, and with the following changes to the program and the
-expected output the test passes on both amd64 and arm64.
----
- lattices/LRegions/test/tLCEllipsoid.cc           |  4 ++--
- lattices/LRegions/test/tLCEllipsoid.out          | 24 ++++++++++++------------
- lattices/LatticeMath/test/tLatticeStatistics.cc  |  4 ++--
- scimath/Mathematics/test/tStatisticsUtilities.cc |  2 +-
- 4 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/lattices/LRegions/test/tLCEllipsoid.cc b/lattices/LRegions/test/tLCEllipsoid.cc
-index 9e9ee03..2ff65fa 100644
---- a/lattices/LRegions/test/tLCEllipsoid.cc
-+++ b/lattices/LRegions/test/tLCEllipsoid.cc
-@@ -212,8 +212,8 @@ int main() {
-             show(ellipse3);
- 
-             Float theta = C::pi/4;
--            major = 36;
--            minor = 16;
-+            major = 36.01;
-+            minor = 16.01;
-             xcenter = -1;
-             ycenter = -1;
-             LCEllipsoid ellipse4(
-diff --git a/lattices/LRegions/test/tLCEllipsoid.out b/lattices/LRegions/test/tLCEllipsoid.out
-index 3709155..17d8e87 100644
---- a/lattices/LRegions/test/tLCEllipsoid.out
-+++ b/lattices/LRegions/test/tLCEllipsoid.out
-@@ -163,7 +163,7 @@
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 29]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 28]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 27]
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 26]
-+0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 26]
- 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 [35, 25]
- 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 [35, 24]
- 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 23]
-@@ -177,7 +177,7 @@
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 15]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 14]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 13]
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 12]
-+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 12]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 11]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 10]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 [35, 9]
-@@ -207,10 +207,10 @@
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 22]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 21]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 20]
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 19]
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 [35, 19]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 [35, 18]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 [35, 17]
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 [35, 16]
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 [35, 16]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 [35, 15]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 [35, 14]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 [35, 13]
-@@ -222,11 +222,11 @@
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 7]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 6]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 5]
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 4]
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 4]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 3]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 2]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 1]
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 0]
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 0]
- 
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 35]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 34]
-@@ -240,7 +240,7 @@
- 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 26]
- 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 25]
- 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 24]
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 23]
-+0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 23]
- 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 22]
- 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 21]
- 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 [35, 20]
-@@ -254,7 +254,7 @@
- 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 [35, 12]
- 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 [35, 11]
- 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 [35, 10]
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 9]
-+0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 [35, 9]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 8]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 7]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 6]
-@@ -265,11 +265,11 @@
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 1]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 0]
- 
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 35]
-+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 35]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 34]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 33]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 32]
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 31]
-+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 31]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 30]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 29]
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 28]
-@@ -281,10 +281,10 @@
- 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 22]
- 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 21]
- 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 20]
--1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 19]
-+1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 19]
- 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 18]
- 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 17]
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 16]
-+1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 16]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 15]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 14]
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 [35, 13]
-diff --git a/lattices/LatticeMath/test/tLatticeStatistics.cc b/lattices/LatticeMath/test/tLatticeStatistics.cc
-index 833af91..43e0ae7 100644
---- a/lattices/LatticeMath/test/tLatticeStatistics.cc
-+++ b/lattices/LatticeMath/test/tLatticeStatistics.cc
-@@ -416,10 +416,10 @@ int main()
-             AlwaysAssert(sum(pos) == expSum, AipsError);
-             AlwaysAssert(npts(pos) == expNpts, AipsError);
-             AlwaysAssert(mean(pos) == expMean, AipsError);
--            AlwaysAssert(near(sumsq(pos), expSumSq), AipsError);
-+            AlwaysAssert(near(sumsq(pos), expSumSq, 1e-9), AipsError);
-             AlwaysAssert(near(var(pos), expVar, 1e-10), AipsError);
-             AlwaysAssert(near(sigma(pos), expSigma, 1e-11), AipsError);
--            AlwaysAssert(near(rms(pos), expRMS), AipsError);
-+            AlwaysAssert(near(rms(pos), expRMS, 1e-10), AipsError);
-             AlwaysAssert(mymin(pos) == DComplex(0, 0), AipsError);
-             AlwaysAssert(mymax(pos) == DComplex(size-1, size-1), AipsError);
- 
-diff --git a/scimath/Mathematics/test/tStatisticsUtilities.cc b/scimath/Mathematics/test/tStatisticsUtilities.cc
-index 46491c8..c6c443f 100644
---- a/scimath/Mathematics/test/tStatisticsUtilities.cc
-+++ b/scimath/Mathematics/test/tStatisticsUtilities.cc
-@@ -265,7 +265,7 @@ int main() {
-             AlwaysAssert(got.rms == expec.rms, AipsError);
-             AlwaysAssert(near(got.stddev, expec.stddev), AipsError);
-             AlwaysAssert(near(got.sum, expec.sum), AipsError);
--            AlwaysAssert(got.sumsq == expec.sumsq, AipsError);
-+            AlwaysAssert(near(got.sumsq, expec.sumsq), AipsError);
-             AlwaysAssert(near(got.variance, expec.variance), AipsError);
-             AlwaysAssert(*got.max == *expec.max, AipsError);
-             AlwaysAssert(*got.min == *expec.min, AipsError);
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch b/sci-astronomy/casacore/files/casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch
deleted file mode 100644
index 33723375e4dd..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-fix-too-small-int-type-for-memory-on-32-bit-machines.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Fri, 2 Dec 2016 13:16:42 +0100
-Subject: Fix too small int type for memory on 32-bit machines
-
-See https://github.com/casacore/casacore/issues/542#issuecomment-264440161
----
- casa/OS/HostInfoLinux.h | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/casa/OS/HostInfoLinux.h b/casa/OS/HostInfoLinux.h
-index f792b71..4edf61d 100644
---- a/casa/OS/HostInfoLinux.h
-+++ b/casa/OS/HostInfoLinux.h
-@@ -132,13 +132,13 @@ skip_token(const char *p)
- // get integer value from v1 cgroup hierarchy of current processes, if
- // sub_value is set it returns the entry of a collection identified by value,
- // e.g. total_rss from memory.stat
--// returns std::numeric_limits<size_t>::max() on error
-+// returns std::numeric_limits<uInt64>::max() on error
- // note unset cgroup limits usually have intptr_t.max()
- // does not support v2 cgroups
--static inline size_t
-+static inline uInt64
- get_cgroup_limit(std::string group, std::string value, std::string sub_value="")
- {
--    size_t result = std::numeric_limits<size_t>::max();
-+    uInt64 result = std::numeric_limits<uInt64>::max();
-     // assume common location, technically one needs to search for mounts
-     const std::string cgroup = std::string("/sys/fs/cgroup/") + group + "/";
- 
-@@ -280,12 +280,12 @@ void HostMachineInfo::update_info( )
- 	}
- 
- 	/* can't use more memory than allowed by cgroups, enforced */
--	size_t proc_mem_max = get_cgroup_limit("memory", "memory.limit_in_bytes") / 1024;
-+	uInt64 proc_mem_max = get_cgroup_limit("memory", "memory.limit_in_bytes") / 1024;
- 	/* usage_in_bytes also includes cache so use memory.stat */
--	size_t proc_mem_used = get_cgroup_limit("memory", "memory.stat", "total_rss") / 1024;
-+	uInt64 proc_mem_used = get_cgroup_limit("memory", "memory.stat", "total_rss") / 1024;
- 
- 	/* set HostInfo memoryTotal() */
--	memory_total = std::min((size_t)sys_mem_total, proc_mem_max);
-+	memory_total = std::min((uInt64)sys_mem_total, proc_mem_max);
- 
- 	/* if we have a valid cgroup limit we can determine memoryFree() exactly */
- 	if (proc_mem_max <= sys_mem_total && proc_mem_used <= proc_mem_max) {
-@@ -293,7 +293,7 @@ void HostMachineInfo::update_info( )
- 	}
- 	else {
- 	    /* no cgroups so we have to assume all memory of host is available */
--	    memory_free = std::min((size_t)sys_mem_avail, (size_t)memory_total);
-+	    memory_free = std::min((uInt64)sys_mem_avail, (uInt64)memory_total);
- 	}
- 	memory_used = memory_total - memory_free;
- 
-@@ -303,17 +303,17 @@ void HostMachineInfo::update_info( )
- 	    cerr << "Error parsing SwapTotal and SwapFree in /proc/meminfo\n";
- 
- 	/* can't use more swap than allowed by cgroups */
--	size_t proc_swap_max = get_cgroup_limit("memory", "memory.memsw.limit_in_bytes") / 1024;
--	size_t proc_swap_used = get_cgroup_limit("memory", "memory.stat", "total_swap") / 1024;
-+	uInt64 proc_swap_max = get_cgroup_limit("memory", "memory.memsw.limit_in_bytes") / 1024;
-+	uInt64 proc_swap_used = get_cgroup_limit("memory", "memory.stat", "total_swap") / 1024;
- 	/* limit is mem + swap */
- 	if (proc_mem_max <= sys_mem_total && proc_mem_max <= proc_swap_max) {
- 	    proc_swap_max = proc_swap_max - proc_mem_max;
- 	}
- 
- 	/* set swapTotal() */
--	swap_total = std::min((size_t)sys_swap_total, proc_swap_max);
-+	swap_total = std::min((uInt64)sys_swap_total, proc_swap_max);
- 
--	if (proc_swap_max <= (size_t)swap_total && proc_swap_used <= proc_swap_max) {
-+	if (proc_swap_max <= (uInt64)swap_total && proc_swap_used <= proc_swap_max) {
- 	    swap_free = proc_swap_max - proc_swap_used;
- 	}
- 	else {
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch b/sci-astronomy/casacore/files/casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch
deleted file mode 100644
index bccffcd4b522..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 24 Nov 2016 14:31:06 +0100
-Subject: Loose some tests tFFTServer tests
-
-This shall help to compile for mips64el and hppa.
----
- scimath/Mathematics/test/tFFTServer.cc  | 2 +-
- scimath/Mathematics/test/tFFTServer2.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scimath/Mathematics/test/tFFTServer.cc b/scimath/Mathematics/test/tFFTServer.cc
-index c211f36..711e5a7 100644
---- a/scimath/Mathematics/test/tFFTServer.cc
-+++ b/scimath/Mathematics/test/tFFTServer.cc
-@@ -1347,7 +1347,7 @@ public:
-           }
-           AlwaysTrue(result.shape().isEqual(expectedResult.shape()),
-                        AipsError);
--          AlwaysTrue(allNearAbs(result, expectedResult, epsilon),
-+          AlwaysTrue(allNearAbs(result, expectedResult, 2*epsilon),
-                        AipsError);
- 
-           int out_size = expectedResult.nelements();
-diff --git a/scimath/Mathematics/test/tFFTServer2.cc b/scimath/Mathematics/test/tFFTServer2.cc
-index a663d50..880bce3 100644
---- a/scimath/Mathematics/test/tFFTServer2.cc
-+++ b/scimath/Mathematics/test/tFFTServer2.cc
-@@ -1096,7 +1096,7 @@ int main() {
-       expectedResult(0) = Complex(5,0);
-       server.fft(result, input, True);
-       AlwaysAssert(near(result(0), Complex(5,0), FLT_EPSILON), AipsError);
--      AlwaysAssert(!near(result(4).imag(), 0.0f, FLT_EPSILON), AipsError);
-+      AlwaysAssert(!near(result(4).imag(), 0.0f, 2*FLT_EPSILON), AipsError);
-       server.fft(reverseTransform, result);
-       AlwaysAssert(allNearAbs(input, reverseTransform, FLT_EPSILON),
-   		   AipsError);
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch b/sci-astronomy/casacore/files/casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch
deleted file mode 100644
index 2952f39c3623..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 24 Nov 2016 14:31:06 +0100
-Subject: Make the check for NFS a bit more portable (BSD)
-
-And provide a fallback (f.e. for HURD).However, there is probably no
-real use case for that, since also other file systems may be slow or
-lack certain features.
----
- casa/OS/Directory.cc | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/casa/OS/Directory.cc b/casa/OS/Directory.cc
-index 82e6efc..b79ce0f 100644
---- a/casa/OS/Directory.cc
-+++ b/casa/OS/Directory.cc
-@@ -488,29 +488,38 @@ Vector<String> Directory::shellExpand (const Vector<String>& files, Bool stripPa
-    return expInNames;
- }
- 
--#ifndef __APPLE__
-+#if defined(__linux__)
- #include <sys/vfs.h>
--#include <linux//nfs_fs.h>
--#else
-+#include <linux/nfs_fs.h>
-+#elif defined( __APPLE__)
- #include <sys/param.h>
- #include <sys/mount.h>
- #include <sys/vnode.h>
-+#elif defined(__FreeBSD_kernel__)
-+#include <sys/mount.h>
-+#include <sys/param.h>
-+#include <stdlib.h>
- #endif
- 
- Bool Directory::isNFSMounted() const
- {
-+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
-    struct statfs buf;
-    if (statfs (itsFile.path().expandedName().chars(), &buf) < 0) {
-       throw (AipsError ("Directory::isNFSMounted error on " +
-             itsFile.path().expandedName() +
-             ": " + strerror(errno)));
-    }
--#ifndef __APPLE__
-+#endif
-+#if defined(__linux__)
-    return buf.f_type == NFS_SUPER_MAGIC;
--#else
-+#elif defined(__APPLE__)
-    return buf.f_type == VT_NFS;
-+#elif defined(__FreeBSD_kernel__)
-+   return strcmp (buf.f_fstypename, "nfs") == 0;
-+#else
-+   return False;
- #endif
--
- }
- 
- } //# NAMESPACE CASACORE - END
diff --git a/sci-astronomy/casacore/files/casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch b/sci-astronomy/casacore/files/casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch
deleted file mode 100644
index 86d501365ffb..000000000000
--- a/sci-astronomy/casacore/files/casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 24 Nov 2016 14:31:06 +0100
-Subject: Use the correct symbol to detect Linux OS
-
-Otherwise the compilation fails on powerpc archs
----
- casa/aipsenv.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/casa/aipsenv.h b/casa/aipsenv.h
-index 7e272f0..25912b8 100644
---- a/casa/aipsenv.h
-+++ b/casa/aipsenv.h
-@@ -130,7 +130,7 @@ namespace casacore { //# NAMESPACE CASACORE - BEGIN
- #if defined(AIPS_LINUX)
- #undef AIPS_LINUX
- #endif
--#if defined(__linux)
-+#if defined(__linux__)
- #define AIPS_LINUX
- #endif
- 
diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
deleted file mode 100644
index 67227b679918..000000000000
--- a/sci-astronomy/casacore/metadata.xml
+++ /dev/null
@@ -1,20 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  A set of libraries for the the Common Astronomy Software
-  Applications for radioastronomy. This project contains C++ libraries
-  which were the code of the discontinued AIPS++ package.
-</longdescription>
-  <upstream>
-    <remote-id type="github">casacore/casacore</remote-id>
-  </upstream>
-  <use>
-    <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
-    <flag name="c++11">Build casacore using the C++11 standard</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 691e1a55978e..24a2c9753477 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -8,5 +8,5 @@ AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba
 AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f
 EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6
-EBUILD celestia-9999.ebuild 2407 BLAKE2B 465a30c13876ab1b348496f01c44c757ba496a18404e36744b6ca2adc06a64dd70984a535679f0d7d5e270bf0d8896bef1851dcf3090c7acae71ed10ac66a95c SHA512 55a28e63b93c737fdace09e9f64e464dd6e9f4ace95d8e93432ffe445782cd813d87e8861a4b5cccd8e62b9fbdf8c0e51db4228817b2f8023996f679c3972add
+EBUILD celestia-9999.ebuild 2197 BLAKE2B 2ab8e319eccc65457f8a25416a5b7cbfa58070706a83ae6d436152b6b22bc14703ee442073286f22c79b35e5c4efcdcdfe5d1a6fda1f021eefc7cebae5c35f53 SHA512 d79e69077e9bc5c7c57ec42987611665dfafb78693250da977c7d3e81588a9072c6403977d587f33cdeb216ca2066f63f8a49d30666b1dedd2c09c6c76b57360
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index cf7966b4a411..60ddc68e30fc 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop flag-o-matic xdg cmake-utils
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
 else
-	# Old URI! Please update once we have a release > v1.6.1
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
+inherit desktop flag-o-matic xdg cmake
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="https://celestia.space"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="glut gtk nls +qt5 theora"
+IUSE="glut nls +qt5 theora"
 
-REQUIRED_USE="|| ( glut gtk qt5 )"
+REQUIRED_USE="|| ( glut qt5 )"
 
 BDEPEND="
 	dev-cpp/eigen
@@ -36,12 +35,6 @@ DEPEND="
 	virtual/jpeg:0
 	virtual/opengl
 	glut? ( media-libs/freeglut )
-	gtk? (
-		x11-libs/gtk+:2
-		>=x11-libs/gtkglext-1.0
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -62,7 +55,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
@@ -79,16 +72,16 @@ src_configure() {
 		-DENABLE_CELX=ON
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_GTK=OFF
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_WIN=OFF
 		-DENABLE_THEORA="$(usex theora)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	local size
 	for size in 16 22 32 48 ; do
@@ -96,15 +89,12 @@ src_install() {
 	done
 
 	use glut && domenu ${PN}.desktop
-	local ui
-	for ui in gtk qt5 ; do
-		if use ${ui} ; then
-			sed \
-				-e "/^Name/s@\$@ (${ui} interface)@" \
-				-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
-				${PN}.desktop > "${T}"/${PN}-${ui}.desktop || die
-			domenu "${T}"/${PN}-${ui}.desktop
-		fi
-	done
+	if use qt5 ; then
+		sed \
+			-e "/^Name/s@\$@ (qt5 interface)@" \
+			-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
+			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
+		domenu "${T}"/${PN}-qt5.desktop
+	fi
 	dodoc AUTHORS README TRANSLATORS *.txt
 }
diff --git a/sci-astronomy/gasgano/Manifest b/sci-astronomy/gasgano/Manifest
index 52393641abea..adcbff37a5b0 100644
--- a/sci-astronomy/gasgano/Manifest
+++ b/sci-astronomy/gasgano/Manifest
@@ -1,4 +1,4 @@
 DIST VLT-PRO-ESO-19000-1932-V4.pdf 818369 BLAKE2B f58191ca9f1bd72f78e73eceecbfc32331fb88abcaed0eb27f7beb444e47788a95d43f3e8421b235e7637d452d22a773f7363934690644e2cc02acfdfd5cbb11 SHA512 272da18caee1bb1b5228df76a7f09411120be39a4b421b79d48e0bfc09972f250322a718bf380d7a83c3a528151260139efdcd8d2482c6a36ad45d727d93cce1
 DIST gasgano-2.4.8.tar.gz 9211627 BLAKE2B df0a7856ec8b06cb590ff180798841a18f919c55eef4553fb9712e2b8a17d8a39fdeb642c941f8169b866baa2a1fd9ca0795f7c331adfb6ed56c69098abdb9bd SHA512 94fbc9721077b15d2ec06e296d1503a0e33cb845c831a4102740b84d600bc900324ec5293b9a977df0956bd02cd5adf9cc62989be860417e8014e97ead41967c
-EBUILD gasgano-2.4.8.ebuild 934 BLAKE2B d2ec75c9d484b8c52e8a68e4ccc874da017e882eef6af76f4a184c10fd5d9322deb661905ce70da818ba3501cc17da5678e47b31f6d1015eddb5c78438a3811c SHA512 a5c4bf5c1b6991b9a88640f31367bf43ecbcb785396ebbb500c3cd781e68e3d2641bd51c79a13c1527d85414396e5b270a9f713cfc8c191c02cb7d71f6a28de2
+EBUILD gasgano-2.4.8.ebuild 962 BLAKE2B 6835dfe06b1c9761cf2d7295bca47bde1339e5d8f67e69eea16aa77bf79f07cbd28191486680581070e6afc4e2777e069f16211f39ea0b1d3989bca6aec2bfc0 SHA512 2bbbfa6de4b2c13db42a436b4a5f3a1a5d04b138d436aa634307c62565dd41def66a1d00f8718d93ed123228f1a23e7078a1c31e6c35d8b56ae00f375bccea01
 MISC metadata.xml 736 BLAKE2B c1b02edb7dfc7b18b33277a9c94a36d0a7562df78aead52c16b585c59371b4f350685670ada1783e4bcc8287d7d0d70377c50b187bc445bd10b381587dc479d5 SHA512 8848a740bdc272491ac674ac5134400369aa64195e507d5e1da1acca6a4e7c0093b0668a6dfeb1887525d40e87b084685b66fb8abf3296f439808ef7c19a6a6b
diff --git a/sci-astronomy/gasgano/gasgano-2.4.8.ebuild b/sci-astronomy/gasgano/gasgano-2.4.8.ebuild
index 3c0029d16c7c..aa86e755c217 100644
--- a/sci-astronomy/gasgano/gasgano-2.4.8.ebuild
+++ b/sci-astronomy/gasgano/gasgano-2.4.8.ebuild
@@ -10,7 +10,7 @@ PDOC=VLT-PRO-ESO-19000-1932-V4
 DESCRIPTION="ESO astronomical data file organizer"
 HOMEPAGE="http://www.eso.org/sci/software/gasgano/"
 SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
-	doc? ( ${HOMEPAGE}/${PDOC}.pdf )"
+	doc? ( http://www.eso.org/sci/software/gasgano/${PDOC}.pdf )"
 
 LICENSE="Apache-1.1"
 SLOT="0"
diff --git a/sci-astronomy/kapteyn/Manifest b/sci-astronomy/kapteyn/Manifest
deleted file mode 100644
index 596561d6c5fe..000000000000
--- a/sci-astronomy/kapteyn/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kapteyn-2.2-debundle_wcs.patch 2441 BLAKE2B 19eecd59cc28680a495b6ab35ff8e163556e822cc090459d0156bed204f491fa2ee3f0f4a904fd3bb2a155ffaa623752c05d1dfe3f6284b78c1bbcf5eaeb825d SHA512 530d50ba8179939110eac6d4cb5b3611c67208994765f1ab1e50fc9a8cd30d56fe8f1aebc2b44e39f6ae3af534ca7ccb6bc58a4f1df555b49277d358d706e25f
-DIST kapteyn-2.3.tar.gz 14496700 BLAKE2B afadff0024c8edcea8a0a24362266285e86861623aac614edaf98c5bfde1eb49baaab9311256ff5eb1ec0d223cbe406da55679a319b68d7a5bf760f422cab51e SHA512 7095d9f1faed1937817af48416027391e19bf416187b8cc7f0cc5fb1227efe715c0c6ff945e0e021d1a5e82353e9c3ad2c3a1236d3453b4904d6ca2f2a47747b
-EBUILD kapteyn-2.3.ebuild 778 BLAKE2B d30aaa9ef4545468d9043afdd06c974520057e289cb7340e5d7a4b39ce4de07febee0a4936b2780013a06992f174a96fb2666aabd02d6c62e51b5006400fd60b SHA512 8c083c693f819ef0dac313a28c6eede13e9f57b37a3501be6dcfac833cc6ee6ce61af519232b837c7df4e8d44236fab77aa87b21ae153a1e56937d991ec2c43b
-MISC metadata.xml 618 BLAKE2B bd640e951ce7182ac495f1685764367fc4809cc6ebe8b08fb9f5e9730d93380cb885601736d06f95848dec50b74742a05621c9e7bbc2bf188c866fbe5e3545cd SHA512 f0c7ebe71e55db31e91ebc2f3abbb700a2869cb305e5ea06cabc229dce6b73e8418c1943b3926a3a8fec9e8cc2ea117ffa675dcc80b46ec381a4094daf646fb1
diff --git a/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch b/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch
deleted file mode 100644
index 035979b80bc7..000000000000
--- a/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Use system wcslib
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
-
---- a/setup.py
-+++ b/setup.py
-@@ -3,7 +3,8 @@
- from kapteyn import __version__ as version
- from glob import glob
- import sys, os
--
-+from subprocess import Popen, PIPE
-+from re import match
- try:
-    import numpy
- except:
-@@ -14,21 +15,27 @@
- '''
-    sys.exit(1)
- 
--try:
--   wcslib_dir = glob('src/wcslib*/C/')[0]
--except:
--   print '''
---- Error.
--Unable to find WCSLIB source distribution.
--'''
--   sys.exit(1)
-+def pkgconfig(*packages, **kw):
-+    flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
-+    arg = "--libs --cflags --modversion %s" % ' '.join(packages) 
-+    for tok in Popen(["pkg-config "+ arg],stdout=PIPE, shell=True).communicate()[0].split():
-+       token = tok.decode("utf-8")
-+       if(match("[0-9]",token)):
-+          kw.setdefault("version",[]).append(token)
-+       else:
-+          kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
-+    return kw
- 
- include_dirs = []
- numdir = os.path.dirname(numpy.__file__)
- ipath = os.path.join(numdir, numpy.get_include())
- include_dirs.append(ipath)
- include_dirs.append('src')
--include_dirs.append(wcslib_dir)
-+
-+WCSLIB = pkgconfig('wcslib')
-+WCSVERSION = Popen(["pkg-config --modversion"],stdout=PIPE, shell=True).communicate()[0].split()
-+
-+include_dirs += WCSLIB['include_dirs']
- 
- short_descr = "Kapteyn Package: Python modules for astronomical applications"
- 
-@@ -94,27 +101,6 @@
-    "xyz.c"
- ]
- 
--wcslib_src = [
--   "cel.c",
--   "lin.c",
--   "log.c",
--   "prj.c",
--   "spc.c",
--   "sph.c",
--   "spx.c",
--   "tab.c",
--   "wcs.c",
--   "wcsfix.c",
--   "wcshdr.c",
--   "wcsprintf.c",
--   "wcstrig.c",
--   "wcsunits.c",
--   "wcsutil.c",
--   "wcserr.c",
--   "flexed/wcsulex.c",
--   "flexed/wcsutrn.c"
--]
--
- ndimg_src = [
-    "nd_image.c",
-    "ni_filters.c",
-@@ -125,8 +111,7 @@
-    "ni_support.c",
- ]
- 
--wcs_src       = (   ['src/'        + source for source in wcsmod_src]
--                  + [wcslib_dir    + source for source in wcslib_src]  )
-+wcs_src       = ( ['src/'        + source for source in wcsmod_src] )
- 
- _nd_image_src = ['src/ndimg/'  + source for source in ndimg_src]
- 
-@@ -168,7 +153,8 @@
-       Extension(
-          "wcs", wcs_src,
-           include_dirs=include_dirs,
--          define_macros=define_macros
-+          define_macros=define_macros,
-+          libraries=WCSLIB['libraries']
-       ),
-       Extension(
-          "ascarray",
diff --git a/sci-astronomy/kapteyn/kapteyn-2.3.ebuild b/sci-astronomy/kapteyn/kapteyn-2.3.ebuild
deleted file mode 100644
index 91ca272bf852..000000000000
--- a/sci-astronomy/kapteyn/kapteyn-2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of python tools for astronomy"
-HOMEPAGE="https://www.astro.rug.nl/software/kapteyn/"
-SRC_URI="https://www.astro.rug.nl/software/kapteyn/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-astronomy/wcslib
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES.txt README.txt doc/${PN}.pdf )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2-debundle_wcs.patch )
-
-python_prepare_all() {
-	rm -r src/wcslib-4.* || die
-	distutils-r1_python_prepare_all
-}
diff --git a/sci-astronomy/kapteyn/metadata.xml b/sci-astronomy/kapteyn/metadata.xml
deleted file mode 100644
index 57bfac11edbd..000000000000
--- a/sci-astronomy/kapteyn/metadata.xml
+++ /dev/null
@@ -1,15 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  The Kapteyn Package is a collection of Python modules and applications
-  made by the computer group of the Kapteyn Astronomical Institute,
-  University of Groningen, The Netherlands. The purpose of the package
-  is to provide tools for the development of astronomical applications
-  with Python.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 2911653ce8b1..a86ccaa8cc22 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,5 +1,7 @@
 DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c SHA512 29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
 DIST kstars-3.3.8.tar.xz 70991244 BLAKE2B f8f1508d0eb019d5247df8bdd5472dff42113ed24625f581482e2f403da0d1e6311b6c6e9d78a67548b9cec8b2536fbe1e3f886f16bd493d275b7414c8af8033 SHA512 bfc6b6a4e1d9856d290468b44071f02fe3e2c0f0b3bd90f9c3ebe671abee9e18c24898777065a21adbd4794e8e64beb17c6d339b88cabe750bf3b3a9efb327d0
-EBUILD kstars-3.2.3.ebuild 2195 BLAKE2B adde3a59e6159cd1034c64ab700f71d124c7ac19c8d8efd11261eaa6909c468f75353c1a4b0147c80158108fd9a46819aabd99b8cca13c62c34babffe9c07805 SHA512 24b9198d06e3171ac6652b3210a44640ab93391377e88cf52d5c29a3df7f16dc19f52becdff125f57e6d366dec6cd535b8da01a7c4cfa8961efb87cfb64b4614
-EBUILD kstars-3.3.8-r2.ebuild 2561 BLAKE2B 58715f67ef2200b007e80e42e0469ec38db2ae4d590ed94a62063bd7b1b5632089504bd239d0d368b3351877dedad09ae26065bb12f7ae0ef1072e08b3354624 SHA512 71a4845567e9ef7928d2500420dbef5d1250ebc2f08c1da1bad6e8ee60a0acef1d2c1cb4214d6e431ad0859e8c135b52ed8bbc091ff08c405a9c6d698b794587
+DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
+EBUILD kstars-3.2.3.ebuild 2165 BLAKE2B 8e1734cddbd2ad9ef3095ec6e22eca86a6daeb15faef2d4bcff7213abd8eedab5a541408c1f75566763e5a9e6f8bf2384441d3ae295882a487f085739d79122a SHA512 5a52b90a603576b7936e9905e0fb75edeae7c4bc8280512b67840cf0c23114c214d829eded66dc119d548f5c45d349d291ee256bb5dcd349756547f38d1f9a9d
+EBUILD kstars-3.3.8-r2.ebuild 2531 BLAKE2B 6b6ffa9bec072790579c9786a1db18d84be4e31c9713a4879b0479fd0f460ae5662df52ff82af731eb52e429352907fd1bd997d60e7e3a0b13065deb0fe383e6 SHA512 7b49a6656b53b777f7d06ab0d7ed2e1617b7250599c89c58fe6d34252b5db94d202be475f9b899da8731f97d6973dc1ea4616e92f4b7f60e2985fee91ce6c7aa
+EBUILD kstars-3.3.9.ebuild 2532 BLAKE2B 4ba6158282de19076247a076b4592b9bdc4bcaa68b989968b619f9b965981538194e3f9be848208e7d4d045d38ed559a086289ba156d996ac433a84bb2f463ae SHA512 59c53a247c82e06ae15b35a8ff9bc24e904593e63ca1b9e3a32b5eb8ae4c13a60a29b5b89f4af55a1d11f5f0af68f26aa85a63cf80eb9c204f578947db352afd
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.2.3.ebuild b/sci-astronomy/kstars/kstars-3.2.3.ebuild
index 37fbdb6ba508..e0851ef4ce80 100644
--- a/sci-astronomy/kstars/kstars-3.2.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.2.3.ebuild
@@ -65,11 +65,11 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package password Qt5Keychain)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
 	)
 
 	kde5_src_configure
diff --git a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
index bcc1c779389f..11712ad2839b 100644
--- a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
@@ -77,11 +77,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
 		-DBUILD_DOC=$(usex handbook)
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package password Qt5Keychain)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
 	)
 
 	ecm_src_configure
diff --git a/sci-astronomy/kstars/kstars-3.3.9.ebuild b/sci-astronomy/kstars/kstars-3.3.9.ebuild
new file mode 100644
index 000000000000..027a65724d58
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.3.9.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kstars
+https://edu.kde.org/kstars/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio )
+	indi? (
+		>=sci-libs/indilib-1.7.5
+		sci-libs/libnova
+	)
+	password? ( dev-libs/qtkeychain:= )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
+		elog "${PN} has optional runtime support for x11-misc/xplanet"
+	fi
+	# same for AstrometryNet, which is not packaged.
+}
diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index 6477058637a4..fb5cf5e8317c 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -1,3 +1,3 @@
 DIST pyephem-3.7.6.0.tar.gz 739561 BLAKE2B a8129632514940e6d786dcc50d2dd0bd1fff2b76b9d59f88820c93cce3400f9b15c4f7418bc778ee5ad60a8909a970aaea5df62c5192fcb71f822b97abc0dc4f SHA512 c3013ef943c0e1e2c30bba6f72912efb100b4c8c45904b7d6d7ba73d8b741564793a6e538117eb88abb824c93c874e2c955de734418ebd2370888718a149c9a8
-EBUILD pyephem-3.7.6.0-r1.ebuild 1031 BLAKE2B e796c1a5fae20473dba9828777650de19219ed6381b348027a780db2430676044bbac0ffda7e6dca24a6567d42934e646d6510584a7df6649bdaacc8fd1b0998 SHA512 ecfd3e490b7751298f9a4e575d50f7181f27bc6d423ca968d1d87cf98560e5b5d8dd277cd72cb22406aa7a0ff44bde5b34d433a3bc8113e0015cb45dc992ffcb
+EBUILD pyephem-3.7.6.0-r1.ebuild 1027 BLAKE2B 8fb798eeafdad0a010ca277dd9af71a9c8110d45f536ad8e58ee11e0665b4906c5923cc80bc83734fbfead7bd38b40f41cda3afe103f1d95694e6ec6c22d17e4 SHA512 627d88cdba0ac29680eb72b5538d12f88d7b121ede7802e3cca7ff805ed48255cb0344ea6694bc4d8d7acc484ade25d571f901eadb2e900250fda31adc8bce7a
 MISC metadata.xml 947 BLAKE2B 0e586f2e978bb31b9ca757d2192a41e5a6e3414c7c29ceabddfb0ace9c9eb31ade32424701a9370665d69dd7cbeba567cdc9288cada621eb1d66b5a8a680c36d SHA512 f41c27b07f211b09dd72e316d02c46206dea0ff368e2ad1a8d116df49a2ce2a74137b2647572e295bcde34792d4ee15fb2d3f9e1a883c6cb306f6ef2a43d5c53
diff --git a/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild b/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
index b1e5535c3234..ac5f38c6854a 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Astronomical routines for the python programming language"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index a68141432a83..285c6f2b7773 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -7,7 +7,9 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
 DIST stellarium-0.19.0.tar.gz 309151408 BLAKE2B d5726762c402cebca47c7cb218a2edc918aceb11e4bf44f0473bf86a8bfc75b908467112e8ce797c90f9c1307884f853a24f919efe11e86ef04c9eb0ff356a3b SHA512 26cb44fe4280275ce64594d01bdded4ddd2cda5d21887b4329de51188cc392e8390036702ee316446dcdb54182dec5d217a387898c4c7aa82ce14742b4d4694f
 DIST stellarium-0.19.1.tar.gz 314373270 BLAKE2B 23f11005e2862c42abefc37d997c875bbed379e8182dbc533f24f303200791dc4c069adc0e290b2faa630a0fc058b7060bc3715714bae37a89ff5820b86d21ed SHA512 59ab715f7b81e037ed3d23444547dcd00a41b9a1925d58b40a17372e286bbea2c1b762582cd7e1f81d690204840cc23dd9627e2c0bd4abf52367a456849eefe9
 DIST stellarium-0.19.2.tar.gz 318402838 BLAKE2B cee07bbb2e4a124912dc383e1d43007912498793c3609de05caf3b6673d01ccfcf0b560cb879bf47d6b00c7ce6b10810a17189f38fdac55e02dc496e194269b3 SHA512 a0002dc8a1e43aa264cdf013b57362880d4809207a1f867285d3e1187c4c88c67d166652afe0edeec5a98eff1167e6c3693594d467605ba78ee29d6eb7878d4b
+DIST stellarium-0.19.3.tar.gz 326218851 BLAKE2B 286d2559a2152f030640ed88778f57f1213d0d8b9e990d0aa1ad5138396fe9641083ec76554e1296dc79d914955e289d23046af42299df6217bbfbaca76b2f18 SHA512 c2948603a3b84fd2b7002cbd9993a2432ca0908d9236aca03c03ff0cf0706728a407218096e94da2b2a623b5434c109906d94ee5069a2d57a8e35af7c8455ff7
 EBUILD stellarium-0.19.0.ebuild 2331 BLAKE2B 722d7b4f5c954371691dcd19269d7f88d13f6686a88f58433dfb17fcdb126fe8b3784df202c1ca47bc795fa51948a07d9c427786b46da4677b8c1de001d9d058 SHA512 31992eb7fbe77113995beada712bb16cef0901a53daf566588146fff5472845eea2d6b78e33432e5d63dd14c97f7b10ba8863860cf40ecf3c3a0f64873b8266b
 EBUILD stellarium-0.19.1.ebuild 2265 BLAKE2B 771e9a62177396dffc9cfa8cd61bf76f59e609e4e72f22d210c66e653597cdb0b45dc0eb841aaf3ac345c1258c31298dc1f1c344d8ce9dd8166e3bcc021c0012 SHA512 0f4c2619c126ed46cbbb7da226a6b0a0856a07b1387fcbf9427cde6fa7d2b79ee41323f4c59cd66c8cf689dec3d45389974877006c36d7e1b9fe206346a4d4fa
 EBUILD stellarium-0.19.2.ebuild 2266 BLAKE2B 2ba0e1361e739b447ee3f5c3cddaba8edcedc3ad0f484b1a559a86fd7679195007ed7dbffab0944a4d13f351e82787ff45bb1bf97898810d4372e3881a484c48 SHA512 d8c216fe662f7a414119719623ca1bc7447dd78c6f8bd8899dd5a8239e4c09a5819157c680bfb44f2a0c8d9c01b48a11578d923fdb04de5309a398be31dc7a33
+EBUILD stellarium-0.19.3.ebuild 2232 BLAKE2B c1361b4194d0f838fa3b46f79854ec77ab415fad392c6b0ad19c77f9a7bf8f965101c2526c8b88e72d9b5c4cdc8f4795b588ea025887f0ad0f6444d1d33cabe5 SHA512 469ed98be0cd3637c5b77b22e81db860cfe503c03b60c414e7ee9ca63bf9ca2fa63d6eac68163052b13b2cbedede72ac9c85ed5f09c4ed0d02e4bc8a339022af
 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/stellarium-0.19.3.ebuild b/sci-astronomy/stellarium/stellarium-0.19.3.ebuild
new file mode 100644
index 000000000000..1fd17ed145a1
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.19.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop flag-o-matic xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://www.stellarium.org/"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+	stars? (
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug gps media nls stars test"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtserialport:5
+	dev-qt/qtwidgets:5
+	media-fonts/dejavu
+	sys-libs/zlib
+	virtual/opengl
+	gps? ( dev-qt/qtpositioning:5 )
+	media? ( dev-qt/qtmultimedia:5[widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/sci-astronomy/wcstools/Manifest b/sci-astronomy/wcstools/Manifest
index df906826c196..3fd0bb1c24e2 100644
--- a/sci-astronomy/wcstools/Manifest
+++ b/sci-astronomy/wcstools/Manifest
@@ -7,5 +7,5 @@ AUX wcstools-3.9.4-haspm.patch 603 BLAKE2B 1d224755840efdfbb3a0e2b05f41cbe53e29f
 AUX wcstools-3.9.4-spelling.patch 8559 BLAKE2B d810aa313cd2bbaf015a4ee383a7c049415a87a44d1802b7e21840bc5a389eab0fde3375b086e6702df4e278aea330485d7080101404bbca47f97eab20a64b60 SHA512 d8065c8619ceddc879a0fe0fa55e0ddd6eff504eead917a2a7009f83151a7618c0e74cda8a58e4ef5206318806afd35792cb605dbea74e8f4a77b2a67bdcf9a0
 AUX wcstools.pc.in 304 BLAKE2B 5096b6beaa1a21e927f3b3244155869e4d896e2254334180b9ecf7ff01f290b97d1925e2cf26511dc03a37ca45ec066afc59dffc96e0c536b6fcd8b3d7d45edc SHA512 bfa61066f0a6993f0848925b40ba35fe02e444c37b5cd9b02c99c5d331566fa21165858c53ffb9a9cdc2461ad096b87c8bd53e8eb9c13bab8f4404a5fe6f2d90
 DIST wcstools-3.9.5.tar.gz 8538612 BLAKE2B 79e1c544408595a3147c7a6c4e86ca18f8a1851b8e036fa87e34d1979cbb04e9fe13db1a3ec8b18689a00d726d85131cd2c90add5e2685f80a8dcb5b20981065 SHA512 aa48081b6f5dc12ed8d64eae5275c27aaa279856f588a3eb429ec0a4943dc482788cb7f84820233f0e2ee4fefeda7ab9bb85c4513a9942c48f5d97a0bde1581d
-EBUILD wcstools-3.9.5.ebuild 1714 BLAKE2B 5d051252d6b7f855453820c5ec427b11d33c504b5afd07dc91353106605272efcf1e832fa073146fa37b8f2401ae6440111ccdd6a769807210a7c7be1d1bfa40 SHA512 2770b2a10393d265bf30963db92730f6cbd394db39126e0613d31d5cabfcd57eb374875886b65e65f8d7edbe9c652c13fbfa6dd6e200fce7ef4cab90b9847bb8
+EBUILD wcstools-3.9.5.ebuild 1747 BLAKE2B bd2c0af6e7b5e718561641d4f2d0cb0840d2d09efb450a7edbcee0bf75ff766dfa698942b14db23ac5eedcf8c8a7258684df5f03462033126683e9a55cbeb532 SHA512 5320f503d6b7de1f41f97133f018c3a3248179bc875511b89af0c5052ffe74c573d46aff4387ee49052868d89450132c93b9f5d64a69f698ba103b4ea1b69652
 MISC metadata.xml 945 BLAKE2B de40a336da6526b187714bd76cbad1c86fa1c13659c1baeb289ebd3436e27b685557c2759bb4e75ec7575548720ae69e56f53e915a1c31e72d623076c14c7811 SHA512 a7ce13b0c153e0fd4702d7ec3028e1364c55c22be9fefa3d94532c9f8713fd739c138beccf1be1f18699ac8da22e38959ad3d34d5de7bc5cb9879849af80e979
diff --git a/sci-astronomy/wcstools/wcstools-3.9.5.ebuild b/sci-astronomy/wcstools/wcstools-3.9.5.ebuild
index 641bebc84fb2..10343816cfe0 100644
--- a/sci-astronomy/wcstools/wcstools-3.9.5.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.9.5.ebuild
@@ -7,7 +7,7 @@ inherit eutils autotools
 
 DESCRIPTION="World Coordinate System library for astronomical FITS images"
 HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://tdc-www.harvard.edu/software/wcstools/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-astronomy
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)