gentoo resync : 22.01.2021

35 files changed, 156 insertions, 1077 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 369cc7ffe90e..67e86a0d55e3 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/casa-data/Manifest b/sci-astronomy/casa-data/Manifest
index 5ca71cdf9985..63d417a9ebe5 100644
--- a/sci-astronomy/casa-data/Manifest
+++ b/sci-astronomy/casa-data/Manifest
@@ -1,6 +1,4 @@
-DIST casa-data-20160222.tar.Z 12333481 BLAKE2B 59f76c10b40e8ef5476f6adf7a10cc55c9268d4fbdf82b608ab9cc8370b528aa092890050195d12a4d4486c275b43fc0dc84ad70e7067b8af675ddb67f0aefb3 SHA512 4b246b163f9754587b2d917db050ab3fa5e661f27b4a5a879d60abee4132503ce700c2d1b1a88cd5cf96a3c093cb3b9489b2b31781f7084ed0d9bd5a4bcbdd6b
 DIST casa-data-20170703.tar.Z 12421015 BLAKE2B 324dd4174f80bdf192de0ec8c12125304a9dd85b6bf64b4386053ec65bab4aa98417bf69f38eae64e4bfacfa4a6479cc6fded13fd0c8edfcbd3eb8aec537c815 SHA512 dc0de856da4146ed356fbfcb522b427bb6a66fb08affdf0bfe803b21305ac37eff9b1790ede58acc993df2f22d620982f10b42f631457258d1620702c10d87b1
-EBUILD casa-data-20160222.ebuild 514 BLAKE2B ce77f91231ce6c8f35dd22ac1bda371bcc3856a3872ac3183d6fa8f1c39784869d612a5736e26d459bfb981681b3fc293c428aad8e4bc532bf87da4dec43ef34 SHA512 5a792afbfd5d7e2429ab5fdc639b46916f4f09039ce6161194d350ebb941f02ce1da94e7ed50fb7926c99aee547712510fae938a1d4ceace9795a9dd67e0672c
 EBUILD casa-data-20170703.ebuild 514 BLAKE2B ce77f91231ce6c8f35dd22ac1bda371bcc3856a3872ac3183d6fa8f1c39784869d612a5736e26d459bfb981681b3fc293c428aad8e4bc532bf87da4dec43ef34 SHA512 5a792afbfd5d7e2429ab5fdc639b46916f4f09039ce6161194d350ebb941f02ce1da94e7ed50fb7926c99aee547712510fae938a1d4ceace9795a9dd67e0672c
 EBUILD casa-data-99999.ebuild 558 BLAKE2B b70fbdbec8cc06872a390727d53be66240618c9cf8ff6b19f2c3604ec6ce18c6d53b62e5707dd89a6bf1f486b20b1a2cac8da34f0af92521db1ee6c3fd2e9cba SHA512 86a12f924c9fa7a5efdc0b04b7b59cf4f848f6456961a6309e24de6887bc97821a7a2f23e7eaf67b26b9179355de102274ecf8e9cd0fd264f3b09f41e4b9d86c
 MISC metadata.xml 524 BLAKE2B 2adff14c67dbaf70f078c08e8cb3a4c2236e80063d023b1ab5df15577e2bd2c33d1c3a6b6c29019a76b426a31e55a573bff07c26fb8a261244a1084f9f2a4aef SHA512 fca5391c7f86dbbbaafdb03a23218b36d039603e66f68f9b3c7da2e51782ca9855c7784f8ea87729bd8de7eeb7cf901893becae8335159e76154b88aa289457e
diff --git a/sci-astronomy/casa-data/casa-data-20160222.ebuild b/sci-astronomy/casa-data/casa-data-20160222.ebuild
deleted file mode 100644
index 78279ca3163b..000000000000
--- a/sci-astronomy/casa-data/casa-data-20160222.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYPN=WSRT_Measures
-
-DESCRIPTION="Data and tables for the CASA software"
-HOMEPAGE="https://github.com/casacore/casacore/"
-SRC_URI="ftp://ftp.astron.nl/outgoing/Measures/${MYPN}_${PV}-000001.ztar -> ${P}.tar.Z"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/casa/data
-	doins -r *
-}
diff --git a/sci-astronomy/cdsclient/Manifest b/sci-astronomy/cdsclient/Manifest
index d8052f6f831c..d5833e623c9d 100644
--- a/sci-astronomy/cdsclient/Manifest
+++ b/sci-astronomy/cdsclient/Manifest
@@ -1,6 +1,4 @@
 AUX cdsclient-makefile.patch 3036 BLAKE2B 6a1b7c794efec567b53953b7a7fdb8790d8f1a9bb3dd8caa0a9f96f96d855d21f45d3023500be1c161fe7779281438c0bf076fed5c20e13426c03fa1067fd4f7 SHA512 410538e4afc03fdb6f0f3e3bc929620a3ec15ea7694b95c1fffbba8a0c289393d1c6a33dde919c6831ddc8ebbb335a74d447e781efac80c507c050ad07fe86cd
-DIST cdsclient-3.81.tar.gz 122719 BLAKE2B 4db50f2552e4379797d395b272eb2dbefd4b16b9b6acd459fc306738c600b1e86370f7720d6927c36b1504d3e4d316b08ae642756a7a29c9b07aef75df48369c SHA512 3fcf7a902dfddb3583ff34eedbcddd6a5641bf9c87d234159090378436ac370313ea311d3fee6e202ee84b3fe4065ef45a46a15b5d996e05afd1418e617c20ea
 DIST cdsclient-3.84.tar.gz 119585 BLAKE2B cf5d7fe3e7a1f4985949b8621122157178b856e82415e6bf12a582c67e6748bf9eb75209983baab9051919817b373b198748cfda5a1e4733784a9b98ab7659ff SHA512 2d7abf0079189b9dd19cb8919061445fd19ea9f7dfd54e8ceee26b743218cf62ab00eba0147abe82d9294223927f04b4cc3328620dfc9184a7049f8d515b29e4
-EBUILD cdsclient-3.8.1.ebuild 948 BLAKE2B 5303e78f63d6ea719a5f8c4892920a41bba228687fa45cde994a99ce17a6f96c880f7da1f8eea82c1b865225e829abedac277791739c96728b6e3d550988d5b9 SHA512 07f12a9a124c3431a90d5e3400f144176ed2c4664ebfd58c8686904006892e95680f618609cb91b06776efc92ae99fd48e98eea87b816348c598bf8f1367d880
 EBUILD cdsclient-3.8.4.ebuild 948 BLAKE2B 06da9fbb1c73b9e4613bbea1326797a8f7ebe9ab165579e562eaa0c33818b1b7d73a57b250b9ef66445c47d1825c1d9270a58cca5abb4f57b829391870bb035e SHA512 2b75245e0f73317684e96463f95d0a0cafaff982eb2043264768cad9946a81cf95ada9c8502d0becca8d6f2ff0993b8d774b03dfa5f5b2453e886dd1cb0254d9
 MISC metadata.xml 578 BLAKE2B 26cba9a442f606d96f9551ccbbb90fe6465fbdad494b0150616bfe9d6b32a719e3d8234d330e10dcb68d88e9fface27306a5d25f388483c62782f45c169bf847 SHA512 9a1f845e174c9064411e4913366cb441b8188d6e72d4a97bc2260138d5645367abc426bdc642aefa3b041a8c90a27ca90223570570e3295d685eafb200a3d8b5
diff --git a/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild b/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild
deleted file mode 100644
index 4ca690324256..000000000000
--- a/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator
-
-# upstream versioning wrong: 3.71 is really 3.7.1
-MYP="${PN}-$(delete_version_separator 2)"
-
-DESCRIPTION="Collection of scripts to access the CDS databases"
-HOMEPAGE="http://cdsweb.u-strasbg.fr/doc/cdsclient.html"
-SRC_URI="ftp://cdsarc.u-strasbg.fr/pub/sw/${MYP}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="mirror bindist"
-DEPEND=""
-RDEPEND="app-shells/tcsh"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
-src_prepare() {
-	default
-	# remove non standard "mantex" page
-	sed -e 's/aclient.tex//' -i configure || die
-}
-
-src_install() {
-	local bindir="${EPREFIX}/usr/bin/${PN}"
-	emake DESTDIR="${D}" SHSDIR="${D}${bindir}" install
-	cat <<-EOF > 99${PN}
-		PATH=${bindir}
-		ROOTPATH=${bindir}
-	EOF
-	doenvd 99${PN}
-}
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 23b9176d214f..b573b55ec858 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -3,6 +3,5 @@ AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475
 AUX celestia-1.7.0-cmake_lua_version.patch 287 BLAKE2B 29a555fd2443ba4c20508566a909cdcfe47b3e2ca8fea68d9fdc5427cfcdbd332c3179f3ea090c076d20cd36ec694b7cbef3008f87407ba4af7c6ea311853e24 SHA512 f1ae5eb360399d817c90b2ab058452f55f8fdc293568bd9b919cc2d71586da9146db2131abfd54c2c7dc9cb6230728e8435f7663b7125d8caaebe241aa8a7e72
 DIST celestia-1.7.0_pre20200316.tar.gz 69459012 BLAKE2B 8e718e8a4aa064b9be0bd5f0f1c034f3ffec42671c6eae503216f5ea2787e8c5da3315e3cb39e94e2a0eab5f067e189fe70dc9d04bff4127e9e39fba3a7117ae SHA512 db4213e1d76699ff01390f12e3763596dfd2641389743c27221b4e7934be9daca7a884dd389135894d225e8613830468ebede5664543e27e44e21e19d22d1e7f
 EBUILD celestia-1.7.0_pre20200316-r100.ebuild 2994 BLAKE2B 66941e8e98b5d483afb8bdcab2e5ea1ac0aa9cf24881be3075e9acaae4cff8c0345be21ed98d97d819a7d1cf836287f5e4e332b9aa09e34265aa8c688821a6e8 SHA512 1416f35668656810c7f32f53587050d4e692c084c3a3bca1b0c1fce37875b1385c046ea3c8615700f7460abf3c45a1a6ef6933c9778009d0fae8cbbaca4c1b1a
-EBUILD celestia-1.7.0_pre20200316.ebuild 2486 BLAKE2B e7d8ace8e1fa3811cf95207ac45478cdc89cd84a9ec341e982564d000053214b5acdddb3b6d0b6173d5ed92dafc08a2b3ca326cc07db786b91c72efe181d49e8 SHA512 3062453f7e369f4af4afb04018827b247c2c16f0759912ca27b4ddb39a90c5a097c317855ebe0e71d58ca3442ed1a2b5e950d67144967de9196bbe95487742ae
-EBUILD celestia-9999.ebuild 2994 BLAKE2B 66941e8e98b5d483afb8bdcab2e5ea1ac0aa9cf24881be3075e9acaae4cff8c0345be21ed98d97d819a7d1cf836287f5e4e332b9aa09e34265aa8c688821a6e8 SHA512 1416f35668656810c7f32f53587050d4e692c084c3a3bca1b0c1fce37875b1385c046ea3c8615700f7460abf3c45a1a6ef6933c9778009d0fae8cbbaca4c1b1a
+EBUILD celestia-9999.ebuild 2689 BLAKE2B 444213c5e24b16a889204e6aa00755c2b49cad6b5b124a2b39bf9aa4532389137440c19cffcb206ee59677ebc779669cc788f19c1eddccd431a8341339356182 SHA512 ed412e7b30d5a3b1e05cb1c52ac470ccf150f7c7c92d2022ca507fe4cab690af8a25bf24b8e4fa56f9a968637126187384965792c79149576e06f98b949a826e
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
deleted file mode 100644
index a5fe892dd0d3..000000000000
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		COMMIT_ID="df508a0c597a3d96c1c039fa4a973e294021cfba"
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT_ID}"
-		KEYWORDS="~amd64 ~x86"
-	else
-		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
-fi
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="glut lua nls +qt5 theora"
-REQUIRED_USE="|| ( glut qt5 )"
-
-BDEPEND="
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	dev-libs/libfmt:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	glut? ( media-libs/freeglut )
-	lua? ( dev-lang/lua:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# make better desktop files
-	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
-	# add a ~/.celestia for extra directories
-	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	### This version of Celestia has a bug in the font rendering and
-	### requires -fsigned-char. We should be able to force this flag
-	### on all architectures. See bug #316573.
-	append-flags "-fsigned-char"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CELX="$(usex lua)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK=OFF
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WIN=OFF
-		-DENABLE_THEORA="$(usex theora)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	local size
-	for size in 16 22 32 48 ; do
-		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-	done
-	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
-	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
-
-	use glut && domenu ${PN}.desktop
-	if use qt5 ; then
-		sed \
-			-e "/^Name/s@\$@ (qt5 interface)@" \
-			-e "/^Exec/s@${PN}@${PN}-qt@" \
-			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
-		domenu "${T}"/${PN}-qt5.desktop
-	fi
-	dodoc AUTHORS README TRANSLATORS *.txt
-}
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index dd539877e827..44ee4d4b3d16 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,8 +59,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	# make better desktop files
-	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
 	# add a ~/.celestia for extra directories
 	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
 	# allow forcing CMake to look for a specific Lua version instead of the newest branch installed
@@ -88,7 +86,7 @@ src_configure() {
 	)
 	# Upstream always looks for LuaJIT first unless stopped, and we only need
 	# the version specification when linking against PUC Lua
-	if use lua && ! use lua_single_target_luajit; then
+	if use lua && ! use lua_single_target_luajit ; then
 		mycmakeargs+=(
 			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
 			-DLUA_VERSION=$(lua_get_version)
@@ -100,20 +98,13 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	local size
-	for size in 16 22 32 48 ; do
-		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-	done
 	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
 	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
 
-	use glut && domenu ${PN}.desktop
-	if use qt5 ; then
-		sed \
-			-e "/^Name/s@\$@ (qt5 interface)@" \
-			-e "/^Exec/s@${PN}@${PN}-qt@" \
-			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
-		domenu "${T}"/${PN}-qt5.desktop
-	fi
+	local backend
+	for backend in glut qt5 ; do
+		use ${backend} && domenu debian/celestia-${backend/qt5/qt}.desktop
+	done
+
 	dodoc AUTHORS README TRANSLATORS *.txt
 }
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index 1feb6daa403f..73922635d31c 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -1,10 +1,4 @@
-AUX cpl-6.1.1-check-shared-libs.patch 1010 BLAKE2B 8d98b36143985b7c24a92f68e7c1d7845fdfa74b48801df381bba7d015eb2e0c8a110e74cebb4d887f180fd0a47756324257c71d5f8ddf94bf83d182f13f34ff SHA512 40d060e441222328e92508eef25fa50eea37600d4bfb9f422d47e5cafac115a9e82994ff74e3ca17124b5b83d8cec19b2f681709dbfc1ec975841a74fd273903
-AUX cpl-6.1.1-use-system-ltdl.patch 1296 BLAKE2B fcc6d5d6f5f3b3bf5f00ff69ca95b9490e39817826d98e0789ae9dfbe7c34de97875e510d07f93591e7a8acaf00268bbb1dd3d60151c6cc68e989bcf506b7785 SHA512 bfa2d0f6cadcf7e817314a6a3d587f99b298ea7f1fd919f5c7ef6a4a133a631da7a039f77f572918029ee8284d025a808ff3851112e5836ab824afa5e519ac1e
 AUX cpl-6.6.1-use-system-ltdl.patch 1005 BLAKE2B e5c6024e98b9c8fcded2b1d3a40b7ba89b11dc74fb125e5d13bb3926f39cf32b3d5bcb15d5df06a68843bcef36ae827bf512ba957e2923a738e7b82d0b36568a SHA512 bd3c517245f8d2fb29cc68bcc1f4bad3d0fd5d8c2b3673b0ddbcec5b12b171527109ba3ad2bb2961d37c921ddb11876d49e698199c7360ad907c0ed28245404a
-DIST cpl-6.4.2.tar.gz 3165143 BLAKE2B aaf36e15e88ece67cff74fb086054281bf283b7bbd9bfe163a73be6fe60c16cf1cde030f3d0cfd0d088de02b8e6f0ee182c8c809d3072e0680421a57797c5dbb SHA512 636ce549f23862a111fd88e97878eff8b86c88e8e2e800533b2f34f219f6b6ea3f03bd9de6ce9606c3787d0a61fb66a6bd92087d24c57c47e5a26e31eb362a11
-DIST cpl-6.6.1.tar.gz 3082051 BLAKE2B 748b6336021141451f520a27c295f9df6d23eaa1008b9325b74dedcd844d586869bccaa70c9663549c5cf9d498e6d326d1ad8fc9a2e53b05f975c037ebdfbd84 SHA512 261cd092b3d0f1865f2e1aca0760232497cfe85b92f61601b22d81619147cad17c427791adad5a863acb3febcfe78590c8f8d10de1d626f4b90302326f936064
 DIST cpl-7.0.tar.gz 3090767 BLAKE2B bb1f6dcc35c1e2f574a6e008af2461a3832cfbd742bcef7ce9ff151d7fd7157ecc34b6efb75dcf3fc77e41ae20d7d14f229da05351712c3214f9da4814e0f5e5 SHA512 d79eb37a5f29740edc1736815bde6ec31bc4e1f648552cad48ab70626170ff6195d226de0c198e0287dee3bfe815ee7302b6882395d710c534fabe0c5353aaa6
-EBUILD cpl-6.4.2.ebuild 1732 BLAKE2B ea4b6a49fc0a092197b1fbb2cc6b8b5ffea73b8c30536edd17a11bc3e95d07bd3fa4dfc434ee5b33605d6179846c916744e0b3b7704b23f52be63b942055aca8 SHA512 66fd2ae2cc074834f7fe15d084171bdaab8974467f2638eaf1a3fbf503218d340a91da44a249c12a83e6e052ac15d33dde63801ad44ca4faf7d126d287e7abe8
-EBUILD cpl-6.6.1.ebuild 1629 BLAKE2B 2af7edf832f3a4b5010deeb5c4fda3a2bb8c60561db78001f4cf3ab09c68a6f51ae5dd7564368ac7a7d85451d3e28ca6c73c0d4ecbe5c2e3a39d14efc5a0e899 SHA512 293dacbfd0c39f1aacfb0dbe57b03052ea69bcc7cfc7ab66c0bd280623973f596a679bc9536ff953c7aef358cceed0bf84127d15c15746e1e47008d78e4f0aa1
 EBUILD cpl-7.0.ebuild 1629 BLAKE2B 0f3c374760b6db5c87c4769bfae4191b515ca76ef03f81b611a303380f80184f3ed20440da242e149bb44fd51aa01cf52392648f8a14e6c7b02e54ad7e3d6492 SHA512 542689f9aba4e49a9d3d50eca6150a0a08ae8f494454683a8a99ad49c5a511239ed955c7823ee76f2f8dc73d9ecd1d945c86a43f2c98ca4833cc0f062d8893e1
 MISC metadata.xml 1076 BLAKE2B e69663d74885ae7197c12777a4f200b1727c165739883c66134ba88c9a6e137b482028160b6daa6421ec3e36315ff793893d7d2f57568569d9c774764bed3df5 SHA512 5c4f45f0c1ee32b01b5f04ec5cd7ae1721f9dc21e9b9027a5001f0f034a04efed71dbf4a3f30a1b6070f45c9b0f08f71926f63aaf3ce4c38c9b2a53fb50b9278
diff --git a/sci-astronomy/cpl/cpl-6.4.2.ebuild b/sci-astronomy/cpl/cpl-6.4.2.ebuild
deleted file mode 100644
index aba6a36645b2..000000000000
--- a/sci-astronomy/cpl/cpl-6.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_OPT_USE=gasgano
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils java-pkg-opt-2 autotools-utils
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	sci-astronomy/wcslib:0=
-	>=sci-libs/cfitsio-3.310:0=
-	sci-libs/fftw:3.0=
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
-	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
-)
-
-src_prepare() {
-	# bug 422455 and remove cpu chcking
-	sed -i \
-		-e '/AM_C_PROTOTYPES/d' \
-		-e '/CPL_CHECK_CPU/d' \
-		configure.ac libcext/configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-ltdl-install
-		--without-included-ltdl
-		--with-cfitsio="${EPREFIX}/usr"
-		--with-wcs="${EPREFIX}/usr"
-		--with-fftw="${EPREFIX}/usr"
-		$(use_enable doc maintainer-mode)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo html)
-}
-
-src_install() {
-	autotools-utils_src_install all $(use doc && echo install-html)
-}
diff --git a/sci-astronomy/cpl/cpl-6.6.1.ebuild b/sci-astronomy/cpl/cpl-6.6.1.ebuild
deleted file mode 100644
index cd2588164670..000000000000
--- a/sci-astronomy/cpl/cpl-6.6.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_OPT_USE=gasgano
-
-inherit autotools java-pkg-opt-2 ltprune
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	sci-astronomy/wcslib:0=
-	sci-libs/cfitsio:0=
-	sci-libs/fftw:3.0=
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.1-use-system-ltdl.patch
-)
-
-src_prepare() {
-	default
-	# remove cpu chcking
-	sed -e '/CPL_CHECK_CPU/d' \
-		-i configure.ac libcext/configure.ac || die
-	# search for shared libs, not static
-	sed -e 's/\.a/\.so/g' \
-		-i m4/cpl.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-ltdl-install
-		--without-included-ltdl
-		--with-cfitsio="${EPREFIX}/usr"
-		--with-wcs="${EPREFIX}/usr"
-		--with-fftw="${EPREFIX}/usr"
-		$(use_enable doc maintainer-mode)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	econf ${myeconfargs[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake html
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-	use doc && emake install-html
-}
diff --git a/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch b/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch
deleted file mode 100644
index 658f2eaefb9e..000000000000
--- a/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Check shared library instead of static ones.
-bicatali@gentoo.org
-
-diff -Nur cpl-6.1.1.orig/m4/cpl.m4 cpl-6.1.1/m4/cpl.m4
---- cpl-6.1.1.orig/m4/cpl.m4	2012-06-04 18:38:01.000000000 +0100
-+++ cpl-6.1.1/m4/cpl.m4	2012-06-04 18:46:37.000000000 +0100
-@@ -8,7 +8,7 @@
-         
-     cpl_cfitsio_check_version="$1"
-     cpl_cfitsio_check_header="fitsio.h"
--    cpl_cfitsio_check_lib="libcfitsio.a"
-+    cpl_cfitsio_check_lib="libcfitsio.so"
- 
-     cpl_cfitsio_incdirs=""
-     cpl_cfitsio_libdirs=""
-@@ -668,7 +668,7 @@
- 
-     cpl_wcs_check_version="$1"
-     cpl_wcs_check_header="wcslib/wcslib.h"
--    cpl_wcs_check_lib="libwcs.a"
-+    cpl_wcs_check_lib="libwcs.so"
- 
-     cpl_wcs_includes=""
-     cpl_wcs_libraries=""
-@@ -900,8 +900,8 @@
- 
- 	cpl_fftw_check_version="$1"
-     cpl_fftw_check_header="fftw3.h"
--    cpl_fftw_check_lib="libfftw3.a"
--    cpl_fftwf_check_lib="libfftw3f.a"
-+    cpl_fftw_check_lib="libfftw3.so"
-+    cpl_fftwf_check_lib="libfftw3f.so"
- 
-     cpl_fftw_includes=""
-     cpl_fftw_libraries=""
diff --git a/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch b/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch
deleted file mode 100644
index a0c23a75d38c..000000000000
--- a/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-use system libtdl from libtool instead of bundled one
-see http://www.flameeyes.eu/autotools-mythbuster/libtool/plugins.html
-bicatali@gentoo.org
-
-diff -Nur cpl-6.1.1.orig/configure.ac cpl-6.1.1/configure.ac
---- cpl-6.1.1.orig/configure.ac	2012-06-04 18:38:01.000000000 +0100
-+++ cpl-6.1.1/configure.ac	2012-06-04 22:14:23.000000000 +0100
-@@ -60,8 +60,12 @@
- AC_ENABLE_STATIC(yes)
- AC_ENABLE_SHARED(yes)
- 
--AC_LIBLTDL_CONVENIENCE
--AC_PROG_LIBTOOL
-+LT_INIT([dlopen])
-+AC_CHECK_HEADER([ltdl.h],
-+    [AC_CHECK_LIB([ltdl], [lt_dladvise_init],
-+        [LIBLTDL=-lltdl], [LIBLTDL=])],
-+    [LIBLTDL=])
-+
- AC_SUBST(INCLTDL)
- AC_SUBST(LIBLTDL)
- AC_SUBST(LIBTOOL_DEPS)
-@@ -131,7 +135,6 @@
- CPL_CONFIG_FUNC
- 
- # Configure subpackages
--AC_CONFIG_SUBDIRS(libltdl)
- 
- if test ! x$"cpl_cv_with_system_cext" = xyes; then
-         AC_CONFIG_SUBDIRS([libcext])
-diff -Nur cpl-6.1.1.orig/Makefile.am cpl-6.1.1/Makefile.am
---- cpl-6.1.1.orig/Makefile.am	2012-06-04 18:38:01.000000000 +0100
-+++ cpl-6.1.1/Makefile.am	2012-06-04 19:07:41.000000000 +0100
-@@ -25,11 +25,10 @@
- DISTCLEANFILES = *~
- 
- if GASGANO_SUPPORT
--libltdl = libltdl
- cpljava = cpljava
- endif
- 
--SUBDIRS = $(libltdl) $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
-+SUBDIRS = $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
- 
- HTML_SUBDIRS = 
- 
diff --git a/sci-astronomy/erfa/Manifest b/sci-astronomy/erfa/Manifest
index 22ef6d802344..3a55b3fb58d3 100644
--- a/sci-astronomy/erfa/Manifest
+++ b/sci-astronomy/erfa/Manifest
@@ -1,7 +1,5 @@
 DIST erfa-1.2.0.tar.gz 305668 BLAKE2B bfaaca9203f25fbffc25723803d7d492f83c670cac7ea86e6ae15fc6636441ae7010208e8780ecc3133709a06b89b7d2218d1793b159d0be0c0694ab3579b958 SHA512 ead7a44b69048242cba34b0ab419eb97a1bcce6930d5834f5f00c8cae4cb331ee068cece08e51f918f7bd8eaaeada054006377876db01f7b7b4e86c26f17d311
-DIST erfa-1.3.0.tar.gz 640176 BLAKE2B 16da4c9bfb650fb54d0232ac111642f3fce732b663a3ab011a7d22755ce802c63c917c521844abb2c460b5cb19ecb87465bccac47ac770a117ea30388168c827 SHA512 c8dc110e2d581d7de79d0406fb5873201a795e1d7ce8dcf642125082d78d1cb00dd3fe44b76e1b7249014314abd840ad24615ad9d13cd447505af2271c1f31bd
 DIST erfa-1.4.0.tar.gz 641051 BLAKE2B 448f9f883d85a3c39a58497c6211542719c77b05b6bf4087519b710642c144939a9e27ba44b82a42d759dc04e1effe9833ae087487292846f954e6c3f93fb8db SHA512 2befe5a45486dbbd2ee88229cce7a6101462254bd346d3a2859e294f31119eb5cf5e4113e4061fa3e371216ed793a79ea1ba98fc6fd8aa53d2ba4170e1e135e2
 EBUILD erfa-1.2.0.ebuild 439 BLAKE2B 75a63b0f889bcb7e67c1ab947a274ecdaa0a5ee88f438e5c9386a6f8641db4fb007e3449a272cfc28e96f76e24f3f6a5349a70c1d158e8db5d7e99793d5e73d1 SHA512 55ded11281e74b6e25bfd7ca17ced9f523500e1aa5134ea9559bf1200554800c3514428c92b3f9ee6af2cf4fb1307d3559f09c91efbe41909aeac9d7f6d474bf
-EBUILD erfa-1.3.0.ebuild 578 BLAKE2B 97f5c6bf290f1c0666fe6b57ef609a21315ae8b7785560d7ccdd3bbcda4086484e7d1d5a8679a4beb6b067f5ca65e36b14a64e5d6a6b5fd053fbe294d53fa7e5 SHA512 a7bac8cf9b3f73a658b3105a81f7b1584b7525360113bf31b7be294c5356545b5dfd5bcfde3debfbad8bf030bd495ca07387cf92bfd6d7c0c8b713dc5bd27305
 EBUILD erfa-1.4.0.ebuild 577 BLAKE2B 01317e27499de850a5907329ada90e08afa89885b7e95a94e9b06a1c65f63caf7f8d1d61af28c5c3be41df58bbabbcd1b062b2c598ba3b141f85dd0d66b52690 SHA512 3409a3f74ffbe91d9af70b2b74d4eeb982ad72263a6016d5007ef2e4ff83fba66a245f562329a03c52d25f0211473e2530989d0e1d6688ca9f1c28004f716fa3
 MISC metadata.xml 600 BLAKE2B 86aee919c5c10a5fa7dfe50d3ad321826e3690bcd1bed001bb9e727816214d1acacb89e4830ab9335cf97a02254fb980579ff8817ca792f29676ed532fc721b9 SHA512 f217013885b91c2827c44a0e138ac23e44b6ff39ee2b420ccfde859d34ea16f8d94c97bd125b0151efb41990011d623727ae9c7c3963d443c16a9af15eba1c29
diff --git a/sci-astronomy/erfa/erfa-1.3.0.ebuild b/sci-astronomy/erfa/erfa-1.3.0.ebuild
deleted file mode 100644
index d4ae6c398f78..000000000000
--- a/sci-astronomy/erfa/erfa-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="Essential Routines for Fundamental Astronomy"
-HOMEPAGE="https://github.com/liberfa/erfa"
-SRC_URI="https://github.com/liberfa/erfa/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index 610b4bb66d1b..636d42ad2f7a 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -3,10 +3,6 @@ AUX esorex-3.10-remove-empty-configdir.patch 400 BLAKE2B e67c8a6d5cb573db67e232c
 AUX esorex-3.10-remove-private-ltdl.patch 1053 BLAKE2B db1e85fbef344484f308b1d55460e25d5ffddfd648a7220e6eaff3b330189353f7c586c5b467c947a65240cc23be18e3e2b0996bf1fa92a84cf8581f37493326 SHA512 039e6147d6ccb08cbde344ca21628e03bc039bd16ea9edc2cc5d5cea60f5478166f5f82b60b63fcfc71a6bf003510071d11b4882ef0c3cd3ba01c4a7d914d520
 AUX esorex-3.10-set-default-plugin-path.patch 951 BLAKE2B ee540390a69fe408b9764211339ef893af207ac93d5a51ec0e0c771ca2bab8713a85b377e4c2b6685063a5a6ffb6fa1899c7a9c6da1820d64f2087eeb4b958b3 SHA512 004ebad285f4bc8eac0917ccdd1ab22563f73926b276e5ce2c469e144a6f7d6f2310c098904aeab73e88d57886147dcfae7704ec54a3b5ef86005a58f6f41829
 AUX esorex-3.9.6-use-shared-libs.patch 562 BLAKE2B acc266fe8c39f38be6154fdb53c9c94aea617a5166b8e458129708a72e31f0bd43fd8c21ca61d82d6b91f27e344dfcba0c1013d011e4ad0760a59a167e09967e SHA512 224ddaa94e1d7f105634f53b4238176ff84b2df0ebbfbfe8470fcb30182b4b3aa874ce002d98275488cf38128586e7dc7da0e26729db748e843ce661fa20930c
-DIST esorex-3.10.2.tar.gz 817875 BLAKE2B 2e4d8aff00b2e26a8bbb78e354524fa2b91e01491ade19ae62c5de4062b1199c4a8e43afdefd997e4628583c47cb90324327ce5bbb7b668a3ff3c9e1617057ed SHA512 6f6f663bd74d61f3612a13fb39e17c984f8ed88d9dd175951b385d9797433b19a6e276841b23b61881cec8702eb8d74061549a922acf939a9a5e98c8016d1ecb
 DIST esorex-3.12.3.tar.gz 693894 BLAKE2B 6cefb944f402a706892af92f8ef578d6705aba6c44e3e4edc328369cac004af1e5aa64e1f189438e6d7b6465fb37d002701ce8d7c505a367c76c30b50c1ac096 SHA512 28d62b2cbb66e21fe96435fedf94a727c598b33f2d0aa9ff8d811cfc87edf8d215a76837f525d2964c24bb6e0a3b50aa4dcf2a8dcfae8ac1b933303f8fb08122
-DIST esorex-3.12.tar.gz 649290 BLAKE2B 6580e07121a7e85c2be446b0e3a110e4416f05448617125f809b5c315176c2579d10efe5db3ed166ed03afa809c37c07b2cb48eb1a4720c4cd473958576a1cab SHA512 02547d44cf93c570b2be6f429215efee95a2ef91a26b45fd0a5bfea3ec00837e04972f801c3c00a892eb8bb24b2e3aa8a854b4093844cfae0aed3bf0f396eac6
-EBUILD esorex-3.10.2.ebuild 960 BLAKE2B 476378879548b2df4ced7f3ccae57fd82bfe0e6bd231de0185a1f71329c219134eb6acab88e4ff8af23602f45fd6aa7cd033285b5bd981440f9c6a90bc520ace SHA512 7cf51b8dcfe8148ff0e67afaa1a82d3d44d1746a603a0896d2c5878e6a8098f956f5d1d72a854907c7f51cf30e2db873776419472b0a5128a4c307316f9f97d9
 EBUILD esorex-3.12.3.ebuild 922 BLAKE2B 003ed3d754139b27871a0ccaf5196d4cde9be89b92e097d02219c9754a40275f7d48ca2c129fdfdb8fb950dec1fdbea081f0b6d1e9dc00e9b6dc7ddb7fea6121 SHA512 42f2ea5dcaf421167f8d6cee13f2fa7559335cf74148ec6e1a410098330b455d451765273eee547c7d93624b35966ee61838ab5c83727eacbe7acbd6aa811d38
-EBUILD esorex-3.12.ebuild 922 BLAKE2B 003ed3d754139b27871a0ccaf5196d4cde9be89b92e097d02219c9754a40275f7d48ca2c129fdfdb8fb950dec1fdbea081f0b6d1e9dc00e9b6dc7ddb7fea6121 SHA512 42f2ea5dcaf421167f8d6cee13f2fa7559335cf74148ec6e1a410098330b455d451765273eee547c7d93624b35966ee61838ab5c83727eacbe7acbd6aa811d38
 MISC metadata.xml 1026 BLAKE2B 6de1ee4012d02c2f7b7ea563646c6398af8250fd570a9416f2ed6532941ee31d0cd0ca8b8ba764992f2b2c3224d27d07185d8135a7187264efd0f412159b1e6e SHA512 9ffbefa4e5b7dda5fa7af5e4c12b2d3519331d96ab89ac469b5dc175f95a3d7e573ebf622462c6970240f3e132bda7b9c2493767e1515d43a8d42bc8bfc5abd3
diff --git a/sci-astronomy/esorex/esorex-3.10.2.ebuild b/sci-astronomy/esorex/esorex-3.10.2.ebuild
deleted file mode 100644
index 741a0b4ff28f..000000000000
--- a/sci-astronomy/esorex/esorex-3.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AT_NO_RECURSIVE=1
-
-inherit autotools-utils
-
-DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=sci-astronomy/cpl-6.3:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
-	"${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
-	"${FILESDIR}"/${PN}-3.10-generate-manpage.patch
-	"${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
-	"${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
-)
-
-export CPLDIR="${EPREFIX}/usr"
-
-src_install() {
-	autotools-utils_src_install
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-astronomy/esorex/esorex-3.12.ebuild b/sci-astronomy/esorex/esorex-3.12.ebuild
deleted file mode 100644
index 270226cd7bb0..000000000000
--- a/sci-astronomy/esorex/esorex-3.12.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=sci-astronomy/cpl-6.3:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
-	"${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
-	"${FILESDIR}"/${PN}-3.10-generate-manpage.patch
-	"${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
-	"${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
-)
-
-export CPLDIR="${EPREFIX}/usr"
-
-src_prepare() {
-	default
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_install() {
-	default
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-astronomy/healpix/Manifest b/sci-astronomy/healpix/Manifest
index 32998846c711..6bf9f421b60b 100644
--- a/sci-astronomy/healpix/Manifest
+++ b/sci-astronomy/healpix/Manifest
@@ -1,5 +1,3 @@
-DIST Healpix_3.30_2015Oct08.tar.gz 23465221 BLAKE2B c11b681065a2baf951c82538c6c47459954e1702153d55c1983af245ac4748f7768b43ab5c44f4a7b914c15cd4c23ee176389f18cbbee02923a76d69444542d1 SHA512 a7be82687a2188f5dff99c6826355e3290ccc91cc440e67267c58fa13af9fa5d301eca9b37676ef6f0af262b2ff1c06e722d0dcd3aca00a4c9d2794bc666c0c7
 DIST Healpix_3.31_2016Aug26.tar.gz 23834899 BLAKE2B a9e3b6567e851eb941e81d45145848a8daede260454dee29e056857f98ea643a0a438a5cc763651f4156ae975be41c601b8664f8bebbcf13b0fb23822c36ae40 SHA512 fd80e9ed80d19e438134f63c3d13802f63c4cd1b9f3596807e67d4ba5ff814e652a130d038449269d6ead271085eb0ab74884b2d768d8531066727377c457f9c
-EBUILD healpix-3.30.ebuild 3165 BLAKE2B 28ecfa48a8bbc5e2dc4794247f1c4c5e82b7a7d9b03ae715d584c00ee4c0ec8abdfd15c83cd46f5f3cb9bd7768846496b74247e670b857cbbc860ec4ce5631de SHA512 a0249b00917f67d72860bfbdf2d9beca0668fff30930ab29520b337dcb70669d0cbe1de3228b2be4895dc54a91efcae84b385e5d682f9435337ca7b182b2c3b7
 EBUILD healpix-3.31.ebuild 3165 BLAKE2B f18379d76fae0cf04c56e13fac92367dcb392602b709454b9e3c831311c46048a13be03e82951c8380ac25adb002176766688620e294cf48c9fee862d2f988d9 SHA512 b19de375442591aed41a35e7621737db26a9bab2d44bc12956a6465ed4ab74b702105d2298fd765c242a5a8c9e0d4538fa40c015a420c83c98bf9d26680b37c3
 MISC metadata.xml 736 BLAKE2B fdd21741b7c0321c12cc49a894f493b63299be259d02f40c8475a7f2c270b1a4c57e80d1ecbc468d6dd571a5eb51443a711ff95a8be6aaa8d9aee8ac380063e3 SHA512 1c1b23603bf390ebf8258f75a0867f2a0eb640099c2fbba9db5377449945aff71df8eac9c4c83391e838f1785fca1ce64b7acacd112f7a3b1ddde61a8923f1d5
diff --git a/sci-astronomy/healpix/healpix-3.30.ebuild b/sci-astronomy/healpix/healpix-3.30.ebuild
deleted file mode 100644
index 162cf1eee15e..000000000000
--- a/sci-astronomy/healpix/healpix-3.30.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs eutils java-pkg-opt-2 java-ant-2 ltprune
-
-MYP="Healpix_${PV}"
-MYPF=${MYP}_2015Oct08
-
-DESCRIPTION="Hierarchical Equal Area isoLatitude Pixelization of a sphere"
-HOMEPAGE="http://healpix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/healpix/${MYP}/${MYPF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# might add fortran in the future if requested
-IUSE="cxx doc idl java openmp static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-libs/cfitsio-3
-	idl? (
-		dev-lang/gdl
-		sci-astronomy/idlastro )
-	java? ( >=virtual/jre-1.6:* )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6:* test? ( dev-java/ant-junit4:0 ) )"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_pretend() {
-	if use cxx && use openmp && [[ $(tc-getCXX)$ == *g++* ]] && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || \
-			die "You are using gcc but without OpenMP capabilities that you requested"
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	pushd src/C/autotools > /dev/null
-	eautoreconf
-	popd > /dev/null
-	# why was static-libtool-libs forced?
-	if use cxx; then
-		pushd src/cxx/autotools > /dev/null
-		sed -i -e '/-static-libtool-libs/d' Makefile.am || die
-		eautoreconf
-		popd > /dev/null
-	fi
-	# duplicate of idlastro (in rdeps)
-	rm -r src/idl/zzz_external/astron || die
-	mv src/idl/zzz_external/README src/idl/README.external || die
-	java-pkg-opt-2_src_prepare
-	default
-}
-
-src_configure() {
-	pushd src/C/autotools > /dev/null
-	econf $(use_enable static-libs static)
-	popd > /dev/null
-	if use cxx; then
-		pushd src/cxx/autotools > /dev/null
-		econf \
-			--disable-native-optimizations \
-			$(use_enable openmp) \
-			$(use_enable static-libs static)
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	pushd src/C/autotools > /dev/null
-	emake
-	popd > /dev/null
-	if use cxx; then
-		pushd src/cxx/autotools > /dev/null
-		emake
-		popd > /dev/null
-	fi
-	if use java; then
-		pushd src/java > /dev/null
-		eant dist-notest
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	pushd src/C/autotools > /dev/null
-	emake check
-	popd > /dev/null
-	if use cxx; then
-		pushd src/cxx/autotools > /dev/null
-		emake check
-		popd > /dev/null
-	fi
-	if use java; then
-		pushd src/java > /dev/null
-		EANT_GENTOO_CLASSPATH="ant-junit4" ANT_TASKS="ant-junit4" eant test
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dodoc READ_Copyrights_Licenses.txt
-	pushd src/C/autotools > /dev/null
-	emake install DESTDIR="${D}"
-	popd > /dev/null
-	if use cxx; then
-		pushd src/cxx/autotools > /dev/null
-		emake install DESTDIR="${D}"
-		docinto cxx
-		dodoc ../CHANGES
-		popd > /dev/null
-	fi
-	use static-libs || prune_libtool_files --all
-	if use idl; then
-		pushd src/idl > /dev/null
-		insinto /usr/share/gnudatalanguage/healpix
-		doins -r examples fits interfaces misc toolkit visu zzz_external
-		doins HEALPix_startup
-		docinto idl
-		dodoc README.*
-		popd > /dev/null
-	fi
-	if use java; then
-		pushd src/java > /dev/null
-		java-pkg_dojar dist/*.jar
-		docinto java
-		dodoc README CHANGES
-		popd > /dev/null
-	fi
-	use doc && dodoc -r doc/html
-}
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 9ed20135a2ee..2c1bcc4c9b87 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,7 +1,5 @@
 DIST kstars-3.4.3.tar.xz 77697704 BLAKE2B a64901f74952268fb05ab9ef90d4161f48ada210a0c3099218488bb0c327d29855c58f7226ac399e522abe9846fe7109dcbecbdb789d9c3afc1180448ba1fe69 SHA512 47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4
-DIST kstars-3.5.0.tar.xz 78825952 BLAKE2B 2654fdca7bdf7714c0b0c024babb08d13458cc984774e2f9dee31002b9c6af5c29e23ad99968c31b5a33f7fc1e506eb39c34a710b27d5d0c2a0b6830d3e2c6a1 SHA512 83cda36b66e0f14448b013fcd12c140f6e21d4b9a1595cf11cd1d56655d8afec9a6e130fedd477e5474ca0e6568199114f30e862881fd5fd24c84e3c2811326b
 DIST kstars-3.5.1.tar.xz 78872552 BLAKE2B 8962d60a7e6224a7d6724a9883136599ca7acf874131b46ad30ca5fba6d222242d60f3eff3bee8df3e7db8807e6d6a3d363d2f63dd1540d7b80d9f76be3ee31f SHA512 a0684272967a314ca9ce5d835337d6c6f52f2b5cfb877f50b41a5fa8df51497fbb10445e14e0d04804f3ad3dfdba4379710dd82547b617f4ee9d78cec8feb0dc
 EBUILD kstars-3.4.3.ebuild 2544 BLAKE2B 688438c1b26c13c29ef7e019681ebb8d82324389892eb6929f876693f567554e38ef32d778ce46e3fdf3105783aecbc869d7dcf354700c247b101c658400eb68 SHA512 fc7995084aac0d85f73b313cca927d2ca1a1003679892beda460d0dff95ad4f76ece9904d6b6e69c21f04d51e749bfbdabc57a3eb9999c2b8296bbb3f8d1aa93
-EBUILD kstars-3.5.0.ebuild 2554 BLAKE2B 05574a72815c899cc3262f2b8eda4630e20eaf5837b6c69abb1387fbf837218f7ec8edbaccd5a8599920ec613e4ae13c9d410e97a7e2b545fc5720d346ede535 SHA512 5ae12f7dfab4668badf66d02fce26808263aa0de95a867551ed1968d1a40c8bd473a61d1da3412970a31a69b96c35825c4f9adf78790367780af2d2ecb4c6ed0
 EBUILD kstars-3.5.1.ebuild 2554 BLAKE2B 05574a72815c899cc3262f2b8eda4630e20eaf5837b6c69abb1387fbf837218f7ec8edbaccd5a8599920ec613e4ae13c9d410e97a7e2b545fc5720d346ede535 SHA512 5ae12f7dfab4668badf66d02fce26808263aa0de95a867551ed1968d1a40c8bd473a61d1da3412970a31a69b96c35825c4f9adf78790367780af2d2ecb4c6ed0
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.5.0.ebuild b/sci-astronomy/kstars/kstars-3.5.0.ebuild
deleted file mode 100644
index 2d2668552f20..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://apps.kde.org/en/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/gsl:=
-		>=sci-libs/indilib-1.7.5
-		sci-libs/libnova:=
-		sci-libs/stellarsolver
-	)
-	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 indi Nova)
-		$(cmake_use_find_package password Qt5Keychain)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package wcs WCSLIB)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
-	fi
-	ecm_pkg_postinst
-}
diff --git a/sci-astronomy/montage/Manifest b/sci-astronomy/montage/Manifest
index 728776355640..4d6f39801eae 100644
--- a/sci-astronomy/montage/Manifest
+++ b/sci-astronomy/montage/Manifest
@@ -1,10 +1,6 @@
 AUX montage-4.1-fix_format_errors.patch 705 BLAKE2B 8eed539374451d5124adb3d32ca9a68d1ce0d12f25719e9f2997d4495c01dc41248cab6ad6eaed9a910407033174fd89a1f88f02edcc905b1bb0b3145605493e SHA512 16019fcc1c5e352296c2835052ca9f2c6e755a15eb435b74da6d01b1c70bf514f87d5af4c1c85ba0e8b0c28f7fdeca70e8c9f80862cafbfd68ab5bd527708f16
-AUX montage-4.1-fix_freetype_incude.patch 407 BLAKE2B 4935c28c667c4c8bfb9a9d0196d576ce531e4f9888bf72bead1288227d086c5d4b9e0c39025309a94f8dff37a2cc53b0abbd99448553f000d8d067814deb70a4 SHA512 8e6eaaf6266a3ea5210a403659333f766fcf40846fc774078d61e45f9d3eea3e98010b1741645790c7d33c0e22e2812f03925cb7421807712c0a3a41ac94126e
 AUX montage-4.1-initdistdata.patch 619 BLAKE2B 62093c780263c8b70f2df0de459c8a6b420d187ea9921b4ffc84435fbffb4f6de100a926ce56a5f2cf7897e2a6c9f93ef9bbffb2b5f6bfcaffcf317d6bf0d2da SHA512 6b4b195f804fb16dd3acdfb53288800ac07af9b05749ad8e8305fe415488e921a65ffb6ce19632da420dea6235eb3ed28826a437a8b7ad22869065a916422ea5
-AUX montage-4.1-use_system_libs.patch 2025 BLAKE2B a082338adcf6f25c820c9eb81081c3fb47098c44e126423f49a10ff9e30213c15e76ff68632aded7ab7193c54184d841653b23acc6dd8e53f62274710029523f SHA512 15221debf0f36bbc3f5e91d6429ef8d14934cb7256915aa4d86973b164d408bedceb02d33cbb7e5a61e99b72db0b320088b6eaa6f9bd648f6f3879549cfd6c8e
 AUX montage-5.0-fix_freetype_incude.patch 1164 BLAKE2B 94d791eb684d9a6a725a90b9361f1ef29d6654c59bfe4b0620a1af4412a49ade15fae9f6e0ff5b63134574e73a7ff75190f40df4bc3883cfc6e9c286e9d63573 SHA512 1ca955f06765fc90164190a090ec177a06c9cb359fe93b43b8553af06b8eb4a06c8d2685d76fbee0fc70dad525a184b9a4dfde8acef4f4d9703610fb69b73ad5
 DIST Montage_v5.0.tar.gz 14663443 BLAKE2B b7dea04a0b9650b3e32bc425891c1221d60123c29663013b4af860efc238dee7552a2b55514ad7eda3be659873e3f14d2039b2e6eea20f565d64c7b8bd055069 SHA512 1396c7f846db4844d2e861622d152f2115ad4c684da02bb14116dfe3d01b559feaf29572663d0dfd234aa50843afaca3bb072d9127fbb2b539a14327c48499ae
-DIST montage-4.1.tar.gz 38542751 BLAKE2B 4e7078ad04a92e18ddddfa72812eaf0b9bf5c9b5571bacfa4c94a8e08c5134238fac778bbfd2289e3d5ec3b6ad854ba237367887801006d5663912f84a5a595a SHA512 a4e6572c0ce04ca950cb425e2589d85609d037e57c575d4efa67b277cecf5e54a2e6d307914ee99997baaba7c5bdd43c72b1e1893111eacc065785689bfc17fb
-EBUILD montage-4.1.ebuild 1557 BLAKE2B 442ef36b52c72ff85a2436a4a674cecbc2a6d63bd7348eeb9a0b5ade29287bbe47912d37c86997f0ecb8ac111ce10d93f7dbe3a1b0b3e475684326313136b8f0 SHA512 487f8f21a67e128c0b3e56ba50d67685bac92dc73dab5133c63895d74545e3b76daccd3adf0191a2a7523bc115271c7adf38cc4cee8c5d7dd6f04b2a2a41dd2c
 EBUILD montage-5.0.ebuild 1579 BLAKE2B d8b259012ec97de6a64ce368e064f5b3413d701c5c38ce0e8c77cb2da9c375dc44afd2e1e19514f9af0f6a3fda9b13d63dbb68ef7077c593ff471a443fdae7b0 SHA512 5a5db36e9a6585950a1426eb8e56648cb37c0188d2f2c42f0008f51875e49b18c174a3627da0691abcfc2c91d253bc556bcffad287cedcf73d8c3b1fe5cf06ba
 MISC metadata.xml 1031 BLAKE2B 18029f74d04a1668a4bc23bc7053c77ebd5abda4b033bf8e827209e772e59fe49124ad99f5e9b7d7b0be30dd8504e3b61913a3224d0b61a5ea9d766571e00f96 SHA512 b14dfef57d629cce61fda07b98a6dd375f2827d93da714bbd4eb359650d44b726c1cf3d6af181e280b913a8a80ee4a24c6e4e6b83a3219a59400a1257e517b53
diff --git a/sci-astronomy/montage/files/montage-4.1-fix_freetype_incude.patch b/sci-astronomy/montage/files/montage-4.1-fix_freetype_incude.patch
deleted file mode 100644
index 0b27c83784db..000000000000
--- a/sci-astronomy/montage/files/montage-4.1-fix_freetype_incude.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Fix freetype include path
---- a/util/Viewer/graphics.c
-+++ b/util/Viewer/graphics.c
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- #include <math.h>
- #include <freetype2/ft2build.h>
--#include <freetype.h>
-+#include FT_FREETYPE_H
- 
- void labeled_curve (char *face_path, int fontsize, int showLine,
-                     double *xcurve, double *ycurve, int npt,  
diff --git a/sci-astronomy/montage/files/montage-4.1-use_system_libs.patch b/sci-astronomy/montage/files/montage-4.1-use_system_libs.patch
deleted file mode 100644
index 4f4ff8d2d748..000000000000
--- a/sci-astronomy/montage/files/montage-4.1-use_system_libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Sebastien Fabbro <bicatali@gentoo.org>
-Date: Tue, 7 Jun 2016 18:25:12 +0000
-Subject: Use system libraries
-
---- a/lib/src/Makefile
-+++ b/lib/src/Makefile
-@@ -1,5 +1,5 @@
- l:
--	(cd cfitsio-3.25; ./configure; make; cp libcfitsio.a ../..; cp *.h ../../include)
-+#	(cd cfitsio-3.25; ./configure; make; cp libcfitsio.a ../..; cp *.h ../../include)
- 	(cd cmd; make; make install)
- 	(cd coord; make; make install)
- 	(cd mtbl; make; make install)
-@@ -7,25 +7,25 @@ l:
- 	(cd boundaries; make; make install)
- 	(cd pixbounds; make; make install)
- 	(cd www; make; make install)
--	(cd wcstools-3.8.7/libwcs; make; cp libwcs.a ../../..; cp *.h ../../../include)
-+#	(cd wcstools-3.8.7/libwcs; make; cp libwcs.a ../../..; cp *.h ../../../include)
- 	(cd two_plane_v1.1; make; make install)
- 	(cd lodepng_20140823; make; make install)
--	(cd jpeg-8b; ./configure; make; cp .libs/libjpeg.a ../..; cp jpeglib.h jconfig.h jmorecfg.h ../../include)
--	(cd freetype-2.5.4; ./configure --prefix=`pwd`/../../freetype --without-png; make; make install)
-+#	(cd jpeg-8b; ./configure; make; cp .libs/libjpeg.a ../..; cp jpeglib.h jconfig.h jmorecfg.h ../../include)
-+#	(cd freetype-2.5.4; ./configure --prefix=`pwd`/../../freetype --without-png; make; make install)
- 	(cd ..; ranlib *.a)
- 	chmod 644 ../include/*
- 
- clean:
- 	rm -rf ../include/* ../freetype ../*.a
--	(cd cfitsio-3.25; make clean; rm -rf config.log config.cache config.status lib)
-+#	(cd cfitsio-3.25; make clean; rm -rf config.log config.cache config.status lib)
- 	(cd cmd; make clean)
- 	(cd coord; make clean)
- 	(cd mtbl; make clean)
- 	(cd svc; make clean)
- 	(cd boundaries; make clean)
- 	(cd pixbounds; make clean)
--	(cd wcstools-3.8.7/libwcs; make clean)
-+#	(cd wcstools-3.8.7/libwcs; make clean)
- 	(cd two_plane_v1.1; make clean)
- 	(cd lodepng_20140823; make clean)
--	(cd jpeg-8b; make clean)
--	(cd freetype-2.5.4; make clean; rm -rf objs/libfreetype.la  objs/.libs)
-+#	(cd jpeg-8b; make clean)
-+#	(cd freetype-2.5.4; make clean; rm -rf objs/libfreetype.la  objs/.libs)
--- 
-2.8.3
-
diff --git a/sci-astronomy/montage/montage-4.1.ebuild b/sci-astronomy/montage/montage-4.1.ebuild
deleted file mode 100644
index f4ac9440cdce..000000000000
--- a/sci-astronomy/montage/montage-4.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MYPN=Montage
-
-DESCRIPTION="Toolkit for assembling FITS images into mosaics"
-HOMEPAGE="http://montage.ipac.caltech.edu/"
-SRC_URI="https://github.com/Caltech-IPAC/${MYPN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-IUSE="doc mpi"
-
-RDEPEND="
-	media-libs/freetype:2=
-	sci-astronomy/wcstools:0=
-	sci-libs/cfitsio:0=
-	virtual/jpeg:0
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix_format_errors.patch"
-	"${FILESDIR}/${P}-initdistdata.patch"
-	"${FILESDIR}/${P}-fix_freetype_incude.patch"
-	"${FILESDIR}/${P}-use_system_libs.patch"
-)
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-src_prepare() {
-	default
-	tc-export CC AR
-
-	find . -name Makefile\* | xargs sed -i \
-		-e "/^CC.*=/s:\(gcc\|cc\):$(tc-getCC):g" \
-		-e "/^CFLAGS.*=/s:-g:${CFLAGS} $($(tc-getPKG_CONFIG) --cflags wcstools):g" \
-		-e "s:-I../../lib/freetype/include :$($(tc-getPKG_CONFIG) --cflags freetype2):g" \
-		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:g' \
-		-e "s:-lwcs:$($(tc-getPKG_CONFIG) --libs wcstools):g" \
-		-e "s:-lcfitsio:$($(tc-getPKG_CONFIG) --libs cfitsio):g" \
-		-e 's:-lnsl::g' \
-		-e "s:ar q:$(tc-getAR) q:g"  || die
-
-	if use mpi; then
-		sed -e 's:# MPICC:MPICC:' \
-			-e 's:# BINS:BINS:' \
-			-i Montage/Makefile.* || die
-	fi
-}
-
-src_install() {
-	dobin bin/*
-	dodoc README* ChangeHistory
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r man/*
-	fi
-}
diff --git a/sci-astronomy/skycat/Manifest b/sci-astronomy/skycat/Manifest
index 6f0fe1af5c06..fac3a8b60257 100644
--- a/sci-astronomy/skycat/Manifest
+++ b/sci-astronomy/skycat/Manifest
@@ -4,8 +4,6 @@ AUX skycat-3.1.2-m4.patch 5106 BLAKE2B 92a54e86850924c6ea26e48d0d833e0af7c0e8bdb
 AUX skycat-3.1.2-makefile-qa.patch 4443 BLAKE2B 0c811b2f10d54b65709c74da74f8bbf827904ec13d19f14bca0f80239b33a7c46c614e2c88ced2aa2df8f05498922bbd732ea81ed9f637939b4681f8de951adb SHA512 c10193aa675148d7150dbbab888a56c15926054613870b82bd387d6a853e9fb6a44935ead68e194aa1dcab02f9fab498863cc63288864c9571f0de5b6cbb4903
 AUX skycat-3.1.3-remove-tclx-dep.patch 12120 BLAKE2B 0908d4628b2cd2f0afc10b4165e28bab90ddf4ac1d12ada3c3b2d8cf7a6f01cb7febac4c8de7df73fbe5b76be4b5c6809932c69129eac0256e003a931ad17696 SHA512 075819025373f5125f92543f30d9b45b88a0f0fcb2d826c4127cc36a4164ad38322b01be7a05e16f016e4aed8e6e3d867cb37427d978d8e78f6cb27d6c7edd4e
 AUX skycat-3.1.3-string-issues.patch 2902 BLAKE2B b4ede70499a6361e0d29a1739422c1b200f9245598fe85a5f19a9ce3891c8cc55d5d67eab03c80e9dff4e28b2d79529bc9c06e0fc8785471e21e41529d930296 SHA512 6f4b3eecd75515e79738b2354747d97927c5fbcb37dae460c9adc9e412b337ccfd04d0285f4bb3e9c2189d9c050ee365a262837daf3aafabcc5ff459fdeb5954
-DIST skycat-3.1.2.tar.gz 3091874 BLAKE2B cbaedd7006b1d1e6903673572fc15ca0897713da07e23b14b30914e7132d5be2cbd8c74c6a836a5cb0492dd8047b0556d568b029bed2101ff5a821fa4e89d6da SHA512 70f7f366c13f0d9914db5be0ed75952a5e97ca2aef18ce5a4aa3e330aeceaaa1ab06c5ada69056659d038b2e558648e1f4033668d4935c6a6c50bce8b766f100
 DIST skycat-3.1.3.tar.gz 3057187 BLAKE2B 3adb385452969f4cc9dac4236c1ff3dae94f2f4cf3efef1b21acfb470ffe2c387c38aa4cc0b73c1836a2172271d6113e5d0f6ab49eaab7ad8a68c7ca6566133c SHA512 55ec0c2b367e028c23e5e8f8d74106aa51aec5173c2ab1772f5fa8a5a5b65f3d85e7b991597a89f11f6ca14d57aaa6b774f474b41e78747ee486df66ab22e9ff
-EBUILD skycat-3.1.2-r2.ebuild 1477 BLAKE2B 203e47007b2002b2dc4a1c4ecf35b466f09f25636f6e30208c15a98720415390cbe4748c525055a60ff46963837f4557220b0a16b0d90857c47d8f594573c8ac SHA512 83e3efe4d8993541677f43af39b214da7386d7bb8e2fbeb3d14d6854a1f14c1aef4e4698d842ec710c312b6a72bcd55a8f4bea9e00642904807a1cb8772287bf
 EBUILD skycat-3.1.3.ebuild 1584 BLAKE2B edc0dc8e806b462b9ef8a2c7b21fc16e1c71458b21b2e21e4f0c4a41525fdca093b5e15d42c48ead2aa77758e5a8cf9b2a2f49ce79f02f5313a5f76cbd54f38c SHA512 e4fdf07f9605adb162d91b1399084c278d8ec0315329ac3c100d18d63f8d7c28aff3225c9c2d4b118efe8c1aaf1c3050eb48dcba25ff415a10561b1f42f4588a
 MISC metadata.xml 485 BLAKE2B 0f04f2fd90febaea51c47501874dec38ed08f3a37ad31b375ebbe970e84a08a89bd9acd0e35d2c3b2fbad934c6fea902cbfa01d00c2fdc731056f9f78cdab373 SHA512 a27663aa0a71270ca5f76695b52c26638766cbc7c45acd59575632507ccc0e9d83e0b8d51620651f3c21afa3ce4581f8507407fe52377b8473158164bd172ee6
diff --git a/sci-astronomy/skycat/skycat-3.1.2-r2.ebuild b/sci-astronomy/skycat/skycat-3.1.2-r2.ebuild
deleted file mode 100644
index d6d75d24af63..000000000000
--- a/sci-astronomy/skycat/skycat-3.1.2-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="ESO astronomical image visualizer with catalog access"
-HOMEPAGE="https://www.eso.org/sci/observing/tools/skycat.html"
-SRC_URI="http://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="threads"
-
-DEPEND="x11-libs/libXext
-	>=dev-tcltk/tclx-2.4
-	>=dev-tcltk/blt-2.4
-	>=dev-tcltk/itcl-3.3
-	>=dev-tcltk/iwidgets-4.0.1
-	>=dev-tcltk/tkimg-1.3
-	sci-libs/cfitsio
-	sci-astronomy/wcstools"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-m4.patch # fix buggy tcl.m4 for bash3 and add soname
-	"${FILESDIR}"/${P}-makefile-qa.patch
-	"${FILESDIR}"/${PN}-3.0.2-systemlibs.patch # use system libs
-	"${FILESDIR}"/${PN}-3.0.2-tk8.5.patch # need fix for tk-8.5
-)
-
-src_prepare() {
-	default
-	rm -fr astrotcl/{cfitsio,libwcs} \
-		|| die "Failed to remove included libs"
-	# prefix it
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		*/configure.in */aclocal.m4 || die
-	local f
-	for f in configure.in */configure.in ; do
-		mv "$f" "${f/.in/.ac}" || die
-	done
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DUSE_INTERP_RESULT  # 514604
-	econf $(use_enable threads) --enable-merge
-}
-
-src_install() {
-	default
-	local d f
-	for d in tclutil astrotcl rtd cat skycat; do
-		for f in README CHANGES VERSION; do
-			newdoc ${f} ${f}.${d}
-		done
-	done
-}
diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest
index 02fdaab85066..199ca4f5d062 100644
--- a/sci-astronomy/sofa_c/Manifest
+++ b/sci-astronomy/sofa_c/Manifest
@@ -1,8 +1,4 @@
 AUX sofa_c-makefile.patch 3345 BLAKE2B 4d137b742018c5b589d2dc2c834d3171c5caeb1778061cf0de07755cbc246d8bed1eb1d59f225813de77da25ea9d155192f2d4d6080316e2343c895173d6f064 SHA512 a38248d3912ef68aecbc2ed1b28181378b2c92a470b1447865f1cf9d9475f7fbc584ff1bcf7184e563f298b72b0284c81e4b905757208459cebb9b7cb4dbc26b
-DIST sofa_c-20150209_a.tar.gz 1685051 BLAKE2B 099bec2af78244c3baab4f97bb0e766d22ba59d28567939f4186b1621bb703793dc3528aa6c45f18c4bfbc11582b1fdc8d0df414598ebef64e909b637d41fdc1 SHA512 45524228db30c388315ce76c1d85db422fac09da3c3ed1442e362a6a2b4a10d27c19ea4a2d51c854280102a99706663622e0375b4afbf096b79877e7602fec4c
-DIST sofa_c-20160503_c.tar.gz 1720164 BLAKE2B 652a6ca3b133270792618440dba8085af795d4bdaf0044aa8fa4f6896d81ef3c0734d4dd521bc0193f94830e4ab701b039fabc77a9addd83393c184c22d4900d SHA512 d21f02d0669a8707e8b2d34be4f30b4acc222b4155e7b4e4f9fc54bbabf1edc99b49e66619581bc3427eff8ed1d26668aae86af73f63a5fd21eb73f3339e0f26
 DIST sofa_c-20170420.tar.gz 1780577 BLAKE2B 80912027893957345e080f02eed059f764970bbf6b89d6979c355a65d6d144edc8073b6a6436d11d36009eab05f5d9ccad0270a7feef117e576055be6d8489d5 SHA512 f2dd806243e3aec51ea03a54e10e533d4c3c1a69d032d5f3ddd7cd823a75aeed8033491c91366813b8d8e5c0b66e0fd582e6ede03aa7b136311fdd7a4ebf20d3
-EBUILD sofa_c-20150209a.ebuild 789 BLAKE2B 8ba8796dfa4bea2383bf9120523a483fa93909faa1d0598573e5099897061e21742258ab7c248375acc75f07ebc2faf97654c87a0a6123c5419f74d0f23fce41 SHA512 8cad3a409c66b7b49391e231eaba775ca1450a7c0edfe28c5f1eed92fa3d0476d324216be7d4770756a2281024137314ed757f09e777783e4b30bd07567dcf59
-EBUILD sofa_c-20160503c.ebuild 789 BLAKE2B 2ded30ab7fa248e9cec83c3919b587c2a3679fc6216b95eb799d12a153e8419ae66408775a6ea85520531006dc15d4d0c026f09f9891e6198df4e21cc0ba5e19 SHA512 9c05d2c19e0d9a7f47652c4a163f1e91a39252516d3c3f27ef5fc72e4a10f120cce14368ac26f2cd85ff62eeb5dd42c965e721e0e6f7db8ce69243b5462e861a
 EBUILD sofa_c-20170420.ebuild 793 BLAKE2B a9559a01443926fef98c7acf2b861227d455414173397f1288581e8290a4d9829effb656f8cfa5fec47dac47c6b220c60a3e666bef95994394810c9ef6040dfb SHA512 250743503aee1951afa017502c801f6dcd9b901c8db82abe61c70ebe170e26f553dc48d885455906d8e40b47203fc2d7778555ea80b725375ff1507b90126065
 MISC metadata.xml 976 BLAKE2B 7a77e6a6bbb21d28e6f7732c364fe4cca59a21b729f28e2e2bf89f307cdeb386afa96f2a461b106f04b391238c53aa49ef15bf1aa9a5343e3279b37db5d7036a SHA512 cd48623ff2dd370520906a3114d9268df981d13eb0f51cfea64265b5e2457f3872c0197ff421da80182838698a3e98182cc178a5fbfbf3bffb8c0d51882e674a
diff --git a/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild b/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild
deleted file mode 100644
index e145edaa645c..000000000000
--- a/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-YYYY=${PV:0:4}
-MMDD=${PV:4:4}
-MYPV=${YYYY}${MMDD}_${PV:8:1}
-
-DESCRIPTION="Library for algorithms for models in fundamental astronomy"
-HOMEPAGE=" http://www.iausofa.org/current_C.html"
-SRC_URI="http://www.iausofa.org/${YYYY}_${MMDD}_C/${PN}-${MYPV}.tar.gz"
-
-LICENSE="SOFA"
-SLOT=0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
-
-S="${WORKDIR}/sofa/${MYPV}/c/src"
-
-src_prepare() {
-	default
-	sed -i -e "s:/lib:/$(get_libdir):" makefile || die
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	cd ..
-	dodoc 00READ.ME
-	use doc && dodoc doc/*.lis doc/*.pdf
-}
diff --git a/sci-astronomy/sofa_c/sofa_c-20160503c.ebuild b/sci-astronomy/sofa_c/sofa_c-20160503c.ebuild
deleted file mode 100644
index 00b50264fd84..000000000000
--- a/sci-astronomy/sofa_c/sofa_c-20160503c.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-YYYY=${PV:0:4}
-MMDD=${PV:4:4}
-MYPV=${YYYY}${MMDD}_${PV:8:1}
-
-DESCRIPTION="Library for algorithms for models in fundamental astronomy"
-HOMEPAGE=" http://www.iausofa.org/current_C.html"
-SRC_URI="http://www.iausofa.org/${YYYY}_${MMDD}_C/${PN}-${MYPV}.tar.gz"
-
-LICENSE="SOFA"
-SLOT=0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-S="${WORKDIR}/sofa/${MYPV}/c/src"
-
-src_prepare() {
-	default
-	sed -i -e "s:/lib:/$(get_libdir):" makefile || die
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	cd ..
-	dodoc 00READ.ME
-	use doc && dodoc doc/*.lis doc/*.pdf
-}
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index f610bea6d5cd..c0e853d882e2 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -9,9 +9,13 @@ DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-0.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c
 DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d
+DIST stellarium-0.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
 DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
 DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3
+DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
 DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
+DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
 EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763
 EBUILD stellarium-0.20.3.ebuild 3945 BLAKE2B e590630ada580f83c59daa2ea81ca945ac81b6ecaa4d76a12e8da9a60b27fad68653f0df68108046e3d85cd17859b9f2767a95568f12b4a18d8db8f5782c27d2 SHA512 c8c4ee386d5f0f8fd18b485098617422030d79134f7b1d1549188593ee6319dbed70123503f419409694ecc40ccc5742a62200a26e73244887060b66ee83959e
+EBUILD stellarium-0.20.4.ebuild 3986 BLAKE2B 9ee390e5b2093c5fcf99aeb76328764360100ac9db40b3addea2be3a41c487ec7bd0740b55f4ff6cee0080227727bb3513d9e4bbff4274cc79e44465c67fb901 SHA512 4ea75eb833a061a0762e236a0a908fdb5f362909394d27024d7f84c0a77de109370a14efd9e7d3eb89c8cafaf98e926211ba86e2bfc38091864684e47917fc2a
 MISC metadata.xml 1166 BLAKE2B ae9afc6a617426c07b8746859f4e1ed0e7ab61256cb82f754f8fb0f7d9e24709b2f9edf9a4f4fef1f8d0d6b46eaee2ef8af3641b81abacd8391cf41fa0624e79 SHA512 dc95989f85aaaf8c08a86b0dbaa2a57d69226dfae7e4317f8c7cc5a3dd8d4a0303a9e3111d29b6a18242f3a96e17d4e4f01fd85c7e4d7a0587495d775d537781
diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
new file mode 100644
index 000000000000..c305433b6fb9
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.12"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+	deep-sky? (
+		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+	)
+	doc? (
+		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+	)
+	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+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug deep-sky doc gps media nls stars telescope test"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen[dot] )
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-libs/qtcompress:=
+	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] )
+	telescope? ( sci-libs/indilib:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
+	"${FILESDIR}/stellarium-0.20.3-unbundle-qtcompress.patch"
+	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+	# Several libraries are bundled, remove them.
+	rm -r src/external/{libindi,qtcompress,zlib}/ || die
+
+	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
+	# while we have qcustomplot 2 in tree which changed API a bit
+	# Also the license of the external qcustomplot is incompatible with stellarium
+
+	# for glues_stel aka libtess I couldn't find an upstream with the same API
+
+	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
+
+	local remaining="$(cd src/external/ && echo */)"
+	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
+		eqawarn "Need to unbundle more deps: ${remaining}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_TESTING="$(usex test)"
+		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build apidoc
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+	fi
+	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
+	if use deep-sky ; then
+		insinto /usr/share/${PN}/nebulae/default
+		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 87fd07dd2d4a..e6e494474fa6 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,5 +1,5 @@
-DIST wcslib-5.16.tar.bz2 2222111 BLAKE2B e11da145db6366804321cf415bdac621a930418f09d788c8b94413980710bb43357129a830462339127398082700a9f44f56dc0b8c96ef923d41ea0174dfd07f SHA512 bf7ab586995bdade8b96c77dee891c7d7ab6de82a7e2f94a09d89643e93658063f832efdb66e0bba11ad114b6e0ca555cba9308a84f0f22fb833e3a6303cefe6
+DIST wcslib-7.3.1.tar.bz2 2434274 BLAKE2B 9789a8eb34fe37c96b52e20efe3c14368499058e5c46aad4853b2be5f32a31df26525ec2c38d0ce87bcb7891b91a3ec3ac537e3c662c716a7c4381f26cd715e4 SHA512 753e0e202fb4250d321c36a0df9cd45ed88697111a06e108bc3e5397ddecc60d460cda2b4d45b5311dd72b88b66d4c70ff150b03e2da46c834b024f15304779b
 DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
-EBUILD wcslib-5.16.ebuild 1628 BLAKE2B a782f5f8bfcca41cc1e841debfad393473873cb8b450443d0013d2ed74ae5761b8b9a16a7c30e9d578730d5689b2f15233dc13dea8217312c5e09fbba8bef953 SHA512 d4eaad7b56a6982fcc7dc6e33da27b1a6f2216a4b0c7a85bd328951c95c464000d5464625c74dbdeb356802957741010834a992a8dc7d710c398fcc4b11e6dc5
+EBUILD wcslib-7.3.1.ebuild 1584 BLAKE2B 13e1f4f27200a8ba8b113acb880d91bfda26f8aeb67e5dbc36aff581d45658d2f6e8b438ed7675d9d3de7458a63d293dec69c949a27320dfe25c30aa5fe7f334 SHA512 c7cea572b8e72b746f20dc650ae5928353103992c3cacfdb8c724034ae6fdc2522423317fdbabf6183f9994e6849fe7a1dc81908a53a2352e83991fba3183b22
 EBUILD wcslib-7.3.ebuild 1582 BLAKE2B 4a3cbfc272c544b90ef075596cf1b275e95e7a807aa746d1936a25cc70a8c79561fb274bf60192e3c4690f5bf1824afd9897795d132b45ad7a05e8e3ca761ad6 SHA512 d5f9b2f67b6c22b092f1096646489f873d86f016406eacab3af31a5ea010670687a49a9c95a00099b11bfe2e31aa04a69ee734404a27dc78d6f045fdbade681c
 MISC metadata.xml 1092 BLAKE2B 117c7758257296d911cadb26e55fc50ad6439c4ac69e82e31b4f41e36a3f862270bb88f87533e25dd5f33c9c07a3ce8164715ba460f91c025c12c7cb31a6b509 SHA512 1c6a19945464451f87c365743d4c2a7271feab32bbafe4147abeafc5948bbf207716f3c46a2dd59c9e9fa5fce5d2b4ab8bebc8a1181915f8f81a2b3a353022e3
diff --git a/sci-astronomy/wcslib/wcslib-5.16.ebuild b/sci-astronomy/wcslib/wcslib-7.3.1.ebuild
index a82492d1c42e..a7feb7d418e8 100644
--- a/sci-astronomy/wcslib/wcslib-5.16.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
@@ -11,9 +11,9 @@ DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
-SLOT="0/5"
+SLOT="0/7"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable fortran)
 		$(use_enable tools utils)
@@ -50,16 +51,11 @@ src_configure() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }
 
-src_compile() {
-	# nasty makefile, debugging means probably full rewrite
-	emake -j1
-}
-
 src_test() {
-	emake -j1 check
+	emake check
 }
 
-src_install() {
+src_install () {
 	default
 	# static libs share the same symbols as shared (i.e. compiled with PIC)
 	# so they are not compiled twice