gentoo resync : 20.03.2022

19 files changed, 274 insertions, 331 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index be46b6864a5a..06781b3b8242 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/aatm/Manifest b/sci-astronomy/aatm/Manifest
index 17380f34a659..34988a0afc39 100644
--- a/sci-astronomy/aatm/Manifest
+++ b/sci-astronomy/aatm/Manifest
@@ -1,3 +1,3 @@
 DIST aatm-0.6.tar.gz 613800 BLAKE2B 234d6db5c38b45182d525347357458d791d9fe11650391eab4694cb4271c823c0ec86b0e99c50d7b85624e9aafc79f8c9213954675878596f1219810f80614c8 SHA512 aef2d0fccc83a8a5817bd414b60c5167f7e378b434f9a3e9ce2bc2eeceec1cc1fb1b141cec07d78cb325dbfceac2804c07866291b2863f6839dfb6143ed9188a
-EBUILD aatm-0.6.ebuild 858 BLAKE2B bdedccef1b4a71efa15412e4d91c866cc2c7dcd7460c0f63cc69c5261a8baaa9024f3e17a1611c9a6ef02e3b02d31393f2fce80d204afcf774eb1767c1b459f2 SHA512 0fce9b312db14ec669388e4febdbf143d0967047be627e6b873eed7f8d851b5ede00dc644283e06fec3b0a016ec3a5d3d4983ddc4f20a8fe995dec956d17f4ce
+EBUILD aatm-0.6.ebuild 869 BLAKE2B 6e6672adb25f660be2702f44471bd6d263b5b8c2fb172a446276e5bf5b9df99d485937e64d0a68e5261179407b0d7df09efa4dd69bcd50381d6df5180156b8cb SHA512 e31ddd378759f0cb61b306003783ffd1e70f97169af2aeb4c4dd78760af04f947b26f1c62be59fe47eb5f5a0d98f9e997873c3b6541a314221cd1434ea892e5d
 MISC metadata.xml 713 BLAKE2B e8efd145e41749d3b39b4125ddddf0501033267e751f20706806233cec98ed73911fad2ac6d8161475514ae3abc2dd98eb8e6af1e008db4ac0f7b1382c5c952a SHA512 b51f79ca3c0bb9cc4af684e0b3d35f8d4d4b916fd4e80bb6fddedb1f07a789346623a37612b8508a47b146100f8eda039a796c060dd5409e5bd53ef8829b4717
diff --git a/sci-astronomy/aatm/aatm-0.6.ebuild b/sci-astronomy/aatm/aatm-0.6.ebuild
index 7c9effae287a..da6d46d59b81 100644
--- a/sci-astronomy/aatm/aatm-0.6.ebuild
+++ b/sci-astronomy/aatm/aatm-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ src_install() {
 	fi
 
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r developer/html
+		dodoc -r developer/html
+		docompress -x /usr/share/doc/${PF}/html
 	fi
 }
diff --git a/sci-astronomy/fitspng/Manifest b/sci-astronomy/fitspng/Manifest
index caec47992e8f..7883b8127271 100644
--- a/sci-astronomy/fitspng/Manifest
+++ b/sci-astronomy/fitspng/Manifest
@@ -1,3 +1,5 @@
 DIST fitspng-0.3.5.tar.gz 1124441 BLAKE2B 248cdec08d304983db5143421efad738a7780d9c86ed0ed49bce5412a5ace3c6bc589e8a339dc968a8bd17cf31b234f869aa430b430c7a6e3dc17bbc816842b6 SHA512 268c93e88f1cee3aaddd7a0d157e221439b376ab4dae753ca6750ff7d02a4af7fe78a47d712965721e71fc80ebac8b2cb0e7f24097e7bb4f292655bdf7f6b60c
+DIST fitspng-2.0.tar.gz 1138938 BLAKE2B c8741ce0b368f61126cdff41d646379ceaf1a98972968a1f21db4cf1a1301d8d2b446a89b8efc8144fedbc1dd10d56f36d01400cb6780ad13181e8a889de0b58 SHA512 192a5328e1b53f4bd2f84a0054ff8ae3a732d0c1f2322813d1a714a23d346d5b5e0d47db5a0ad05ec86d6f28db37c835d2f3f4b2422c1d2b210e20601defd9b8
 EBUILD fitspng-0.3.5.ebuild 505 BLAKE2B c23ca4680cf48e0d1aab53cbb3cfdd7496371c8a606c5ec2c1ab69a9c4221d0bdfd3b07d070d609e216e3e08150e5e57e918a68a291e646e6c14376e8e9e41b7 SHA512 ff433c2f54c7e14243e71bf1299b51f47110b989f204410a31d45bde71be2a7f9ba5ece8dfe3d206e79de71ef65db75bc3f5fffd482a945f1ebbace651c84fd8
+EBUILD fitspng-2.0.ebuild 433 BLAKE2B 0ac24121b532028d1b8399578e34e406a9092ddc42ca01a163cf10ebea0136fd5675e270b12bb5ad3994682093c8115f75b26be4e2b1dd4b3b28329bb4625b96 SHA512 dc97714c15c3d3d6d9ccdf82f5c0a3ab3b4aaa1016043aa1181fb3518f93930c621f0f0f2bd9cba2526d409f0f71af87e1e7afb054490f808768d9d8a710c205
 MISC metadata.xml 796 BLAKE2B 7361a43ea61f2e67ad42493577b237ea8c569f2cc597c2463416315a36022e36ef5b6d08341220986d67e563cdeb1d78edbc86b172fe7688f99ff90b88eb834d SHA512 b64405a888f1e61ef3795f0add98827e9632226cbe60bf48c4beac281389885f2f674f6282146b86d1e188069b208b167f169a1831e24c91512c5d2ae7555c6d
diff --git a/sci-astronomy/fitspng/fitspng-2.0.ebuild b/sci-astronomy/fitspng/fitspng-2.0.ebuild
new file mode 100644
index 000000000000..4dd61791dcf2
--- /dev/null
+++ b/sci-astronomy/fitspng/fitspng-2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="FITS to PNG converter"
+HOMEPAGE="http://integral.physics.muni.cz/fitspng/"
+SRC_URI="ftp://integral.physics.muni.cz/pub/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sci-libs/cfitsio:0=
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/gnuastro/Manifest b/sci-astronomy/gnuastro/Manifest
index 5ee440dcc6f8..3fdbc6cf76f3 100644
--- a/sci-astronomy/gnuastro/Manifest
+++ b/sci-astronomy/gnuastro/Manifest
@@ -1,3 +1,5 @@
+DIST gnuastro-0.16.tar.gz 6089988 BLAKE2B be85152e6638a3462cf00555748a6be8d8c9d30b7c43332f1a16140bd22af2d7e948e1e089045b51b22db1541645dc82668cf2cb8c73abf3b07418343f1c02d9 SHA512 8848528b1a117aaebed854db2e8e4586d3b3f860f25f07a1362b7cd1ffd4f0f7ef214fc0b91b3bfc4aaf1ba9c8bbeaf9dec82979665db1c6fe3703f39354a867
 DIST gnuastro-0.3.tar.gz 4525361 BLAKE2B 432078bf330fc8e6886246e4aec767c86b9c19c0c438a3c37b1912e3433e82c68db1090351b0e2e8e4fbb8a7906aa3ac031db8abd5e8c15380e1e8c349b9ebe5 SHA512 08556fd0de196c331cfd68e4b385fbef5c130fa9c914889367f4e3637b8dc6270a2424ef92c6641ec803c355d0577cebf3ace5ad76a7024f0414bb516338beac
+EBUILD gnuastro-0.16.ebuild 971 BLAKE2B f794a4b527e64bcf8f7ec6d8abf4a25f9a52ac56e49f02f5ea98bfa07b20c0924d1a40115a9b7796037d1e64744312a815c2b31fd463eb86e2c7177c5d35c1f1 SHA512 8217f6e40c27cad7b1899c3f14951106867588fefbb597a4fcf4d4868972c672265a282ef8658693d7ddbf79edc702b72c70ad95fda8badbbe7f65f3789f2a2b
 EBUILD gnuastro-0.3.ebuild 949 BLAKE2B 8f71ad2a919b593733eefe87e5b0a45db1ccdb6f3da396ebdd679c91af9d686c79a47601aa278fa30569f979ac97311eeff075b1eb57025e6a8b04a9fa0c144e SHA512 bb517dad64778f4a94f64d5aa505cf4d48b2af727044318865f6101434bcb6536e3fce61cdc8a6c2933220d0f73b60cac49ffd8d0fb920a82534db83a67a072b
 MISC metadata.xml 989 BLAKE2B 83d339b77fe4307a2eafa2976c0524c15f1d234ed812d1a20eb1ee8f102248afc554126ea7d201360fe88e1191a15311505544058ea27522750e66981accd003 SHA512 b1162526b9c8e4d19d0c30f0ce7b3cfbb7cbf2888063416fedfc7d9335a364599557f02657491b135640e4cc10b43529e595cc7d18a8553cda8b212d491dedd6
diff --git a/sci-astronomy/gnuastro/gnuastro-0.16.ebuild b/sci-astronomy/gnuastro/gnuastro-0.16.ebuild
new file mode 100644
index 000000000000..ca9adb3bb97c
--- /dev/null
+++ b/sci-astronomy/gnuastro/gnuastro-0.16.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="GNU Astronomy Utilities"
+HOMEPAGE="https://www.gnu.org/software/gnuastro"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="static-libs threads"
+
+# jpeg, pdf, and libgit2 are forced deps
+# because they are automagically detected.
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-libs/libgit2:=
+	media-libs/tiff
+	net-misc/curl
+	sci-astronomy/wcslib:0=
+	sci-libs/cfitsio:0=
+	sci-libs/gsl:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's/-O3//' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/sci-astronomy/healpix/Manifest b/sci-astronomy/healpix/Manifest
deleted file mode 100644
index 01cc9455542b..000000000000
--- a/sci-astronomy/healpix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Healpix_3.31_2016Aug26.tar.gz 23834899 BLAKE2B a9e3b6567e851eb941e81d45145848a8daede260454dee29e056857f98ea643a0a438a5cc763651f4156ae975be41c601b8664f8bebbcf13b0fb23822c36ae40 SHA512 fd80e9ed80d19e438134f63c3d13802f63c4cd1b9f3596807e67d4ba5ff814e652a130d038449269d6ead271085eb0ab74884b2d768d8531066727377c457f9c
-EBUILD healpix-3.31.ebuild 3165 BLAKE2B 72e7048c84ab276d94ee8bce0673da848579474474cbc81122fd9eeeeb7f5e932ec8e4d3fd03f78fc4469270b89f3478dff3f1f24f9aaa701422c317ed882fac SHA512 9a7e0b4fd0ff0614dba1684b7b4029a97aaeab360758bedb844773deef9f5617ffefa46102d33fb9aefb6a36d1c5c0cf14908aa527f6511699dd42be397e6051
-MISC metadata.xml 737 BLAKE2B 1fa5021d7c14802a3fbd1f2d0417335ed5a6f2f55a29122f4513c58eaf079b75c397e5636bc45ea9f218f65a0df514df215395d96a8ecc6ea158ddc528caa85e SHA512 7e21830662223fcd0d86609d2a68b9a0bba7029b03b97e7240308dfbbc266be70529b6a6903aa995b6fc367770e4fe9c4f0d3890b1496853992eb3d79b4e841d
diff --git a/sci-astronomy/healpix/healpix-3.31.ebuild b/sci-astronomy/healpix/healpix-3.31.ebuild
deleted file mode 100644
index d96d3c91b57e..000000000000
--- a/sci-astronomy/healpix/healpix-3.31.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs java-pkg-opt-2 java-ant-2
-
-MYP="Healpix_${PV}"
-MYPF=${MYP}_2016Aug26
-
-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 || find "${ED}" -name '*.la' -delete || die
-	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/healpix/metadata.xml b/sci-astronomy/healpix/metadata.xml
deleted file mode 100644
index e65bd49bc3b9..000000000000
--- a/sci-astronomy/healpix/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  HEALPix is an acronym for Hierarchical Equal Area isoLatitude
-  Pixelization of a sphere. As suggested in the name, this pixelization produces a
-  subdivision of a spherical surface in which each pixel covers the same
-  surface area as every other pixel.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">healpix</remote-id>
-  </upstream>
-  <use>
-    <flag name="idl">Install healpix IDL/GDL routines</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 1b23fd5aae98..9cab64f5ce1b 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,8 +1,6 @@
 AUX kstars-3.5.5-FindERFA.cmake.patch 4147 BLAKE2B 1b97ac59da72d4e327e25efb72784d0cf74a5d22624596c2b2a818a6a0879f33f5f21404428748a0879aeb250e2fe9e06e2ca16e79cf2365823633725462a296 SHA512 4318b3aa133fdd3a5b2e36d67ceff3f020dccdc796c20ce85c081aa4753e82bee4bf97552ef40e6428abf9c540d48836be5b7cdc0a6706b494f4669e4626ee6e
 DIST kstars-3.5.5.tar.xz 79302220 BLAKE2B df8503c72c689301e70345169491dbc8e27116b44c75a78088f91da0d103965f4da359d4de22c3a177898cfe734f66b06810440c2d4dd7ec15862f0ad4d4edf0 SHA512 03ed4db0e3998c9501f77fb22e26046177d4bc427e769be1964ba3d54701a1240908117bc65424768917252710b73811e38ec61e2391182794b30ad6c9d68d96
-DIST kstars-3.5.6.tar.xz 79127060 BLAKE2B bb5b2971a6a730237217709c599a11f4f09afa8c37fe56c4da9621c3b178aa9f8158aa3e21fb3461e512d47e6f32660c9a5cbfa2926fa1c2cc978182fce9b5b0 SHA512 5a1fb0e1d9226bdaca2657cf667f882ffca0b79a7be3286e8ba4346b7fee780ca37af1c4ef21d02ddbd25341b750ea95b0d33193baa0dca8d8aafe7d75261ec2
 DIST kstars-3.5.7.tar.xz 86749048 BLAKE2B 12c1502c2b4c2edf3e77bc28338d44ef0d61133b0db4aa800cca1c06a9ab2b9acb2c628ac0681a5ac253b5d105d0368eede5f91739b3be2c6f7a996d9322e320 SHA512 48ac509c8f2241155235a386ccfe321398a39886f1332b2b2829d6db3ebc2bf1161f8900a5f0fcf9b51925a655c547e10eef58526257ee5dafc8d77db9a11845
 EBUILD kstars-3.5.5.ebuild 2594 BLAKE2B b598fe83de5103702142e63de88c0f7460129c0de8734754ef63630a46ce18446238c5151e46980fa3adc1b9e678d5444988c8d805510f50c7ce067ca38a792c SHA512 488de12a6649e42874e9ccd1b4cd1d152b1eedbdeabbdc89c2a6bdfb3a2af54303ab3397b2a973fe800bba0f37139fb2f2696bfb6a3758b9c369cbe454d7d1f6
-EBUILD kstars-3.5.6.ebuild 2542 BLAKE2B 700100b91ad330c032fd78f565e126ce75d29260bfea19f863d65ed73f3affcc67bf9ae0db5b3ce38cca8ce6d5c3d997b7de73f781f9a505b48fda1f8f08c6d3 SHA512 2cbeff72e04e9bbc44bfe343fea8113e82c72a622862147c22bf18f65b9c1fbfc0801f18255a9b6d97ce74a9003d2eb468d67e2ca67fe3437924c80ece960dd2
-EBUILD kstars-3.5.7.ebuild 2543 BLAKE2B 4c4ff2bf276808ff1de6a3c1725c05203e43f4f6dee81dcc66f87535a4e8defcfa187e2c2e28c99c277f187a56bebd891113175a4a01c696de845fe792043532 SHA512 77ce8c1236e237985dda21053e78a4e6c61cb3f397788e5233174c1f6b926bb9cc240e59877f2d411a192baae4d6a742913683432f140859de47e53c5084546e
+EBUILD kstars-3.5.7.ebuild 2542 BLAKE2B 847383c452bb87ecc3cdaf3387729e775d508bbde69312937b4a08ed77d82e8467b15b2c282318ac84b06e30df72554188159f5def83e899cd8ae043263906b5 SHA512 dfcd05d188b30882a8d7ceb2efa9a25eb711ea9491f8ae5f19724d61575b17fbff9b1aa096eecf04c9d15a0cd32243de06c6c8d3e785408497bdab69b2e9299e
 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
diff --git a/sci-astronomy/kstars/kstars-3.5.6.ebuild b/sci-astronomy/kstars/kstars-3.5.6.ebuild
deleted file mode 100644
index 3894e3b45a4a..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://apps.kde.org/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.9.1
-		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_PYKSTARS=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
-		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
-	fi
-	ecm_pkg_postinst
-}
diff --git a/sci-astronomy/kstars/kstars-3.5.7.ebuild b/sci-astronomy/kstars/kstars-3.5.7.ebuild
index fd33c32b39ef..cb2201885f9d 100644
--- a/sci-astronomy/kstars/kstars-3.5.7.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 2b53ab04097b..c18d79328e7b 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -12,5 +12,5 @@ DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d5
 DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
 DIST stellarium_user_guide-0.21.3-1.pdf 31253904 BLAKE2B 3e8a0395a29c2fac164379ea315cd21d102b2b400d9eeacdb37cf85f00816f0678edabb9b779db135f4c43ee4cfcc6307ee59f4a149aa33e878c11fe26551266 SHA512 83137fe09bdc279bec23b78694d5e1efe9238733f8adf2cb8ed7e37f0eee60b0475c4c93b5bc85a04b92a175284c24354c36b6a93014216387211c9b031cdf7c
 EBUILD stellarium-0.21.2.ebuild 4066 BLAKE2B 94e758cf2cf2d99f370ff6382acb470fe9d51fa0c933ef1accbfd10737d20091d2849ab419bbdd290fd58b63da5ed04ece490f5b7eb1c9d12cd32493af53b123 SHA512 b101963be54ac92f27dbf7e802eff39e7bb49ea39a5c014b5c3dee957aad845f1bb8d443ab802265ebfe475a93e2e52e8cd883b0ff057a268353f82c13e03ff2
-EBUILD stellarium-0.21.3.ebuild 4235 BLAKE2B 7fa6f8f342bc2091737c7d8cdb89aa884e10a53431f18ac001db6e74986fb3085a164ec1e9fbe9b9df2a30790725c7a3cbab5bb562abfa40167505b7d3d8596b SHA512 c80100df0333de8093454bf338d5a23cff6060bbc6c32f99d6c42f397a38e7ca4ba718ff0416b59079c1b411dce4a8cc9431f2806763bbd7fd68d6210b23c40a
+EBUILD stellarium-0.21.3.ebuild 4231 BLAKE2B d865110272f4d1108a654e0cfc901ba2f33f9bfc4450723ce05004a056ad9bc29e87a118024f9861978808cf95629619a2f15985c88e54c77d3cad23823ad5be SHA512 0eb62c03aececa55b69fb061391d23531651a1e897e457aa52902ee9c087594c21453268269f6527092450112391dcfea2c18c3e2e58d7038d46b704015363a5
 MISC metadata.xml 1331 BLAKE2B 858e48ee46003e8f9d5cb7c6dfe0dd0dab5126c069592c7edbdf2ddf0e3b281d4e5cab5cf21b6197dbde7d7a152225999773265cc4319a4550f15ee2c9903626 SHA512 7e801dbdccaef56276bde6a96bfd61811e6d6b6fcba21238d889d8b882afb9e983ed921dd4d30015107cc48afe6539c19a7bb6692300800ed9f8cc5e4166b5e7
diff --git a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild b/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
index abb37df4de69..30d58b14eedc 100644
--- a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="debug deep-sky doc gps media nls stars telescope test webengine"
 
 # Python interpreter is used while building RemoteControl plugin
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index de76b029b944..2e825216ebfe 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,8 +1,9 @@
 AUX xephem-3.7.7-implicits.patch 305 BLAKE2B ad16733b6d44619528af60a33710f3b558a16ebd24bad15b2c1ccf728a113f5495c5f26ded2c1ac61a3fedb9f916571b8bf8076527c7c2ee1353e212e710b319 SHA512 220186bb7f72fe0de6ca75a67df7b1a4d4cc57cc4768d565dc8225e20df93738c7bdd62bde6297941d1ec6638800950ef56e355de8ca1e3e8192b903b021adba
 AUX xephem-3.7.7-no_xprint.patch 262 BLAKE2B 6676f7e94978d4433f3f26ff3ec4738fd3f5735462806b7f19e7aa4b7671e62e8f7e894071a04f5a90510782b8a57ab0de0a722d4c5520d5c1cf5bbc0c4c9f52 SHA512 d0277edb3c011bf606803a280461410263fe9986d164df28a6801d3bcd7a0a21405728f9d27fd3dfa1a620e4b364d1d8b65843382bd99a2cf2c3e05755a277c2
 AUX xephem-3.7.7-respect_env_vars.patch 3781 BLAKE2B e596c7216c0f70145a189696ff890e136ba282113dc5c9acee4808f7a6474f7e0d9295997ee4dbc595dd8a50d1cb67d22e138b465a82a13a2e294a093f0a7061 SHA512 84a9697c3b05ed28bcc59f4b30807aad76c3228e1aec3db898995d36cae3ef58557ff984a57f60b99e15dd04670a65061451dc00437498c14ed081c0cf06830d
-DIST xephem-3.7.7.tar.gz 18128523 BLAKE2B 85173bfb21e31198aab9231f6020267beadd4750c832d514f06983ea9c88487c4175d3ac0e7b973a8fb41785658e0155e23be6cb89ac370f9a908e6eff8ea5e8 SHA512 d9cfecf0ce8aa495f66fcf6772ca7df0638cef8b9f18d9d6cbf013846a7575786ae9b5c515abc2058783baa7610320c893ddbc6f68bae28c65661a1c73b88634
+AUX xephem-4.1.0-respect_env_vars.patch 3331 BLAKE2B 9e9cd514429485e7934b0d82355ebac66dce6870fd85a490f691fd4943bc23aa66531d7bce4d4e925a6d26bd7bffad0e0eb37506b593b032914a1d8d34edaeab SHA512 c88ce6569cf1e9fd27d3868344e1160d666fc0399a4dd2d4c3c10154fc947f25ebf5904123edd7ae3ca54832eeb89d67c6e2586fd4fa8e3bcb31304d44a1e8a9
 DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
+DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
 EBUILD xephem-3.7.7-r1.ebuild 1186 BLAKE2B f249535f9449eaa36fbbe3ca33407c9d42385f0143cd77849d6f5c746934bc967bf56880f9205409bffd13e058b2fa7951d8c1181823b476a0f4c06be6d192ff SHA512 f814d7754b9f3ba339d10ca0c4b0b9ba30408b7595dfbd2e91ffe1f9924703caf7a4099bbd4ebd1f670d9310c752f78b9daa584316b93d8bd65e83f9135e7c4e
-EBUILD xephem-3.7.7.ebuild 1298 BLAKE2B ab342fcd86ee614db44edda41c812c8e683b644f635ce8d91e669e5b9c37721eed673ce453bd2b79dc5e52d1502757f8ec0aec4523a7fcf0faa63ae4fd876441 SHA512 eb9d963f44439d3afd2a55cb74cf18865896f47f78be469963816607ddf27b52e09248e35fed76c06e48f5e7220ee33d7aebc385c4a6df2f5ad4a81877ceda1e
+EBUILD xephem-4.1.0.ebuild 1281 BLAKE2B a6b4a55118d8a13d36031cddc165c222c3d1580f63963b4fdd8673a8119672299a351f1b19703e3197edaca003fe88cd663bdba7b48d33b89b93921f52342851 SHA512 7de7beccf2e1054be8281122c94d471f52eaa03990726d9214d66331f41201e252c9fc61799ca84af6c08b607bb6dd1a29a9a5541b6184944f46e1dfb34991e0
 MISC metadata.xml 731 BLAKE2B 980eecb953df6c70d788fd68a61cc584f6b1d6605c6970afc82a21ab0a6dacd69354e8156bc0b7dfc04cc205042d2d1d2170abd40bbb74a077a0462a72a78d95 SHA512 ac2f5d29c822dc4e89eedcfa0e2797d61a29531509267290e4426df1ca6179e9b07673f961b473cafacb2b35cf7e0b6f579053648bcee6ae61ae9dee319eaa55
diff --git a/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch
new file mode 100644
index 000000000000..0f08e4380c30
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch
@@ -0,0 +1,128 @@
+diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile
+index dd653c7..32966ee 100644
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -9,9 +9,9 @@
+ # one executable, xephem.
+ 
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../libastro -I../../libip -I../libip -I../../liblilxml -I../liblilxml
++LIBLNK = -L../../libastro -L../libastro -L../../libip -L../libip -L../../liblilxml -L../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+ 
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -29,12 +29,9 @@ MOTIFL = /usr/lib
+ endif
+ 
+ # for linux and Apple OS X
+-CC = gcc
+-CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
+ XLIBS = -lXm -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
++CFLAGS := $(LIBINC) $(CFLAGS)
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm -lssl
+ 
+ # static linking on Apple using X11 libs from ports
+ # CC = gcc
+@@ -194,12 +191,9 @@ xephem.1: xephem.man
+ 	nroff -man $? > $@
+ 
+ libs:
+-	cd ../../libastro; make
+-	cd ../../libip; make
+-	cd ../../libjpegd; make
+-	cd ../../liblilxml; make
+-	cd ../../libpng; make
+-	cd ../../libz; make
++	$(MAKE) -C ../../libastro
++	$(MAKE) -C ../../libip
++	$(MAKE) -C ../../liblilxml
+ 
+ clean:
+ 	rm -fr *.o ../../lib*/*.[ao]
+diff --git a/libastro/Makefile b/libastro/Makefile
+index 0a8ecb6..a640c95 100644
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+ 
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -83,11 +81,11 @@ OBJS =			\
+ 	vsop87_data.o
+ 
+ libastro.a: $(HS) $(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libastro.so: $(HS) $(OBJS)
+-	$(CC) -shared -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libastro.a
+diff --git a/libip/Makefile b/libip/Makefile
+index 5c36ac8..f093d6f 100644
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -2,8 +2,6 @@
+ # (C) 2001 Elwood Charles Downey
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
+ 
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -36,11 +34,11 @@ OBJS =	\
+ HS = ip.h fsmatch.h
+ 
+ libip.a: $(HS)	$(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libip.so:    $(OBJS)
+-	gcc -shared -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libip.a
+diff --git a/liblilxml/Makefile b/liblilxml/Makefile
+index 2e73761..c75651b 100644
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+ 
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -27,8 +25,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+ 
+ liblilxml.a: $(HS) $(OBJS)
+-	ar r $@ $(OBJS)
+-	ranlib $@
++	$(AR) r $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ liltest: liltest.o liblilxml.a
+ 	$(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/xephem-3.7.7.ebuild b/sci-astronomy/xephem/xephem-3.7.7.ebuild
deleted file mode 100644
index 84eaeb909c70..000000000000
--- a/sci-astronomy/xephem/xephem-3.7.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
-HOMEPAGE="https://www.clearskyinstitute.com/xephem"
-SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
-
-LICENSE="XEphem"
-SLOT=0
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/motif-2.3:0
-	virtual/jpeg:0=
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	sys-apps/groff"
-
-PATCHES=(
-	"${FILESDIR}/${P}-respect_env_vars.patch"
-	"${FILESDIR}/${P}-implicits.patch"
-	"${FILESDIR}/${P}-no_xprint.patch"
-)
-
-src_prepare() {
-	default
-	echo > "${T}"/XEphem "XEphem.ShareDir: /usr/share/${PN}"
-	echo > "${T}"/99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-	emake -C GUI/xephem
-}
-
-src_install() {
-	insinto /usr/share/X11/app-defaults
-	has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
-	doins "${T}"/XEphem
-	doenvd "${T}"/99xephem
-	dodoc README
-
-	cd GUI/xephem
-	dobin xephem
-	doman xephem.1
-	newicon XEphem.png ${PN}.png
-	insinto /usr/share/${PN}
-	doins -r auxil catalogs fifos fits gallery lo
-	insinto /usr/share/doc/${PF}/html
-	doins -r help/*
-	make_desktop_entry xephem XEphem ${PN}
-}
diff --git a/sci-astronomy/xephem/xephem-4.1.0.ebuild b/sci-astronomy/xephem/xephem-4.1.0.ebuild
new file mode 100644
index 000000000000..93bd0f5554d6
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-4.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
+HOMEPAGE="https://xephem.github.io/XEphem/Site/xephem.html"
+SRC_URI="https://github.com/XEphem/XEphem/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/XEphem-${PV}"
+
+LICENSE="MIT"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/openssl:=
+	>=x11-libs/motif-2.3:0
+	virtual/jpeg:0
+	media-libs/libpng:0=
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/groff"
+
+HTML_DOCS=( GUI/xephem/help/. )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.7-implicits.patch"
+	"${FILESDIR}/${P}-respect_env_vars.patch"
+)
+
+src_compile() {
+	tc-export CC AR RANLIB
+	emake -C GUI/xephem
+}
+
+src_install() {
+	insinto /usr/share/X11/app-defaults
+	newins - XEphem <<-EOF
+		XEphem.ShareDir: /usr/share/${PN}
+	EOF
+	newenvd - 99xephem <<-EOF
+		XEHELPURL=/usr/share/doc/${PF}/html/xephem.html
+	EOF
+	einstalldocs
+
+	cd GUI/xephem || die
+	dobin xephem
+	doman xephem.1
+	newicon XEphem.png ${PN}.png
+	insinto /usr/share/${PN}
+	doins -r auxil catalogs fifos fits gallery lo
+	make_desktop_entry xephem XEphem ${PN}
+}