gentoo resync : 25.11.2020

31 files changed, 1108 insertions, 318 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index ffcb95a6edce..4b4e5b16e6ff 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/esomidas/Manifest b/sci-astronomy/esomidas/Manifest
index a82fc740c6eb..b091e5e9c67e 100644
--- a/sci-astronomy/esomidas/Manifest
+++ b/sci-astronomy/esomidas/Manifest
@@ -3,5 +3,4 @@ AUX esomidas-17.02-output_to_stdout.patch 1276 BLAKE2B c2e7daa65375ea6775afb0fe4
 AUX esomidas-17.02-rpc.patch 1300 BLAKE2B 14ba1ba6a4387aac7704c9893863b2983bd5f8f18bcbeaa93dd735d80af66bceb624c6ce0bdae49f2e85a7a38e41ea5edf88f3b165bbf742a4fbebba4e40b323 SHA512 5ecc989ef8f1ed6c1aa586088f1d1e880020f2ff134d21162563c66c3cc631ebf6deb3b3dfc7ebe0901385e548981df907264ad1b49a7638dd4e5917d40e2c7f
 DIST esomidas-17.02.tar.gz 60771186 BLAKE2B 75e184d61ab2ec9eb30ea83c35feea329bd4dec9afa04b68bc7be22ef0f88d1d0aa0e4a79c1111ce57846e042b26ef394374c9db2d12547dfa481d75e06deadf SHA512 7e4c6a8d8349a9e1647e48571bf5e04abd239c24020ffdf5984a0598b837061ca7765e31209869a4e302e1f85c3494852a22541149c10cc916376048e40b6324
 EBUILD esomidas-17.02-r1.ebuild 4385 BLAKE2B 752aa29841bce58bba1b84bacda55eaef1c3f614d920710c0bd14204f7590a9c73269e41d85d58e6c73aca46e4b695654a4a2a26bece61ad386fe6a151289a26 SHA512 02f37170fb111d44d27df9cb17d959394246ebefae8640874696cfad947ec0abb56e92a8cbe0a4e4f6b60e0e2cd8ab7a6a892ec0515ec37e1de01d53c35e8464
-EBUILD esomidas-17.02.ebuild 4079 BLAKE2B ceafa755120f8849afe14941ac0c7fd609e62a5f2b2fe13066032f6b7b4b2be2aac2ed859cd059cf2bf83cc55296fba1c841af59c1b24876728f7d63915beaa9 SHA512 e46706c68b972a350c7da7e3dfb54d5345537d73bc52d0d198fb1fb335560e26c37242763c82e1f0f8d1aab8a316dbcb985a729e6e8dd685446ddee144f7d12e
 MISC metadata.xml 804 BLAKE2B d6e2b4791d91989eca7d61e0ec1c7622bcc51236d4e45c5862bd182cae0d4d2bbc8ad0b4b0f0b37764d9cca7f057d1b7b30ad1d947b665d923246c87ffb882d7 SHA512 4fc8d19a3890666740112c29c01a63e0b766bff7fe73fa677b3066228e23e0eec1fa94cb02c0327a60aa17b163bf6c58cdee123b189d6bfa1bb51565aa4821a4
diff --git a/sci-astronomy/esomidas/esomidas-17.02.ebuild b/sci-astronomy/esomidas/esomidas-17.02.ebuild
deleted file mode 100644
index acaa2eb1c23a..000000000000
--- a/sci-astronomy/esomidas/esomidas-17.02.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fortran-2 toolchain-funcs flag-o-matic
-
-# MIDVERS is actually used by MIDAS configuration scripts
-export MIDVERS="17FEBpl1.2"
-
-DESCRIPTION="European Southern Observatory Munich Image Data Analysis System"
-HOMEPAGE="http://www.eso.org/projects/esomidas/"
-SRC_URI="ftp://ftp.eso.org/pub/midaspub/17FEB/sources/${MIDVERS}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="
-	sys-libs/readline:0=
-	x11-libs/motif:0=
-	x11-libs/libX11:=
-	x11-libs/libXt:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MIDVERS}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-output_to_stdout.patch"
-	"${FILESDIR}/${P}-gentoo-setup.patch"
-)
-
-src_prepare() {
-	default
-	# variables for all phases and midas internal build system
-	export MIDASHOME="${WORKDIR}"
-	export MID_HOME="${S}"
-	export MID_HOME0="/usr/$(get_libdir)/esomidas/${MIDVERS}"
-	export MID_INSTALL="${MID_HOME}/install/unix"
-	export MID_SYS="${MID_HOME}/system/unix/"
-	export MID_WORK="${MIDASHOME}/midwork"
-
-	# create a gentoo option file
-	mkdir ${MID_INSTALL}/systems/Gentoo || die
-	cat >> ${MID_INSTALL}/systems/Gentoo/make_options <<-EOF
-		CC=$(tc-getCC)
-		LDCC=$(tc-getCC)
-		F77=$(tc-getFC)
-		FC=$(tc-getFC)
-		LD77_CMD=$(tc-getFC)
-		AR=$(tc-getAR)
-		RANLIB=$(tc-getRANLIB)
-		F_OPT=
-		C_OPT=
-		E_OPT=$(use amd64 && echo -Z)
-		SYS=
-		SH_OPT=-fPIC
-		SH_CMD=${MIDASHOME}/${MIDVERS}/local/make_shared
-		GUI_OPT=-DPATH_MAX=1024
-		STRIP=echo
-		EDITFLAGS=-DVOID_SIGHANDLER -DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_GETPW_DECLS -DHAVE_DIRENT_H -DHAVE_STRING_H -DLinux -DHAVE_UNISTD_H -DHAVE_STDLIB_H
-		EDITLIBS=-lreadline
-		UIMX=uimxR5
-		INSTALL_FLAG=auto
-	EOF
-	sed -e "s|gcc|$(tc-getCC) \${LDFLAGS}|" \
-		${MID_INSTALL}/systems/Linux/make_shared \
-		> ${MID_INSTALL}/systems/Gentoo/make_shared || die
-	sed -e 's|PC/Linux|Gentoo|' \
-		${MID_INSTALL}/systems/Linux/setup \
-		> ${MID_INSTALL}/systems/Gentoo/setup || die
-
-	# gentoo readline avoids exporting the xmalloc,xrealloc and xfree
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-}
-
-src_configure() {
-	${MID_INSTALL}/select all || die "packages selection failed"
-	${MID_INSTALL}/preinstall -a || die "preinstallation failed"
-	${MID_INSTALL}/install2 || die "configuration failed"
-	chmod 755 ${MID_HOME}/local/make_shared
-}
-
-src_compile() {
-	CMND_YES=2 ${MID_INSTALL}/install3 -a || die "compilation failed"
-	[[ -x ${MID_HOME}/monit/midasgo.exe ]] || die "somewhere compilation failed"
-	emake -C monit syskeys.unix
-	${MID_SYS}/inmidas -m ${MID_WORK} -j "@ compile.all"
-	${MID_SYS}/inmidas -m ${MID_WORK} -j "@ ascii_bin no ; bye"
-}
-
-src_test() {
-	local test_dir="${WORKDIR}/test_tmp"
-	mkdir ${test_dir} && cd ${test_dir}
-	${MID_SYS}/inmidas -m ${MID_WORK} -j "@ vericopy ; @@ veriall -nodisplay ; bye" || die
-	test -f ${MID_WORK}/veriall_* || die "tests failed somewhere"
-	rm -rf ${test_dir}
-}
-
-src_install() {
-	yes | ${MID_SYS}/cleanmidas
-	find ${MID_HOME} \( \
-		-name "*.a" -o \
-		-name "makefile" -o \
-		-name "default.mk" -o \
-		-name "*.h" -o \
-		-name "*.inc" -o \
-		-name COPYING -o \
-		-name "*~" -o \
-		-name "*.mod" \) -delete
-	rm -rf ${MID_HOME}/libsrc/ftoc*
-	find ${MID_HOME} -type d -empty -delete
-
-	sed -e "s:^MIDVERS0=.*:MIDVERS0=${MIDVERS}:" \
-		-e "s:^MIDASHOME0=.*:MIDASHOME0=/usr/$(get_libdir)/esomidas:" \
-		-i ${MID_HOME}/system/unix/{inmidas,helpmidas,drs}
-
-	cd "${WORKDIR}"
-	dodir /usr/$(get_libdir)/esomidas
-	mv "${S}" "${ED}"${MID_HOME0}
-	chmod 0644 "${ED}"${MID_HOME0}/contrib/baches/*/*.fit \
-			   "${ED}"${MID_HOME0}/contrib/baches/*/*.fmt \
-			   "${ED}"${MID_HOME0}/contrib/baches/*/*.datorg \
-			   "${ED}"${MID_HOME0}/contrib/baches/*/*.prg \
-			   "${ED}"${MID_HOME0}/contrib/baches/*/*.README
-	find "${ED}"${MID_HOME0} -name \*.sh | xargs chmod 0755
-	chmod 0755 "${ED}"${MID_HOME0}/util/bench/brun
-
-	dosym ${MID_HOME0}/system/unix/inmidas /usr/bin/inmidas
-	dosym ${MID_HOME0}/system/unix/gomidas /usr/bin/gomidas
-	dosym ${MID_HOME0}/system/ftoc-new ${MID_HOME0}/system/good-ftoc
-}
diff --git a/sci-astronomy/galaxy/Manifest b/sci-astronomy/galaxy/Manifest
index 0a67e45b2e9e..5e82c3cd36d4 100644
--- a/sci-astronomy/galaxy/Manifest
+++ b/sci-astronomy/galaxy/Manifest
@@ -1,3 +1,4 @@
+AUX galaxy-2.2-makefile.patch 1894 BLAKE2B c65e78e4e84040e968903986063c065e269cc7dba5a9f2f221866aec94542ab4f138eac14699609aaa9189e5366c320e3239a7bccba11141d9c4d970f336cbf8 SHA512 0916eed7fbc788f0c320141628069b52ca868410d3bec35e0b7ac4f0bacf606c22f678c6d72a8e113d193b67373e73ffb98e51341b6b40f415803cc6323d992e
 DIST galaxy-2.2.tar.gz 146675 BLAKE2B 5e0dce355c7df5c73d3017b80f88715056cd8ceb765f7ad2810037fe8c800599979dbf3d42dbacdc70aafa080ad84a08db0d6d4cffc8ee4b86b8199e6b4e31f8 SHA512 b3843f4ef7bdd60d761db019ded8af99b4c520ecc1c852a210bc6282751474254d9b9172e738015c7b01df57502655749051baac11448797fb9b71ecd4edd8d6
-EBUILD galaxy-2.2-r1.ebuild 875 BLAKE2B 5a2e47bff63488456b5ed7e81182ada4797d638b6fae0e703b0b090d30c5ee20512e6e1cf1710d009b3f4c37d84a87c4c84f63b9e6187249e92029b7af7543c2 SHA512 95d3b81d7c47ab879570bc674d163f1da62c616bcd6e1a68df371125cdca72cb269ad83fa6957e516f3cc3c49e5766e183034d4bb0d4e1e1e361a0b9ccdd81a1
+EBUILD galaxy-2.2-r1.ebuild 672 BLAKE2B c46ad7cffe2d69bb1f99c5b8c41cb642f770292b4b0c5f5d2923ce7663beee343600b137bb7bff0aabdd05d71ade7c65df9f78141fe852c059bf2c70c379f559 SHA512 36468bf4dc8c1e775b2a769d6a5d49df95922bdacea8d140b093d39f1239309c61066304f8674ee325d6c9e378390911c4ce6177a9b5a0399a22e5841dfb1e53
 MISC metadata.xml 495 BLAKE2B a98e05ee1ab15cbd4e775f70482983f7a1be2ae4de2c7d70f0b74d92680ff5edbd677c22d252ba49d02e48140bf1c4b0ba7f0e2efe392e057c08472722f116b8 SHA512 22678d32e65d5d5379e2a4fb190fe0ea0249bd0cd4e85d07255e05d04c6b4d868810e0ee420f3cd842e4ebfdae960b8ead5624ff6d51f0dcd3e7c4897b5b3c07
diff --git a/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch b/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch
new file mode 100644
index 000000000000..86d1e3a7bc2a
--- /dev/null
+++ b/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch
@@ -0,0 +1,61 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,30 +5,28 @@
+ SOURCE = $(PROGRAM)-$(VERSION).cc
+ 
+ # defaults for parameters that may be pre-defined
+-CXXFLAGS ?= -O3 -g -Wall
+-LDFLAGS ?= -O3 -g -Wall -rdynamic
+-PREFIX ?= /usr
++PREFIX = $(EPREFIX)/usr
+ 
+ # target install directories
+ BINDIR = $(PREFIX)/bin
+ SHAREDIR = $(PREFIX)/share/$(PROGRAM)
+ DATADIR = $(SHAREDIR)/data
+ ICONDIR = $(SHAREDIR)/icons
+-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+ MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
+-LIBS = `pkg-config --libs gtk+-3.0`
++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags gtk+-3.0)
++LIBS += $(shell $(PKG_CONFIG) --libs gtk+-3.0)
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+-	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
++	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o -o $(PROGRAM) $(LIBS)
+ 
+ $(PROGRAM).o: $(SOURCE)
+-	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(PROGRAM).o $(SOURCE)
+ 
+ zfuncs.o: zfuncs.cc zfuncs.h
+-	$(CXX) $(CFLAGS) zfuncs.cc \
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c zfuncs.cc \
+           -D PREFIX=\"$(PREFIX)\" -D DOCDIR=\"$(DOCDIR)\"   \
+           -Wno-deprecated-declarations 
+ 
+@@ -45,19 +43,16 @@
+ 	cp -f -R  doc/* $(DESTDIR)$(DOCDIR)
+ 	# man page
+ 	cp -f doc/$(PROGRAM).man $(PROGRAM).1
+-	gzip -f -9 $(PROGRAM).1
+-	cp $(PROGRAM).1.gz $(DESTDIR)$(MANDIR)
++	cp $(PROGRAM).1 $(DESTDIR)$(MANDIR)
+ 	rm -f $(PROGRAM).1.gz
+ 	# menu (desktop) file 
+ 	cp -f desktop $(DESTDIR)$(MENUFILE)
+-	xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
+ 
+ uninstall:
+ 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
+ 	rm -R -f  $(DESTDIR)$(SHAREDIR)
+ 	rm -R -f  $(DESTDIR)$(DOCDIR)
+ 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
+-	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
+ 	rm -f  $(DESTDIR)$(MENUFILE)
+ 
+ clean: 
diff --git a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild
index bce80f743988..88341dfa0584 100644
--- a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild
+++ b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit fdo-mime flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs xdg
 
 # probably change every release
 PID="1/3/0/3/13035936"
@@ -15,31 +15,16 @@ SRC_URI="http://www.kornelix.com/uploads/${PID}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="x11-libs/gtk+:3"
 RDEPEND="${DEPEND}
 	x11-misc/xdg-utils"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
-	sed -e '/DOCDIR/ s/PROGRAM)/&-\$(VERSION)/g' \
-		-e '/xdg-desktop-menu/d' \
-		-i Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_configure() {
-	tc-export CXX
+	tc-export CXX PKG_CONFIG
 	append-cxxflags -pthread
 	append-ldflags -pthread
-	export PREFIX="${EPREFIX}/usr"
-	default
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
 }
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index ffb2f1bd653a..4d9a3360c275 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,3 @@
 DIST kstars-3.4.3.tar.xz 77697704 BLAKE2B a64901f74952268fb05ab9ef90d4161f48ada210a0c3099218488bb0c327d29855c58f7226ac399e522abe9846fe7109dcbecbdb789d9c3afc1180448ba1fe69 SHA512 47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4
-EBUILD kstars-3.4.3.ebuild 2567 BLAKE2B 0989cbb9d979229e24f7e254c95f7a3a8651b153af1ccef241d61b96b969ad61d95f011a288c5d5efd855730fa3a5979e4fbd54254e0430a6d450a20fb6c0932 SHA512 e07cc97c0e7b8ce2f68dee6c51734553ffa3c16d439fa0277fe255e14e4fcb76e29d99ecb3301180dcbbecbadd600d2568e10b032b909863acf72714239925a3
+EBUILD kstars-3.4.3.ebuild 2544 BLAKE2B 688438c1b26c13c29ef7e019681ebb8d82324389892eb6929f876693f567554e38ef32d778ce46e3fdf3105783aecbc869d7dcf354700c247b101c658400eb68 SHA512 fc7995084aac0d85f73b313cca927d2ca1a1003679892beda460d0dff95ad4f76ece9904d6b6e69c21f04d51e749bfbdabc57a3eb9999c2b8296bbb3f8d1aa93
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.4.3.ebuild b/sci-astronomy/kstars/kstars-3.4.3.ebuild
index ce93bf63b360..fae051247438 100644
--- a/sci-astronomy/kstars/kstars-3.4.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.4.3.ebuild
@@ -9,8 +9,7 @@ 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/"
+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"
diff --git a/sci-astronomy/missfits/Manifest b/sci-astronomy/missfits/Manifest
index 24124c5716cd..fb5874560379 100644
--- a/sci-astronomy/missfits/Manifest
+++ b/sci-astronomy/missfits/Manifest
@@ -1,3 +1,5 @@
+AUX missfits-2.8.0-fno-common.patch 1604 BLAKE2B bb789edeefdccfa791e2c0a7d12ff59c1b3cb842f2e93c26f393f8dc3b62bb12f421bacbfebe38e594e292a2aef0fe2dfd34406c0c8d171f7f151229463d0ff0 SHA512 e1b19cd5d7da898bf06ad557cdcb914805d1625c11c7a775d25b9bbac9a0227faaebd30cdc9dc8bc5a3e090ace6c37ce83cbb69ca5b3a25a9104c7b2f6326a75
+AUX missfits-2.8.0-run-AM_PROG_AR.patch 130 BLAKE2B 62db7291b717ff82041d0dbfc773b70a959527efbdbf386c491e823599110046a928e101a546b9d5016ebfd6a38f907d4a3bbc0d75dfcaed761a3189d47d0e4a SHA512 a5ae4397d84f5524b7f889f1c9e36b8393019ee420b48030d12bdb25ab859a87e1035c736c533b264c035e9da2a1dec552b1125db394ff1d398b982936f93c40
 DIST missfits-2.8.0.tar.gz 428404 BLAKE2B 6d4f2ce1a3b36a487c84a13ea64dd5ab07f359ff31efdaa129455aae8a76eb37973f65bca5d4abf0675865016b6ceb86e904d5cc51d4e48b4be9332d86b66036 SHA512 32727f5eb30573a1cedacb8900e2536867e4815059eee32e64e3db65be9291b8a91b9f45b2c9f3cf6fc2a8cc448012ea3d502bdd9dee516008e17d5086aee795
-EBUILD missfits-2.8.0.ebuild 475 BLAKE2B 8c571af59bf0b45ffb48fa89363b79a859315c0f028af5b57584e183829dbd3237ae3e7eefa68ecb943c8858f2aff10fbb6a94039f1b495a25d024cf55e32e35 SHA512 13c303990c6a2d309d2c53833ce4e212311984ebf11d2497798c5286047141a74c0e18a8c61f537ea61aaf3d98a0bab1e424463d76aea0ef6579bac1263e11af
+EBUILD missfits-2.8.0.ebuild 575 BLAKE2B 06b9b57d07ba5c2ea1343ebbe00511ebae6cafdcca5e58887582d78eeb71c22ba198a58ee9cdc040ac1ebde48c1d1f1706625526949e458d11eccfd7e72d3a39 SHA512 9a6b7178c74bd66361a35377f7883d220c466e05b28a3c855a62335a5b53e8285dbdd4b0c1844d0e5d53d04b6f8c794b0447f8bad8ca69eaa3c811834b9c6146
 MISC metadata.xml 644 BLAKE2B 3e4c092fca1e86ce44570d790923dde2fe35aacb41b6b35345f073a57af15ec68b9800bccba7d39fad1bb81073974dc005b6b2e8dc1402fb2cfda8aa85b82bf8 SHA512 4d436d4c45058b19a9b8954c6750d7dff8e33ed7dd3c45d8089b8b388e106a8e442054c09617602a76f649cb899cb9b692c3036591e4b61bf2adb1caa8d65b64
diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch
new file mode 100644
index 000000000000..0c7e042376b7
--- /dev/null
+++ b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch
@@ -0,0 +1,65 @@
+--- a/src/file.c
++++ b/src/file.c
+@@ -45,6 +45,8 @@
+ #include "prefs.h"
+ #include "xml.h"
+ 
++char    gstr[MAXCHAR];
++
+ /****** load_fitsfiles *******************************************************
+ PROTO	catstruct **load_fitsfiles(char *name, int *ncat, int * outcat,
+                                    filenum *filetype, int *headflag)
+--- a/src/fits/fitscat.h
++++ b/src/fits/fitscat.h
+@@ -333,6 +333,6 @@
+ 		warning(char *msg1, char *msg2);
+ 
+ 
+-int		bswapflag;
++extern int		bswapflag;
+ 
+ #endif
+--- a/src/fits/fitscheck.c
++++ b/src/fits/fitscheck.c
+@@ -38,6 +38,8 @@
+ #include "fitscat_defs.h"
+ #include "fitscat.h"
+ 
++int   bswapflag;
++
+ #define	ENCODE_OFFSET	0x30
+ unsigned int	exclude[13] = {0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,
+ 				0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60};
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -30,7 +30,7 @@
+ #include	"types.h"
+ 
+ /*----------------------- miscellaneous variables ---------------------------*/
+-char		gstr[MAXCHAR];
++extern char		gstr[MAXCHAR];
+ 
+ /*------------------------------- functions ---------------------------------*/
+ extern	void	makeit(void),
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -50,6 +50,8 @@
+ #include 	"prefs.h"
+ #include	"preflist.h"
+ 
++prefstruct  prefs;
++
+ /********************************* dumpprefs ********************************/
+ /*
+ Print the default preference parameters.
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -84,7 +84,7 @@
+   double	time_diff;		    /* Execution time */
+   }	prefstruct;
+ 
+-prefstruct	prefs;
++extern prefstruct	prefs;
+ 
+ /*----------------------------- Internal constants --------------------------*/
+ 
diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch
new file mode 100644
index 000000000000..33166519fc6d
--- /dev/null
+++ b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,6 +78,7 @@
+   ACX_PROG_CC_OPTIM
+ fi
+ 
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ 
diff --git a/sci-astronomy/missfits/missfits-2.8.0.ebuild b/sci-astronomy/missfits/missfits-2.8.0.ebuild
index 970e40703b1b..c619190e23f7 100644
--- a/sci-astronomy/missfits/missfits-2.8.0.ebuild
+++ b/sci-astronomy/missfits/missfits-2.8.0.ebuild
@@ -1,21 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files"
 HOMEPAGE="http://www.astromatic.net/software/missfits/"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${P}-run-AM_PROG_AR.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_install() {
 	default
-	use doc && dodoc doc/*
+	dodoc -r doc/.
 }
diff --git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
index 7a22a1370437..32540dd6f300 100644
--- a/sci-astronomy/sextractor/Manifest
+++ b/sci-astronomy/sextractor/Manifest
@@ -1,8 +1,8 @@
 AUX sextractor-2.19.5-fix-format-errors.patch 2189 BLAKE2B 78bb15d5ba83081365c20df789ce66b83f70a69b1034d88ffb71746ae6c4d0fc9a060de7bbbfb640e592e34bcebf58a9d7e43100d821d67fdde656e98e7511cd SHA512 7f7252fbd662bfc14f7bd141a74430d4dbb876c6ea5f1634a4e77379ca1916459db6929becc1e3510e71079c8ec718e93551b63ca0374b574d432f0ea49d2be5
+AUX sextractor-2.19.5-fno-common.patch 7478 BLAKE2B 839285c85370ab0d138b86bac04e3e05e20b7f79eb45efa9c2d1876c1c3bf7236e3c82db2bf6add09d260442658180ced677f5cbb36714948c9b04f9ee15c856 SHA512 2a8510dc5e8a2410bf3e322b2df83d1d50d62401001199af68dd5087f7ae7a1b313bdc864756be9e0d079b51e3757c46aecd339a242dcf0a6809871e874cab9e
 AUX sextractor-2.19.5-have-malloc.patch 543 BLAKE2B 4cf609e2f5a0e547e4af25c9a794a6c4b69e3251abf497837195a8a6d8f73002de12eb2b80216baaa0cd22b23d27d8a62d121d9ee0fc3e2aee99cac8de6d43bc SHA512 98bcfbe9a010f58976782113e3ad7f4eb1008f3f39a62a4a7a17ed74a03d05957198806da9972337052472d0c628875085fef1f85aefe573a7fe66347dd52090
 AUX sextractor-2.19.5-have-mmap.patch 1406 BLAKE2B 496751b652b4d9c4224465a46011026199a6ef3dff31e9b7b729a67afa4f055ccb09b32cf7dbe619b295f95a496584b580fb697f17b3ed4cb82e2049dd1eb447 SHA512 b944a9c75b379932faa0af70d6e215ccbe113b2b063939d8a21810a1c03deecdb0c5a2947b4ebdf4c1396426bd2382e3014e906ac68ef17962670e3705d95a45
 AUX sextractor-2.19.5-sigbus.patch 736 BLAKE2B 4c9dd4e42dce495c7edd9f774d9d9868735f71d8947d998ea7815363f661f428fb9725b56a333aae644c69d451c50dc8dce1c1ce421725cf819e97e7cd6a174d SHA512 bca9ad7a758294812761b9f860cc40cd931a5753f248a4682858e9fd1b917a485d5e0b891e17b90c96b54d0e7f05d1aa2e2e7e6143fdc52ec57d4a609c9f4df6
 DIST sextractor-2.19.5.tar.gz 4317039 BLAKE2B 3f0618ec7d782422289287bf1d327ff7e9136866d3a15a9cea74d23a8625f902281aa2d5eba0827d703942ca9b0c1d875d8441e07cdb4450b89b03f2d1229bc0 SHA512 aadd007facad983ea35bd7496a53520f987aa8e492259e428170354d262212e3c1a17c60bf6ea97b6056136b0bd02793e92e14b21cb40a0f8886245eeeac6f4d
-EBUILD sextractor-2.19.5-r1.ebuild 1776 BLAKE2B f10f4782b9a4f646a2e8fe994497a7921c722b302e468baa97402da118a405b448c4660ad3974fe94757112664dcdb0cc4b880276a5ca097f768aa42819fa255 SHA512 015e0f238b7f94c884540ece28db44b86eb685ac3cd2741c54549aea4be1be14ecb241c9e799fe6b4aafbd9ed4097003c09e68d17be14c5c2b994293f765cccc
-EBUILD sextractor-2.19.5.ebuild 1759 BLAKE2B fc2fbac77343dbd0090eeecc6c8bb947995529c764a9a715143e50a5676f361ebd3e9c1f93ccbcf9ec040ae1633001ef1f8a52c0d7e71219a47fa6e6e29eccc4 SHA512 683452d8da4b850e4649efca6dea05a7e12c23bc3938376e4bd12203d03259133a0eb508c17c0227c95525811b59fc1f7e25a80dec84e603c5b12e43a4c2f2dd
+EBUILD sextractor-2.19.5-r1.ebuild 1835 BLAKE2B 5c70474574eb43c264efaae44da679c4832f2c6826e94b7ec9afcd67ade1769a819daeb8697adefe9fc85d65d34cf97a093d5bad6206a6f2798dc7082380a2b3 SHA512 f185e25bc82152bedf4900043ff3ff6a15aaa5cb45b8d2222b73e6beedaadd7da1f1d98c686df1e8d7c8b1f86063a89528601770dd0a3944146e107d0b22800f
 MISC metadata.xml 797 BLAKE2B 8f4e60a4818c4f94b852aa52fd1138cdbf41a96dd0982eca7e1890e4167bb097a375ab1c4fc92866596e12eee0bfa66cc91bafd674a11679b52f2749cddf0040 SHA512 83f4baddd93a51960fb6adf2d55b7c5cda033f92ad5dc92eb7e6f15392432f49f40b1fe07dcfc475a464a6d3502696a3639c0e33d5c45848fbda686a1777189c
diff --git a/sci-astronomy/sextractor/files/sextractor-2.19.5-fno-common.patch b/sci-astronomy/sextractor/files/sextractor-2.19.5-fno-common.patch
new file mode 100644
index 000000000000..1150fe366f5e
--- /dev/null
+++ b/sci-astronomy/sextractor/files/sextractor-2.19.5-fno-common.patch
@@ -0,0 +1,277 @@
+--- a/src/clean.c
++++ b/src/clean.c
+@@ -44,6 +44,7 @@
+ 
+ /*------------------------------- variables ---------------------------------*/
+ 
++objliststruct *cleanobjlist;
+ static LONG		*cleanvictim;
+ 
+ 
+--- a/src/clean.h
++++ b/src/clean.h
+@@ -33,7 +33,7 @@
+ 
+ /*------------------------------- variables ---------------------------------*/
+ 
+-objliststruct	*cleanobjlist;		/* laconic, isn't it? */
++extern objliststruct	*cleanobjlist;		/* laconic, isn't it? */
+ 
+ /*------------------------------- functions ---------------------------------*/
+ 
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -40,6 +40,8 @@
+ #include	"extract.h"
+ #include	"plist.h"
+ 
++PIXTYPE   *dumscan;
++
+ /*------------------------- Static buffers for lutz() -----------------------*/
+ 
+ static infostruct	*info, *store;
+--- a/src/extract.h
++++ b/src/extract.h
+@@ -37,7 +37,7 @@
+ 				status;	/* Extraction status */
+ 
+ /*--------------------------------- variables -------------------------------*/
+-PIXTYPE		*dumscan;
++extern PIXTYPE		*dumscan;
+ 
+ /*------------------------------- structures --------------------------------*/
+ /* Temporary object parameters during extraction */
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -44,6 +44,8 @@
+ #include	"filter.h"
+ #include	"image.h"
+ 
++filterstruct  *thefilter;
++
+ /******************************** convolve ***********************************/
+ /*
+ Convolve a scan line with an array.
+--- a/src/filter.h
++++ b/src/filter.h
+@@ -43,7 +43,7 @@
+   struct structbpann	*bpann;
+   }	filterstruct;
+ 
+-filterstruct	*thefilter;
++extern filterstruct	*thefilter;
+ 
+ /*------------------------------- functions ---------------------------------*/
+ void		convolve(picstruct *, PIXTYPE *, int y),
+--- a/src/fits/fitscat.c
++++ b/src/fits/fitscat.c
+@@ -42,6 +42,10 @@
+ #include	"fitscat_defs.h"
+ #include	"fitscat.h"
+ 
++float      ctg[37], stg[37];
++char     gstr[MAXCHAR];
++int   bswapflag;
++
+ /****** about_cat **************************************************************
+ PROTO	int about_cat(catstruct *cat, FILE *stream)
+ PURPOSE	Print some info about a catalog.
+--- a/src/fits/fitscat_defs.h
++++ b/src/fits/fitscat_defs.h
+@@ -86,7 +86,7 @@
+ typedef	int		LONG;			/* for DEC-Alpha... */
+ 	
+ /*----------------------------- Internal constants --------------------------*/
+-char		gstr[MAXCHAR];
++extern char		gstr[MAXCHAR];
+ 
+ /*----------------------------- External constants --------------------------*/
+ 
+--- a/src/fits/fitscat.h
++++ b/src/fits/fitscat.h
+@@ -333,6 +333,6 @@
+ 		warning(char *msg1, char *msg2);
+ 
+ 
+-int		bswapflag;
++extern int		bswapflag;
+ 
+ #endif
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -30,13 +30,13 @@
+ 
+ /*----------------------- miscellaneous variables ---------------------------*/
+ 
+-sexcatstruct		thecat;
+-picstruct		thefield1,thefield2, thewfield1,thewfield2;
+-objstruct		flagobj;
+-obj2struct		flagobj2;
++extern sexcatstruct		thecat;
++extern picstruct		thefield1,thefield2, thewfield1,thewfield2;
++extern objstruct		flagobj;
++extern obj2struct		flagobj2;
+ extern obj2struct	outobj2;
+-float			ctg[37], stg[37];
+-char			gstr[MAXCHAR];
++extern float			ctg[37], stg[37];
++extern char			gstr[MAXCHAR];
+ 
+ /*------------------------------- functions ---------------------------------*/
+ extern void	alloccatparams(void),
+--- a/src/plist.c
++++ b/src/plist.c
+@@ -38,6 +38,11 @@
+ #include	"prefs.h"
+ #include	"plist.h"
+ 
++int plistexist_value, plistexist_dvalue, plistexist_cdvalue,
++  plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
++  plistoff_value, plistoff_dvalue, plistoff_cdvalue,
++  plistoff_flag[MAXFLAG], plistoff_wflag, plistoff_dthresh, plistoff_var,
++  plistsize;
+ 
+ /******************************** createblank *******************************
+ PROTO   int createblank(int no, objliststruct *objlist)
+--- a/src/plist.h
++++ b/src/plist.h
+@@ -47,7 +47,7 @@
+ 
+ /*-------------------------------- globals ----------------------------------*/
+ 
+-int	plistexist_value, plistexist_dvalue, plistexist_cdvalue,
++extern int	plistexist_value, plistexist_dvalue, plistexist_cdvalue,
+ 	plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
+ 	plistoff_value, plistoff_dvalue, plistoff_cdvalue,
+ 	plistoff_flag[MAXFLAG], plistoff_wflag, plistoff_dthresh, plistoff_var,
+--- a/src/preflist.h
++++ b/src/preflist.h
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ /*-------------------------------- initialization ---------------------------*/
+- int	idummy;
++extern int	idummy;
+ 
+  pkeystruct key[] =
+  {
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -56,6 +56,9 @@
+ #include	"preflist.h"
+ #include	"fits/fitscat.h"
+ 
++prefstruct    prefs;
++double  ddummy;
++int idummy;
+ 
+ /********************************* dumpprefs ********************************/
+ /*
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -249,7 +249,7 @@
+   int		nthreads;			/* Number of active threads */
+   }	prefstruct;
+ 
+-  prefstruct		prefs;
++extern  prefstruct		prefs;
+ 
+ /*-------------------------------- protos -----------------------------------*/
+ extern int	cistrcmp(char *cs, char *ct, int mode);
+--- a/src/psf.c
++++ b/src/psf.c
+@@ -47,6 +47,9 @@
+ 
+ /*------------------------------- variables ---------------------------------*/
+ 
++psfstruct *psf,*thedpsf,*thepsf;
++psfitstruct *thepsfit,*thedpsfit;
++PIXTYPE   *checkmask;
+ 
+ extern keystruct	objkey[];
+ extern objstruct	outobj;
+--- a/src/psf.h
++++ b/src/psf.h
+@@ -102,9 +102,9 @@
+   }	psfitstruct;
+ 
+ /*----------------------------- Global variables ----------------------------*/
+-psfstruct	*psf,*thedpsf,*thepsf;
+-psfitstruct	*thepsfit,*thedpsfit;
+-PIXTYPE		*checkmask;
++extern psfstruct	*psf,*thedpsf,*thepsf;
++extern psfitstruct	*thepsfit,*thedpsfit;
++extern PIXTYPE		*checkmask;
+ 
+ /*-------------------------------- functions --------------------------------*/
+ extern void	compute_pos(int *pnpsf,int *pconvflag,int *pnpsfflag,
+--- a/src/retina.c
++++ b/src/retina.c
+@@ -42,6 +42,7 @@
+ #include	"image.h"
+ #include	"retina.h"
+ 
++retistruct  *theretina;
+ 
+ /******************************** readretina *********************************/
+ /*
+--- a/src/retina.h
++++ b/src/retina.h
+@@ -38,7 +38,7 @@
+   struct structbpann	*bpann;	/* The neural network */
+   }     retistruct;
+ 
+-retistruct	*theretina;
++extern retistruct	*theretina;
+ 
+ /*------------------------------- functions ---------------------------------*/
+ 
+--- a/src/sexhead1.h
++++ b/src/sexhead1.h
+@@ -26,8 +26,8 @@
+ *
+ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+ 
+-int	idummy;
+-double	ddummy;
++extern int	idummy;
++extern double	ddummy;
+ 
+ keystruct	headkey1[] = {
+   {"EPOCH   ", "",
+--- a/src/som.c
++++ b/src/som.c
+@@ -41,6 +41,8 @@
+ #include	"prefs.h"
+ #include	"som.h"
+ 
++somstruct *thesom;
++
+ /********************************* som_phot **********************************/
+ /*
+ Perform SOM-fitting on a detected source: returns node number of the
+--- a/src/som.h
++++ b/src/som.h
+@@ -70,7 +70,7 @@
+   float		stderror;		/* Global reduced error */
+   }	somstruct;
+ 
+-somstruct	*thesom;
++extern somstruct	*thesom;
+ 
+ /*---------------------------------- protos --------------------------------*/
+ 
+--- a/src/xml.c
++++ b/src/xml.c
+@@ -50,6 +50,11 @@
+ xmlstruct		*xmlstack = NULL;
+ int			nxml=0, nxmlmax=0;
+ 
++sexcatstruct    thecat;
++picstruct   thefield1,thefield2, thewfield1,thewfield2;
++objstruct   flagobj;
++obj2struct    flagobj2;
++
+ /****** init_xml ************************************************************
+ PROTO	int	init_xml(void)
+ PURPOSE	Initialize a set of meta-data kept in memory before being written to the
diff --git a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
index 834a57a2649c..784c9d8c33fe 100644
--- a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 AUTOTOOLS_AUTO_DEPEND=no
 
@@ -10,65 +10,69 @@ inherit autotools
 DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
 HOMEPAGE="http://www.astromatic.net/software/sextractor"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="GPL-3"
 SLOT="0"
-
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc modelfit test threads"
+REQUIRED_USE="test? ( modelfit )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!games-misc/sex
-	modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )"
+	modelfit? (
+		sci-libs/atlas[lapack,threads=]
+		sci-libs/fftw:3.0=
+	)"
 DEPEND="${RDEPEND}
 	modelfit? ( ${AUTOTOOLS_DEPEND} )"
 
-REQUIRED_USE="test? ( modelfit )"
-
 PATCHES=(
-	"${FILESDIR}/${P}-fix-format-errors.patch"
-	"${FILESDIR}/${P}-have-malloc.patch"
-	"${FILESDIR}/${P}-have-mmap.patch"
-	"${FILESDIR}/${P}-sigbus.patch"
+	"${FILESDIR}"/${P}-fix-format-errors.patch
+	"${FILESDIR}"/${P}-have-malloc.patch
+	"${FILESDIR}"/${P}-have-mmap.patch
+	"${FILESDIR}"/${P}-sigbus.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
 	default
+
 	if use modelfit; then
-	local mycblas=atlcblas myclapack=atlclapack
-	if use threads; then
-		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
-			mycblas=ptcblas
-		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \
-			myclapack=ptclapack
-	fi
-	sed -i \
-		-e "s/-lcblas/-l${mycblas}/g" \
-		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
-		-e "s/-llapack/-l${myclapack}/g" \
-		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		acx_atlas.m4 || die
-	eautoreconf
+		local mycblas=atlcblas
+		local myclapack=atlclapack
+		if use threads; then
+			[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
+				mycblas=ptcblas
+			[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \
+				myclapack=ptclapack
+		fi
+		sed -i \
+			-e "s/-lcblas/-l${mycblas}/g" \
+			-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
+			-e "s/-llapack/-l${myclapack}/g" \
+			-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
+			acx_atlas.m4 || die
+		eautoreconf
 	fi
 }
 
 src_configure() {
 	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+		--with-atlas-incdir="${EPREFIX}"/usr/include/atlas \
 		$(use_enable modelfit model-fitting) \
 		$(use_enable threads)
 }
 
 src_install() {
 	default
-	CONFDIR=/usr/share/sextractor
-	insinto ${CONFDIR}
-	doins config/*
-	use doc && dodoc doc/*
+
+	insinto /usr/share/sextractor
+	doins -r config/.
+	use doc && dodoc -r doc/.
 }
 
 pkg_postinst() {
 	elog "SExtractor examples configuration files are located in"
-	elog "${EROOT%/}/${CONFDIR} and are not loaded anymore by default."
+	elog "${EROOT}/usr/share/sextractor and are not loaded anymore by default."
 }
diff --git a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
deleted file mode 100644
index ada0e42fda44..000000000000
--- a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit autotools
-
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
-HOMEPAGE="http://www.astromatic.net/software/sextractor"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="doc modelfit test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )"
-DEPEND="${RDEPEND}
-	modelfit? ( ${AUTOTOOLS_DEPEND} )"
-
-REQUIRED_USE="test? ( modelfit )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-format-errors.patch"
-	"${FILESDIR}/${P}-have-malloc.patch"
-	"${FILESDIR}/${P}-have-mmap.patch"
-	"${FILESDIR}/${P}-sigbus.patch"
-)
-
-src_prepare() {
-	default
-	if use modelfit; then
-	local mycblas=atlcblas myclapack=atlclapack
-	if use threads; then
-		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
-			mycblas=ptcblas
-		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \
-			myclapack=ptclapack
-	fi
-	sed -i \
-		-e "s/-lcblas/-l${mycblas}/g" \
-		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
-		-e "s/-llapack/-l${myclapack}/g" \
-		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		acx_atlas.m4 || die
-	eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
-		$(use_enable modelfit model-fitting) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-	CONFDIR=/usr/share/sextractor
-	insinto ${CONFDIR}
-	doins config/*
-	use doc && dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "SExtractor examples configuration files are located in"
-	elog "${EROOT%/}/${CONFDIR} and are not loaded anymore by default."
-}
diff --git a/sci-astronomy/skymaker/Manifest b/sci-astronomy/skymaker/Manifest
index 87d9c6f3a45c..994a7112bd50 100644
--- a/sci-astronomy/skymaker/Manifest
+++ b/sci-astronomy/skymaker/Manifest
@@ -1,3 +1,4 @@
+AUX skymaker-3.10.5-fno-common.patch 1719 BLAKE2B 473656de5281f6c4aaf06dd02a0d35f06e82edc329e68c6a5de0d8f8c75dff2127345b349c81fdc697268ba56f0f622faeea10ff791abf98d9b81bcbea2c4617 SHA512 21370919be5e4f1737fa2cbab0b25e889be2ed25a9152154270adcec53db18af040eb658bc7541622c57450b90b9415c16a4c8bfa7053f2221c91373f853e280
 DIST skymaker-3.10.5.tar.gz 508938 BLAKE2B 82baaf083deb941c31052c3394a601489cb9c4efea979055236eb33af1df2b5473bc43339e76de0785956f5a9a7968f48c62227c66bf1e76ef57907e16cbdac4 SHA512 98bb5a75c21475c6ecf16cb7de333db7faae95fd32c4ac311b44ddf637ffec2c80061b056b070b8d21b1a5a46c0a5a82855e417d25a9d8de02aad2167cb45b43
-EBUILD skymaker-3.10.5.ebuild 478 BLAKE2B cfa9767c79c076a7c46b3d3a9e1f7a529e5cd63d152581e29db782a293386203d07a8c379cb85b5e3a762fbfd9540959a2f7904e887c64470d46451c0b8ff5c3 SHA512 8b5718b7f30c6ee93cd100085db033c9f3f348b71596cc768d7002cf4e46f7a872ac280472b10d788cfe2bfde8e55b7205f974c753060136bdcfc2ed76de75c4
+EBUILD skymaker-3.10.5.ebuild 525 BLAKE2B 7cc392bfc66c99ed270f3380f69140d96daf868b01cf9b55c5f1f1cd595b3bf138fb0d32a07c0fac856a69b4b9557a1d3c04d67eecb8358deff805c6ca373556 SHA512 141e468835c705945ed246cd6f00db1839e8e396253312bfa6672572123027e5346f13a1184f2596bb25d83645a23da7defed931e86b5948d2b8d80ff61518be
 MISC metadata.xml 643 BLAKE2B 95eb978f8750015d33ffd6f62095d925e707b61b52e04f0e77b0016c6e579bf47ba5044d661b5d2bd9667d43ad4b4593518522f855bf2fbfca44953450b5fe3a SHA512 e96b76eb34dacad52e05f916ea8c6dafe9e1204bfbcfd3e24c791d179dcaaee6287aba5f81bfe4d922444a988df48ab4113883e5174b7d3e40c18e299b78c9da
diff --git a/sci-astronomy/skymaker/files/skymaker-3.10.5-fno-common.patch b/sci-astronomy/skymaker/files/skymaker-3.10.5-fno-common.patch
new file mode 100644
index 000000000000..f80ed5422c67
--- /dev/null
+++ b/sci-astronomy/skymaker/files/skymaker-3.10.5-fno-common.patch
@@ -0,0 +1,66 @@
+--- a/src/fits/fitscat.c
++++ b/src/fits/fitscat.c
+@@ -42,6 +42,9 @@
+ #include	"fitscat_defs.h"
+ #include	"fitscat.h"
+ 
++int   bswapflag;
++char    gstr[MAXCHAR];
++
+ /****** about_cat **************************************************************
+ PROTO	int about_cat(catstruct *cat, FILE *stream)
+ PURPOSE	Print some info about a catalog.
+--- a/src/fits/fitscat_defs.h
++++ b/src/fits/fitscat_defs.h
+@@ -86,7 +86,7 @@
+ typedef	int		LONG;			/* for DEC-Alpha... */
+ 	
+ /*----------------------------- Internal constants --------------------------*/
+-char		gstr[MAXCHAR];
++extern char		gstr[MAXCHAR];
+ 
+ /*----------------------------- External constants --------------------------*/
+ 
+--- a/src/fits/fitscat.h
++++ b/src/fits/fitscat.h
+@@ -333,6 +333,6 @@
+ 		warning(char *msg1, char *msg2);
+ 
+ 
+-int		bswapflag;
++extern int		bswapflag;
+ 
+ #endif
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -29,7 +29,7 @@
+ #include "types.h"
+ 
+ /*----------------------- miscellaneous variables ---------------------------*/
+-char		gstr[MAXCHAR];
++extern char		gstr[MAXCHAR];
+ 
+ /*------------------------------- functions ---------------------------------*/
+ extern void	makeit(void);
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -59,6 +59,8 @@
+ #include "prefs.h"
+ #include "preflist.h"
+ 
++prefstruct  prefs;
++
+ /********************************* dumpprefs ********************************/
+ /*
+ Print the default preference parameters.
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -149,7 +149,7 @@
+   int		nobj;				/* Number of sources added */
+         }	prefstruct;
+ 
+-prefstruct	prefs;
++extern prefstruct	prefs;
+ 
+ /*-------------------------------- protos -----------------------------------*/
+ extern int	cistrcmp(char *cs, char *ct, int mode);
diff --git a/sci-astronomy/skymaker/skymaker-3.10.5.ebuild b/sci-astronomy/skymaker/skymaker-3.10.5.ebuild
index da9788d145b4..dd5c6c6a1882 100644
--- a/sci-astronomy/skymaker/skymaker-3.10.5.ebuild
+++ b/sci-astronomy/skymaker/skymaker-3.10.5.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Program that simulates astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/skymaker"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="threads"
 
-RDEPEND="sci-libs/fftw:3.0"
+RDEPEND="sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_configure() {
 	econf $(use_enable threads)
 }
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 71922a3d8e04..f610bea6d5cd 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,12 +1,17 @@
 AUX stellarium-0.20.2-disable-x86-test.patch 834 BLAKE2B 3b66784a9535be602aabf0b88bf83182bf7e63e67cf746bb0270cb04759b42ad92ed2427bbe024aa09716fbb03ad5621afe4e708f2f3d1e783057f1fadf23691 SHA512 a6e826d81882534b5826ed5847d90cc036ce5b388efa63adc9ba08a61daa91af86066c514b60edeb20cf4d4b2c60cd9c74f641fc02f0954506ba4063ff95e645
+AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294
+AUX stellarium-0.20.3-unbundle-qtcompress.patch 8123 BLAKE2B 314a2f4c191b7d6c0083679878c38bf6f632a1be6d19d68d82a0eda520c9a96e3f4f87d7437b6cf53c0812fc917ec82865796a8088da7afc2d6424d442a20a94 SHA512 fd6121345a5609b8a70a06753b6495b258eae7a1f978d8eeac8e7aa6b73777d9a982bc016d891bbcad48ead1b5c624bb0b07dbac8b40bd1a16baaf347b72b97d
+AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
-DIST stellarium-0.20.1.tar.gz 343991703 BLAKE2B 59580dd2bca885893bfc68faaf966a727e3d7c0774f59726e23cec132cbfca4ae518983db2e52d4d3d3f1ec96c7ce876168bb23959178ebf212ee6bb357299b3 SHA512 685a306391dc681cc21834a226e35c769e11909f625ff7461d7e896ba412ad595871e93c69981b342099f46829f9f3ef3e276be867dc5ea5523fa60a99cc21d1
 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-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
-EBUILD stellarium-0.20.1.ebuild 2233 BLAKE2B 9e5228c4a7ef23f2382ba71d02bac61fbbe995f07f49a26d4621ed0cfad22271289a05811c4662cb1a35e38aa047e9186143396e1c472652031aa4b4720b8564 SHA512 911ad306134ec38383580d9e677faae00cfca79824f98d3db046cee9bd84339d5fed0cebf969e7efd6d00e0c18fd6803db96f233f76621760ac5f01ab2404ba5
+DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3
+DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
 EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763
-MISC metadata.xml 1101 BLAKE2B acb5d8968e42487806e9df0d300c8070f8df139855a0caf0324504cd5e49c9ee5e4446b6e029a88ad3e38320179adac30d414aa96a569e327bf6cb391ed10e6c SHA512 14e3d4b82b5f7c5f4c28078df0b4295fd305813c045c1f6c7262fe30181911fca5fae728d822048ba154fd7ed8f92b9c1965a8d10e75d51da825ff4e2db3cbb9
+EBUILD stellarium-0.20.3.ebuild 3945 BLAKE2B e590630ada580f83c59daa2ea81ca945ac81b6ecaa4d76a12e8da9a60b27fad68653f0df68108046e3d85cd17859b9f2767a95568f12b4a18d8db8f5782c27d2 SHA512 c8c4ee386d5f0f8fd18b485098617422030d79134f7b1d1549188593ee6319dbed70123503f419409694ecc40ccc5742a62200a26e73244887060b66ee83959e
+MISC metadata.xml 1166 BLAKE2B ae9afc6a617426c07b8746859f4e1ed0e7ab61256cb82f754f8fb0f7d9e24709b2f9edf9a4f4fef1f8d0d6b46eaee2ef8af3641b81abacd8391cf41fa0624e79 SHA512 dc95989f85aaaf8c08a86b0dbaa2a57d69226dfae7e4317f8c7cc5a3dd8d4a0303a9e3111d29b6a18242f3a96e17d4e4f01fd85c7e4d7a0587495d775d537781
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
new file mode 100644
index 000000000000..33d355f842f4
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
@@ -0,0 +1,82 @@
+diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+index a250e1bb0f..f14007c392 100644
+--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+@@ -25,7 +25,7 @@ add_library(TelescopeControl_INDI STATIC
+ target_link_libraries(TelescopeControl_INDI
+     Qt5::Core
+     Qt5::Network
+-    indiclient
++    -lindiclient
+     TelescopeControl_common
+     ${CMAKE_THREAD_LIBS_INIT}
+     )
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+index f401dc7049..d890d3aa14 100644
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+@@ -25,9 +25,9 @@
+ #include <limits>
+ #include <cmath>
+ 
+-#include "indibase/baseclient.h"
+-#include "indibase/basedevice.h"
+-#include "indibase/inditelescope.h"
++#include "libindi/baseclient.h"
++#include "libindi/basedevice.h"
++#include "libindi/inditelescope.h"
+ 
+ const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1;
+ 
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+index 111ad2cdba..80ead01137 100644
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+@@ -20,7 +20,7 @@
+ #define INDICONNECTION_HPP
+ 
+ #include <QObject>
+-#include "indibase/baseclient.h"
++#include "libindi/baseclient.h"
+ 
+ #include <mutex>
+ #include <QStringList>
+diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+index 6bd7754ff5..633d4ae7b2 100644
+--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
++++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+@@ -24,7 +24,7 @@
+ 
+ #include "StelCore.hpp"
+ #include "StelUtils.hpp"
+-#include "indibase/inditelescope.h"
++#include "libindi/inditelescope.h"
+ #include "INDIControlWidget.hpp"
+ 
+ TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString &params):
+diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+index 6c1a281ec5..ca7b7e0c40 100644
+--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+@@ -22,7 +22,7 @@
+ #include <cmath>
+ 
+ #include "INDIConnection.hpp"
+-#include "indibase/basedevice.h"
++#include "libindi/basedevice.h"
+ 
+ void TestINDIConnection::deafultCoordinates()
+ {
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 6fcf7678da..a59d8c121c 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

+ 

+ ################################# INDI ################################

+-IF(USE_PLUGIN_TELESCOPECONTROL)

++IF(USE_PLUGIN_TELESCOPECONTROL AND 0)

+     set(INDI_SOVERSION "1")

+     set(CMAKE_INDI_VERSION_MAJOR 1)

+     set(CMAKE_INDI_VERSION_MINOR 6)

diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
new file mode 100644
index 000000000000..64b19a54c88a
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
@@ -0,0 +1,222 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b72c2c8f6..9436bc66da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -629,5 +629,6 @@ ELSE()
+ ENDIF()
+ 
++find_package(Qt5Compress REQUIRED)
+ 
+ ########### Set some global variables ###########
+ IF(UNIX AND NOT WIN32)
+diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
+index 8e3138adf2..b59049767d 100644
+--- a/plugins/Satellites/src/CMakeLists.txt
++++ b/plugins/Satellites/src/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
+ ENDIF(ENABLE_TESTING)
+ 
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
+ IF(MSVC)
+diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
+index 7432f4316d..f4f4453661 100644
+--- a/plugins/Satellites/src/Satellites.cpp
++++ b/plugins/Satellites/src/Satellites.cpp
+@@ -43,7 +43,7 @@
+ #include "StelUtils.hpp"
+ #include "StelActionMgr.hpp"
+ 
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ 
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+ 					QString archive = zip.fileName();
+ 					QByteArray data;
+ 
+-					Stel::QZipReader reader(archive);
+-					if (reader.status() != Stel::QZipReader::NoError)
++					QZipReader reader(archive);
++					if (reader.status() != QZipReader::NoError)
+ 						qWarning() << "[Satellites] Unable to open as a ZIP archive";
+ 					else
+ 					{
+-						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ 						for (const auto& info : infoList)
+ 						{
+ 							// qWarning() << "[Satellites] Processing:" << info.filePath;
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bdd214729f..81631ce8ec 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+      CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+ ENDIF()
+ 
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+ IF(ENABLE_LIBGPS)
+      SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
+ ENDIF()
+diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
+index 8da2070b26..9949252cee 100644
+--- a/src/core/modules/LandscapeMgr.cpp
++++ b/src/core/modules/LandscapeMgr.cpp
+@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ 	}
+ 	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+ 
+-	Stel::QZipReader reader(sourceFilePath);
+-	if (reader.status() != Stel::QZipReader::NoError)
++	QZipReader reader(sourceFilePath);
++	if (reader.status() != QZipReader::NoError)
+ 	{
+ 		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
+ 		emit errorNotArchive();
+@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ 
+ 	//Detect top directory
+ 	QString topDir, iniPath;
+-	QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++	QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ 	for (const auto& info : infoList)
+ 	{
+ 		QFileInfo fileInfo(info.filePath);
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 1e0e7e2b32..834aff89cb 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

+ 

++if(0)

+ set(qtcompress_SRCS

+     qtcompress/qzip.cpp

+     qtcompress/qzipreader.h

+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
+ #turn off automoc, not needed here

+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)

+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

++endif()

+ 

+ set(qcustomplot_SRCS

+     qcustomplot/qcustomplot.cpp

+@@ -176,7 +176,7 @@
+     qxlsx/xlsxcelllocation.h

+     )

+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})

+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)

++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)

+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

+ 

+ ################################# INDI ################################

+diff -r 11536448457a xlsxzipreader.cpp
+--- a/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:41:22 2020 +0100
++++ b/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:42:03 2020 +0100
+@@ -28,13 +28,13 @@
+ namespace QXlsx {
+ 
+ ZipReader::ZipReader(const QString &filePath) :
+-    m_reader(new Stel::QZipReader(filePath))
++    m_reader(new QZipReader(filePath))
+ {
+     init();
+ }
+ 
+ ZipReader::ZipReader(QIODevice *device) :
+-    m_reader(new Stel::QZipReader(device))
++    m_reader(new QZipReader(device))
+ {
+     init();
+ }
+@@ -45,8 +45,8 @@
+ 
+ void ZipReader::init()
+ {
+-	QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+-	foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
++	QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++	foreach (const QZipReader::FileInfo &fi, allFiles)
+ 	{
+ 		if (fi.isFile)
+ 			m_filePaths.append(fi.filePath);
+diff -r 2019bb0d2919 xlsxzipreader_p.h
+--- a/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:35:35 2020 +0100
++++ b/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:36:28 2020 +0100
+@@ -38,7 +38,7 @@
+ //
+ 
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ #include <QScopedPointer>
+ #include <QStringList>
+ #include <QVector>
+@@ -60,7 +60,7 @@
+ private:
+     Q_DISABLE_COPY(ZipReader)
+     void init();
+-    QScopedPointer<Stel::QZipReader> m_reader;
++    QScopedPointer<QZipReader> m_reader;
+     QStringList m_filePaths;
+ };
+ 
+diff -r 11536448457a xlsxzipwriter.cpp
+--- a/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:41:22 2020 +0100
++++ b/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:42:03 2020 +0100
+@@ -29,14 +29,14 @@
+ 
+ ZipWriter::ZipWriter(const QString &filePath)
+ {
+-    m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
+-    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++    m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
++    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+ 
+ ZipWriter::ZipWriter(QIODevice *device)
+ {
+-    m_writer = new Stel::QZipWriter(device);
+-    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++    m_writer = new QZipWriter(device);
++    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+ 
+ ZipWriter::~ZipWriter()
+@@ -46,7 +46,7 @@
+ 
+ bool ZipWriter::error() const
+ {
+-    return m_writer->status() != Stel::QZipWriter::NoError;
++    return m_writer->status() != QZipWriter::NoError;
+ }
+ 
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device)
+diff -r 2019bb0d2919 xlsxzipwriter_p.h
+--- a/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:35:35 2020 +0100
++++ b/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:36:28 2020 +0100
+@@ -37,7 +37,7 @@
+ //
+ 
+ #include <QString>
+-#include "external/qtcompress/qzipwriter.h"
++#include "qzipwriter.h"
+ 
+ class QIODevice;
+ class QZipWriter;
+@@ -57,7 +57,7 @@
+     void close();
+ 
+ private:
+-    Stel::QZipWriter *m_writer;
++    QZipWriter *m_writer;
+ };
+ 
+ } // namespace QXlsx
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
new file mode 100644
index 000000000000..6fb7fb4f7859
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
@@ -0,0 +1,23 @@
+This patch is not really needed, because zlib is already used from system, but
+it makes it easier to ensure that nothing else is bundled
+
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 834aff89cb..590579e501 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui)
+ set_target_properties(glues_stel PROPERTIES AUTOMOC 0)

+ SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external")

+ 

++if(0)

+ SET(zlib_SRCS

+      zlib/adler32.c

+      zlib/compress.c

+@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ #turn off automoc, not needed here

+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

++endif()

+ 

+ if(0)

+ set(qtcompress_SRCS

diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 53378dcf2286..5edf86197e9f 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>alexey+gentoo@asokolov.org</email>
-    <name>Alexey Sokolov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Stellarium is a free open source planetarium for your computer. It
-  shows a realistic sky in 3D, just like what you see with the naked
-  eye, binoculars or a telescope. It is being used in planetarium
-  projectors.
-</longdescription>
-  <use>
-    <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
-    <flag name="media">Enable sound and video support</flag>
-    <flag name="stars">Install extra star catalogs</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">stellarium</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Stellarium is a free open source planetarium for your computer. It
+		shows a realistic sky in 3D, just like what you see with the naked
+		eye, binoculars or a telescope. It is being used in planetarium
+		projectors.
+	</longdescription>
+	<use>
+		<flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
+		<flag name="media">Enable sound and video support</flag>
+		<flag name="stars">Install extra star catalogs</flag>
+		<flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Stellarium/stellarium</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/stellarium/stellarium-0.20.1.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
index 616eeba408b1..f2be3a131155 100644
--- a/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
@@ -3,12 +3,20 @@
 
 EAPI=7
 
-inherit cmake desktop flag-o-matic xdg virtualx
+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://www.stellarium.org/"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.11"
 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
@@ -17,15 +25,19 @@ SRC_URI="
 		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
 	)"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gps media nls stars test"
+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
@@ -39,6 +51,7 @@ RDEPEND="
 	virtual/opengl
 	gps? ( dev-qt/qtpositioning:5 )
 	media? ( dev-qt/qtmultimedia:5[widgets] )
+	telescope? ( sci-libs/indilib:= )
 "
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
@@ -47,9 +60,31 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-indi.patch"
+	"${FILESDIR}/${P}-unbundle-qtcompress.patch"
+	"${FILESDIR}/${P}-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() {
@@ -58,6 +93,7 @@ src_configure() {
 		-DENABLE_MEDIA="$(usex media)"
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_TESTING="$(usex test)"
+		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
 	)
 	cmake_src_configure
 }
@@ -66,7 +102,19 @@ 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
@@ -79,5 +127,9 @@ src_install() {
 		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/stuff/Manifest b/sci-astronomy/stuff/Manifest
index 5e4ccdacf436..96cf57c890d0 100644
--- a/sci-astronomy/stuff/Manifest
+++ b/sci-astronomy/stuff/Manifest
@@ -1,3 +1,4 @@
+AUX stuff-1.26.0-fno-common.patch 1525 BLAKE2B ed896e97960aa8d9bd985b6db130e5896d231a09752a2d0b7d9ea8a3eb56e1dbdd07f5e37ebe4ebf1ddc2734bd6b2dd8099db0f6d70063d0af3ff160e6b0206f SHA512 27f94d19fedae7dd894647174d03b0e50c6e1f71ad6efde9a7109bfa7a40bc49a28c1b06a328e5741652712d345d6664a66c87e8c711b367d51d7a53c346b72e
 DIST stuff-1.26.0.tar.gz 4110495 BLAKE2B ca2af60a1aad3d53035bd7fc9384170a5db58ddd872e29bfaaec70e96840cec1793223f2702d2b4d800ec11c0bc53ddde6d0780d6ba76ffe0d10e6c61b5d2a74 SHA512 6b71112e29d06807c8fc880bd33032a08810554afa563f27d5af19a45293b780ab0b7827ad84ad7942bed28fe3b03bb6c1fa3983667d1fbcbb467b32653203f2
-EBUILD stuff-1.26.0.ebuild 471 BLAKE2B a100574889ed464a65bc1e5cbe405ca507d3edf0bde61b9cdf5c5f374e9396a2199ee72c8a054304f0423c9ea07ad8cc93b3f1dcdf2b8f157b5db9db6a4f31f4 SHA512 264e61b267adca3c75b344a81687e5ddf2ea34a4002ec136e45c15d104ea1c781d1d59f24b756c4ff74e55e35e9567c8b577e71921b58e0ecfaf083e7efd150a
+EBUILD stuff-1.26.0.ebuild 485 BLAKE2B 303dc026ccd8c7fabdc855828a8196897e911f342e5595b70ceaffdc163e83fb67aca114b57351dcf3fd4ef8e942302791b421d7df371c68ae8a1a9504933ea5 SHA512 2ede2392e656a9996801040ec26f295e98b410483307cb1e1afcc0fb6afa46a5f10e424f134393fc74a49fb269bd5df9d197c4bd9a4004e9e8c9abdb567dffca
 MISC metadata.xml 508 BLAKE2B 29a51333e4006e5ab5f8169b4962d24e827350a36204e1730a9a1f735cfda39ce832d21f13f6667890ae72b560fa87b9a912d6af8a51daf55eddd4dee7e9b54d SHA512 44ade9a770e3e3d81016ee2dd3cd0ce57b989afc2115d97b72a7ab12feb1f044b368639b26ee471abf9c7191f1855214b6fdd38d60f52cec49eba7e42468d147
diff --git a/sci-astronomy/stuff/files/stuff-1.26.0-fno-common.patch b/sci-astronomy/stuff/files/stuff-1.26.0-fno-common.patch
new file mode 100644
index 000000000000..bb02fa9e26fd
--- /dev/null
+++ b/sci-astronomy/stuff/files/stuff-1.26.0-fno-common.patch
@@ -0,0 +1,60 @@
+--- a/src/cosmo.c
++++ b/src/cosmo.c
+@@ -39,6 +39,11 @@
+ #include "cosmo.h"
+ #include "lf.h"
+ 
++char    gstr[MAXCHAR];
++int   bswapflag;
++
++double  H, H0, OmegaM, OmegaL, deltaMH;
++
+ /******************************** cosmo_dconf ********************************/
+ /*
+ Conformal distance. Numerical integration along geodesic, allowing for a
+--- a/src/cosmo.h
++++ b/src/cosmo.h
+@@ -38,7 +38,7 @@
+ 
+ /*------------------------------ global variables ---------------------------*/
+ 
+-double	H, H0, OmegaM, OmegaL, deltaMH;
++extern double	H, H0, OmegaM, OmegaL, deltaMH;
+ 
+ /*-------------------------------- protos -----------------------------------*/
+ 
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -29,8 +29,8 @@
+ #include	"types.h"
+ 
+ /*----------------------- miscellaneous variables ---------------------------*/
+-char		gstr[MAXCHAR];
+-int		bswapflag;
++extern char		gstr[MAXCHAR];
++extern int		bswapflag;
+ 
+ /*------------------------------- functions ---------------------------------*/
+ extern	void	error(int, char *, char *),
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -53,6 +53,8 @@
+ #include 	"prefs.h"
+ #include	"preflist.h"
+ 
++prefstruct  prefs;
++
+ /********************************* dumpprefs ********************************/
+ /*
+ Print the default preference parameters.
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -136,7 +136,7 @@
+   double	time_diff;			/* Execution time */
+   }	prefstruct;
+ 
+-prefstruct	prefs;
++extern prefstruct	prefs;
+ 
+ /*----------------------------- Internal constants --------------------------*/
+ 
diff --git a/sci-astronomy/stuff/stuff-1.26.0.ebuild b/sci-astronomy/stuff/stuff-1.26.0.ebuild
index cc672651f264..8c31f838acdf 100644
--- a/sci-astronomy/stuff/stuff-1.26.0.ebuild
+++ b/sci-astronomy/stuff/stuff-1.26.0.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tool for automatic generation of astronomical catalogs"
 HOMEPAGE="http://www.astromatic.net/software/stuff/"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="threads"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
 	econf $(use_enable threads)
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 658f874083c2..92afd63c56d8 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,3 +1,5 @@
 DIST wcslib-5.16.tar.bz2 2222111 BLAKE2B e11da145db6366804321cf415bdac621a930418f09d788c8b94413980710bb43357129a830462339127398082700a9f44f56dc0b8c96ef923d41ea0174dfd07f SHA512 bf7ab586995bdade8b96c77dee891c7d7ab6de82a7e2f94a09d89643e93658063f832efdb66e0bba11ad114b6e0ca555cba9308a84f0f22fb833e3a6303cefe6
+DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
 EBUILD wcslib-5.16.ebuild 1628 BLAKE2B a782f5f8bfcca41cc1e841debfad393473873cb8b450443d0013d2ed74ae5761b8b9a16a7c30e9d578730d5689b2f15233dc13dea8217312c5e09fbba8bef953 SHA512 d4eaad7b56a6982fcc7dc6e33da27b1a6f2216a4b0c7a85bd328951c95c464000d5464625c74dbdeb356802957741010834a992a8dc7d710c398fcc4b11e6dc5
-MISC metadata.xml 976 BLAKE2B 7507ba6725d4a27888d6bc57c2e6c10bcb4a2bd06a2809228423b40009aa1fbef15303cb8a78a510cca5771f3d7cd3b59501751a0969990130d297fe6b1d7312 SHA512 cd4bc1614ea120e04ced965a92fdd343db9e4d1a6046b57efd503674547cfa45ce6a03bb3a2d34a472dccd885d598cbf3cd3d9d9fe182a2fc067a801e8eb9577
+EBUILD wcslib-7.3.ebuild 1584 BLAKE2B f870dcdcd480abd7ee2bf47a2f04fd1cf9c848a01cce69bf52356b1239b35b3c9eb08b971bb9aff7290a40e075fc1cb8fc84b07b26fee1ea47beee34f4d87e94 SHA512 b1477e023fa28849633669a26de76586ca87c20f2bb60e62236d24a67497eeef09d98ebc80608d55ec23e98835ff3286612dc6748fd463b0634dfe1397a2ef21
+MISC metadata.xml 1092 BLAKE2B 117c7758257296d911cadb26e55fc50ad6439c4ac69e82e31b4f41e36a3f862270bb88f87533e25dd5f33c9c07a3ce8164715ba460f91c025c12c7cb31a6b509 SHA512 1c6a19945464451f87c365743d4c2a7271feab32bbafe4147abeafc5948bbf207716f3c46a2dd59c9e9fa5fce5d2b4ab8bebc8a1181915f8f81a2b3a353022e3
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index f74e78465e2d..809842b35b0f 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>
+  <maintainer type="person">
+    <email>davidroman96@gmail.com</email>
+    <name>David Roman</name>
+  </maintainer>
   <longdescription lang="en">
   WCSLIB is a C library, supplied with a full set of Fortran wrappers,
   that implements the "World Coordinate System" (WCS) convention in FITS
diff --git a/sci-astronomy/wcslib/wcslib-7.3.ebuild b/sci-astronomy/wcslib/wcslib-7.3.ebuild
new file mode 100644
index 000000000000..1a490f77abdc
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-7.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2
+
+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/7"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran fits pgplot static-libs +tools"
+
+RDEPEND="
+	fits? ( sci-libs/cfitsio:0= )
+	pgplot? ( sci-libs/pgplot:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable fortran)
+		$(use_enable tools utils)
+	)
+	# hacks because cfitsio and pgplot directories are hard-coded
+	if use fits; then
+		myconf+=(
+			--with-cfitsioinc="${EPREFIX}/usr/include"
+			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		myconf+=( --without-cfitsio )
+	fi
+	if use pgplot; then
+		myconf+=(
+			--with-pgplotinc="${EPREFIX}/usr/include"
+			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		myconf+=( --without-pgplot )
+	fi
+	econf ${myconf[@]}
+	sed -i -e 's/COPYING\*//' GNUmakefile || die
+}
+
+src_test() {
+	emake check
+}
+
+src_install () {
+	default
+	# static libs share the same symbols as shared (i.e. compiled with PIC)
+	# so they are not compiled twice
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
+	use doc || rm -r \
+		"${ED}"/usr/share/doc/${PF}/html \
+		"${ED}"/usr/share/doc/${PF}/*.pdf
+}