gentoo resync : 15.12.2019

20 files changed, 125 insertions, 153 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 762ce4a4cafe..320fb35ce17e 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
index cd43878a3f02..8156039b6eed 100644
--- a/sci-astronomy/casacore/Manifest
+++ b/sci-astronomy/casacore/Manifest
@@ -8,5 +8,5 @@ AUX casacore-2.3.0-loose-some-tests-tFFTServer-tests.patch 1612 BLAKE2B 8729efea
 AUX casacore-2.3.0-make-the-check-for-NFS-a-bit-more-portable-BSD.patch 1693 BLAKE2B 88bf1165d4794a4931b09ad109b7959daf72a2fd0ac4d524340f2110cdaaa9a910102643a2b6756cd82d2fb37a060a0b85fdaa80d83989ab44002ae85d2dc7fa SHA512 4124f2861800f4bd4e98bc88b08d6b62869dae1e646ca269a87d7d9631306aa25b64c2c6e263e71d7ae16f56c0a1e0a574a8e310984b67fee924fedefc4211f3
 AUX casacore-2.3.0-use-the-correct-symbol-to-detect-Linux-OS.patch 572 BLAKE2B 40de151c45734a717998a13de863c0273a703333a8ce3d1434c0d9a95fdd451cbff390b2f9c78c7cd6e1ed069b3620b6c4abfa1f51462cdc3f7719a08b837e04 SHA512 f4f262c3ccc2b2ffd4d769faf0153861f9d4bca832a89d359bc9d9dbe7ee4ec2f4ef55970d5dc2ba821a7cf9a2d0246492f2e9e0bff5428684b282bc076f21ba
 DIST casacore-2.3.0.tar.gz 10326408 BLAKE2B f69083409963e65dcc06b2165c7a594f03f341badbfd1f5cb4c760db0cd4e49027df941efb03a817f1e60dd27111c8e614df8db787b2cc31f2b8539d5ba7ff11 SHA512 48d09e74b0c3885eb9f7bd048f0fd158397f7c6aa2bf9f713af9dbfcf3ce2c5ba0abb9500d3fe1d32977a35e0941b273fbfd8ee69c991a19df264f5f5a28cbb0
-EBUILD casacore-2.3.0-r1.ebuild 3155 BLAKE2B cd8a4d219075d1b06f9f8bf36a254cebcb825c0404b1f65c3fd261cb5dbff7593d8521d629ede787f21e25b9434ebcd9dc020f15fe10a8d75fa7ca0e1a0fa295 SHA512 45e6aaa7c1da419e324d67bdcad81aa07d9a2ffb4ccf6171415193c6e8c6f85539592e4d7425d5b6e59082c6486a979de5061258a1a191e524149da9f516678f
+EBUILD casacore-2.3.0-r1.ebuild 3182 BLAKE2B a7c56617809c1ce8f50e8c95fa2050bb174c457ba9c46ff36475f9547f8ce53974320954ef6fde276e1ecc0754f07e02a64c3b3d377fb750c6e9b7bf9ce25099 SHA512 8096df46b71aa2bff3d010994db49e8111201d79e00a6015acad329ee879f007547c3caeaaebb230b75dc1564e357b66c144ab7dfc231f7538bcd3370a8086cb
 MISC metadata.xml 780 BLAKE2B 759a9e9b85579d58fa683581c11abf2361c57ac12422fd972308c006efac83f99a1d9782c5242cf9ff4db855e1d17f5019adccb429e1d441b6558ead41ea13a4 SHA512 f272b80dc21facc305d8b68320107c7ee837102c09c0e86dbb56de6a24ac6307172f8a2c5127c5b0af3843120e376652394f720cfa205e60c1e1f5c6f35889da
diff --git a/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild b/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
index ad8c81cb25f3..53af61053de3 100644
--- a/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
+++ b/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="+c++11 +data doc fftw hdf5 openmp python threads test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
diff --git a/sci-astronomy/healpix/Manifest b/sci-astronomy/healpix/Manifest
index 2818737b7b5d..5c6510a590b3 100644
--- a/sci-astronomy/healpix/Manifest
+++ b/sci-astronomy/healpix/Manifest
@@ -1,5 +1,5 @@
 DIST Healpix_3.30_2015Oct08.tar.gz 23465221 BLAKE2B c11b681065a2baf951c82538c6c47459954e1702153d55c1983af245ac4748f7768b43ab5c44f4a7b914c15cd4c23ee176389f18cbbee02923a76d69444542d1 SHA512 a7be82687a2188f5dff99c6826355e3290ccc91cc440e67267c58fa13af9fa5d301eca9b37676ef6f0af262b2ff1c06e722d0dcd3aca00a4c9d2794bc666c0c7
 DIST Healpix_3.31_2016Aug26.tar.gz 23834899 BLAKE2B a9e3b6567e851eb941e81d45145848a8daede260454dee29e056857f98ea643a0a438a5cc763651f4156ae975be41c601b8664f8bebbcf13b0fb23822c36ae40 SHA512 fd80e9ed80d19e438134f63c3d13802f63c4cd1b9f3596807e67d4ba5ff814e652a130d038449269d6ead271085eb0ab74884b2d768d8531066727377c457f9c
-EBUILD healpix-3.30.ebuild 3133 BLAKE2B 105073204da94e6500ebaafe67cb5277ad89c89ac28fdd81ee4a9d9bbc2c6f1b093d1d387c143f9dc8523a70206e9ac1cd6f0015d82ed8ee78c76082c9f6d5a8 SHA512 cd0a0ef795cbd11f84f126411c7fd72798d035306f25e76d5659fa5c084e38337492148c953bd013e22998c2107e7e5f1bcd46a0b94a95ed4ff7dd186b4c59ef
-EBUILD healpix-3.31.ebuild 3133 BLAKE2B 0fa6a02a46222d610edc383317006451fa98c5ef9153eba0591cf3ccb48b89959acc5f5d538450b4b3e492adc6abd60ce373198ffddfc8d6e31b1a7d5973d8d9 SHA512 51d64602f658c9ab2ab81ca4529415fe19c1cbd2e00d48ca352257a11c60d666464da7b7e6b09224152cad8af7b90d3d41f7ede5cb84911aaec2724797002714
+EBUILD healpix-3.30.ebuild 3157 BLAKE2B 5c8bc828600d32e8352e87685b17aa0cc5ad09fe4c686c84e5691cfd2f42e73ace83eebfdfff2f5b92ea86dc6bdd450fa8cf9537b20709c865e75a32bb2c2ee6 SHA512 fef451f08f2fce12968aff095e70d1e9307e60fe3c2a525e0a1d1df3e13a06329a76fd38330f726bc4883a934047b754333dff32a1f96b1ba90f5fab88f3e0d2
+EBUILD healpix-3.31.ebuild 3157 BLAKE2B 6911a56ae1e131612449618a238dad3c8fbd460438e4402ad555d5116c38d326498267553d479d5ca5f66a137f84950ae7698a159429366a8abe9cafae0ecaad SHA512 f1db8ed11ed2a934427728c4b2ee311120022326cc3bb5d0d282705c633886186595e01fd947bd26e5258d3fc729c9d56cdeccdd4f2eac42fa84d8f73759af3e
 MISC metadata.xml 736 BLAKE2B fdd21741b7c0321c12cc49a894f493b63299be259d02f40c8475a7f2c270b1a4c57e80d1ecbc468d6dd571a5eb51443a711ff95a8be6aaa8d9aee8ac380063e3 SHA512 1c1b23603bf390ebf8258f75a0867f2a0eb640099c2fbba9db5377449945aff71df8eac9c4c83391e838f1785fca1ce64b7acacd112f7a3b1ddde61a8923f1d5
diff --git a/sci-astronomy/healpix/healpix-3.30.ebuild b/sci-astronomy/healpix/healpix-3.30.ebuild
index e446fc060467..230301b8aa09 100644
--- a/sci-astronomy/healpix/healpix-3.30.ebuild
+++ b/sci-astronomy/healpix/healpix-3.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ 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
diff --git a/sci-astronomy/healpix/healpix-3.31.ebuild b/sci-astronomy/healpix/healpix-3.31.ebuild
index 489986685793..0b4c98015d13 100644
--- a/sci-astronomy/healpix/healpix-3.31.ebuild
+++ b/sci-astronomy/healpix/healpix-3.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ 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
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 88d1ca8fea3c..2911653ce8b1 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,5 @@
 DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c SHA512 29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
+DIST kstars-3.3.8.tar.xz 70991244 BLAKE2B f8f1508d0eb019d5247df8bdd5472dff42113ed24625f581482e2f403da0d1e6311b6c6e9d78a67548b9cec8b2536fbe1e3f886f16bd493d275b7414c8af8033 SHA512 bfc6b6a4e1d9856d290468b44071f02fe3e2c0f0b3bd90f9c3ebe671abee9e18c24898777065a21adbd4794e8e64beb17c6d339b88cabe750bf3b3a9efb327d0
 EBUILD kstars-3.2.3.ebuild 2195 BLAKE2B adde3a59e6159cd1034c64ab700f71d124c7ac19c8d8efd11261eaa6909c468f75353c1a4b0147c80158108fd9a46819aabd99b8cca13c62c34babffe9c07805 SHA512 24b9198d06e3171ac6652b3210a44640ab93391377e88cf52d5c29a3df7f16dc19f52becdff125f57e6d366dec6cd535b8da01a7c4cfa8961efb87cfb64b4614
+EBUILD kstars-3.3.8-r2.ebuild 2561 BLAKE2B 58715f67ef2200b007e80e42e0469ec38db2ae4d590ed94a62063bd7b1b5632089504bd239d0d368b3351877dedad09ae26065bb12f7ae0ef1072e08b3354624 SHA512 71a4845567e9ef7928d2500420dbef5d1250ebc2f08c1da1bad6e8ee60a0acef1d2c1cb4214d6e431ad0859e8c135b52ed8bbc091ff08c405a9c6d698b794587
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
new file mode 100644
index 000000000000..bcc1c779389f
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kstars
+https://edu.kde.org/kstars/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio )
+	indi? (
+		>=sci-libs/indilib-1.7.5
+		sci-libs/libnova
+	)
+	password? ( dev-libs/qtkeychain:= )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake-utils_use_find_package fits CFitsio)
+		$(cmake-utils_use_find_package indi INDI)
+		$(cmake-utils_use_find_package password Qt5Keychain)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
+		elog "${PN} has optional runtime support for x11-misc/xplanet"
+	fi
+	# same for AstrometryNet, which is not packaged.
+}
diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index 61f2fc032061..6477058637a4 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -1,5 +1,3 @@
-DIST pyephem-3.7.5.3.tar.gz 735112 BLAKE2B 0edac4210c6ab745e64641d21f053fbd67a6e3841d1eb6b3b06bd5d4fcff0b6a1e1dc1634d8608e990eb6e588d030cc6a67115ebfd7bbefeb8f5ce219ae3ca1b SHA512 a61b6a19c35c10ee9d4eba72cb0e6b9446076a3943be58dfd5e084bc9ab09dc70f2ee335ba5f0ef9d9d4d34a461bf4b9ddd57dae50d2e8a8f565d411e47f2908
 DIST pyephem-3.7.6.0.tar.gz 739561 BLAKE2B a8129632514940e6d786dcc50d2dd0bd1fff2b76b9d59f88820c93cce3400f9b15c4f7418bc778ee5ad60a8909a970aaea5df62c5192fcb71f822b97abc0dc4f SHA512 c3013ef943c0e1e2c30bba6f72912efb100b4c8c45904b7d6d7ba73d8b741564793a6e538117eb88abb824c93c874e2c955de734418ebd2370888718a149c9a8
-EBUILD pyephem-3.7.5.3.ebuild 1137 BLAKE2B 865f6781a66f8029ccb5626b519e029ca1c7cd365d52168e024bfb1c3dc01fc196ddd57811c04aa337732d8f2e18c52ba888dac8f001421d181ef7d91104bbe6 SHA512 ade529d1ca79fdf499d1236c74eebe40a1feaa656afbd500715075b36adf3463816bc3b4631c2ce4462cf1c309748839bdc3003f10c4e256ead732513b423796
-EBUILD pyephem-3.7.6.0.ebuild 1153 BLAKE2B 29bbe84c0de0c81adb2ab13f37b6733213e761464868dfaa6c6fbdbfc2f7b0652e2cf86fe466e30080b2a14b664ce2a56b6bd1b593d392e6a6658e7783d9b48b SHA512 21ad764bfa9b60699d089b01519dd7b4edaf7c779544c8865bacd2dfcd0ec02e611ae23b4dea183fb3b1ae19cc138e3b48eb3be40d74a2a220d4ad602ac896ff
+EBUILD pyephem-3.7.6.0-r1.ebuild 1031 BLAKE2B e796c1a5fae20473dba9828777650de19219ed6381b348027a780db2430676044bbac0ffda7e6dca24a6567d42934e646d6510584a7df6649bdaacc8fd1b0998 SHA512 ecfd3e490b7751298f9a4e575d50f7181f27bc6d423ca968d1d87cf98560e5b5d8dd277cd72cb22406aa7a0ff44bde5b34d433a3bc8113e0015cb45dc992ffcb
 MISC metadata.xml 947 BLAKE2B 0e586f2e978bb31b9ca757d2192a41e5a6e3414c7c29ceabddfb0ace9c9eb31ade32424701a9370665d69dd7cbeba567cdc9288cada621eb1d66b5a8a680c36d SHA512 f41c27b07f211b09dd72e316d02c46206dea0ff368e2ad1a8d116df49a2ce2a74137b2647572e295bcde34792d4ee15fb2d3f9e1a883c6cb306f6ef2a43d5c53
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
deleted file mode 100644
index 31682fca98a7..000000000000
--- a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Astronomical routines for the python programming language"
-HOMEPAGE="https://rhodesmill.org/pyephem/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="
-	doc? ( dev-python/sphinx )"
-RDEPEND=""
-
-src_prepare() {
-	# don't install rst files
-	sed -i -e "s:'doc/\*\.rst',::" setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		PYTHONPATH=. emake -C ephem/doc html
-	fi
-}
-
-python_test() {
-	if [[ ${PYTHON_ABI} == "2.7" ]]; then
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			${EPYTHON} -m unittest discover -s src/ephem
-	else
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			unit2 discover -s src/ephem
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	use doc && dohtml -r ephem/doc/_build/html/*
-
-	delete_tests() {
-		rm -r "${D}$(python_get_sitedir)/ephem/tests" || die
-	}
-	python_foreach_impl delete_tests
-}
diff --git a/sci-astronomy/pyephem/pyephem-3.7.6.0.ebuild b/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
index 8dcbafee4f8d..b1e5535c3234 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.6.0.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Astronomical routines for the python programming language"
@@ -19,6 +18,8 @@ IUSE="doc test"
 DEPEND="doc? ( dev-python/sphinx )"
 RDEPEND=""
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	# don't install rst files by dfefault
 	sed -i -e "s:'doc/\*\.rst',::" setup.py || die
@@ -33,13 +34,7 @@ src_compile() {
 }
 
 python_test() {
-	if [[ ${PYTHON_ABI} == "2.7" ]]; then
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			${EPYTHON} -m unittest discover -s ephem
-	else
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			unit2 discover -s ephem
-	fi
+	PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" unit2 discover -s ephem
 }
 
 src_install() {
diff --git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
index 0838e68f0d3a..302df0f9c0b3 100644
--- a/sci-astronomy/sextractor/Manifest
+++ b/sci-astronomy/sextractor/Manifest
@@ -3,6 +3,6 @@ AUX sextractor-2.19.5-have-malloc.patch 543 BLAKE2B 4cf609e2f5a0e547e4af25c9a794
 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 1753 BLAKE2B 2de81c89b715d6b01a72693776de7f45bd71a58ef64cce3b17fe050236fc805f0eb9edcd8e559a47ea15953d58ea6bd2303d5753adb6399eb78fdd2e73026927 SHA512 632af0c3956430c889f4116c9e94b9ace09db33d32e73b32ea698d73c5a14eca132725952dd97e72ec2bd49bda57e5c827529b4fa3676b1c62801786c02ba62f
-EBUILD sextractor-2.19.5.ebuild 1736 BLAKE2B 39e726cba6be3192cac4651c77898ab7b522493cd59215135d7e694f0742649f20984f42b80c04fcd4e005e18b58527cb61a3e0e67dd1af49917cd8d85b76421 SHA512 a2b499ae626f800c8a90cfd6660e8a9572ad32ef6901419e908262ea9a77e9736322094502a18e50b194b8ede567a25f45d1353976d7cef4d37760965b260ee1
+EBUILD sextractor-2.19.5-r1.ebuild 1777 BLAKE2B 332c692fcf66ad1cfbf88b5b298dfecf60a0622f6b7322a05f48710a1e2955e42decdc7fbec35ab07556211db7c02a4c4ced1d4b4ee4090564d601b010309132 SHA512 0135a39764e2a36b434f379aed1f87d0d7700a2b53ec4dbee979492747c70ccb376482f79fb36e2008484275dcb6c2f2eb360aa4b118415ffcc6a13f21ab5983
+EBUILD sextractor-2.19.5.ebuild 1760 BLAKE2B bacf3d1d13ad0c9e588b49fed2da84d962cc295e960a22c1a9302b6118a72d58ee4ac4b409bf2374bc6e3fc8a432932a36e43a69f3e6de0ae1dea52957e591eb SHA512 bc74285ec271a0f257df19a2763e6ef092e6303a9381de45420e5c83eee1246495461c4715df9f871f29ec0418f1e09fc5aeedddf515ff8129fd83a6bbad38ff
 MISC metadata.xml 797 BLAKE2B 8f4e60a4818c4f94b852aa52fd1138cdbf41a96dd0982eca7e1890e4167bb097a375ab1c4fc92866596e12eee0bfa66cc91bafd674a11679b52f2749cddf0040 SHA512 83f4baddd93a51960fb6adf2d55b7c5cda033f92ad5dc92eb7e6f15392432f49f40b1fe07dcfc475a464a6d3502696a3639c0e33d5c45848fbda686a1777189c
diff --git a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
index a3aae82d8cdf..becaa0b3c081 100644
--- a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="doc modelfit test threads"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!games-misc/sex
diff --git a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
index 3aeded5ecbc8..8d374bc1d699 100644
--- a/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.19.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ 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 )"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 31c054b0e297..a68141432a83 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -7,7 +7,7 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
 DIST stellarium-0.19.0.tar.gz 309151408 BLAKE2B d5726762c402cebca47c7cb218a2edc918aceb11e4bf44f0473bf86a8bfc75b908467112e8ce797c90f9c1307884f853a24f919efe11e86ef04c9eb0ff356a3b SHA512 26cb44fe4280275ce64594d01bdded4ddd2cda5d21887b4329de51188cc392e8390036702ee316446dcdb54182dec5d217a387898c4c7aa82ce14742b4d4694f
 DIST stellarium-0.19.1.tar.gz 314373270 BLAKE2B 23f11005e2862c42abefc37d997c875bbed379e8182dbc533f24f303200791dc4c069adc0e290b2faa630a0fc058b7060bc3715714bae37a89ff5820b86d21ed SHA512 59ab715f7b81e037ed3d23444547dcd00a41b9a1925d58b40a17372e286bbea2c1b762582cd7e1f81d690204840cc23dd9627e2c0bd4abf52367a456849eefe9
 DIST stellarium-0.19.2.tar.gz 318402838 BLAKE2B cee07bbb2e4a124912dc383e1d43007912498793c3609de05caf3b6673d01ccfcf0b560cb879bf47d6b00c7ce6b10810a17189f38fdac55e02dc496e194269b3 SHA512 a0002dc8a1e43aa264cdf013b57362880d4809207a1f867285d3e1187c4c88c67d166652afe0edeec5a98eff1167e6c3693594d467605ba78ee29d6eb7878d4b
-EBUILD stellarium-0.19.0.ebuild 2304 BLAKE2B 4fd2afbe31519e8ab28a4c0675a25ef8f829c3f9a12a378062f22feaaabc5a1728849967f0e53d57d58f705c9e578d004233be0c8f261bbe30aa10a4f7160f1e SHA512 80ae855d95b2a7f4ded4c056dea7a317bca7b0a3a75591d033857007e1ac8f5ca354809ec0040dc10d845d93b85a25727aa4c1d22e3b1314f978dce4a853b67c
-EBUILD stellarium-0.19.1.ebuild 2238 BLAKE2B 8f88eaa4c9f10b7a3f7d71f1babca8b18680d66540925e3c74536318ac6f2c41a52de46bc362c52d2b1e0e8df896073bcfcf1de5520d54276b3c128c3928cb95 SHA512 353af78c34b50d9a2746c020cf7bd92e232a2e7e488c536e58520f4e98134454bd617377a30ef9c99f4c30675b9b8e1844a37e16dec4eef96bba4f46a8cb6f9d
+EBUILD stellarium-0.19.0.ebuild 2331 BLAKE2B 722d7b4f5c954371691dcd19269d7f88d13f6686a88f58433dfb17fcdb126fe8b3784df202c1ca47bc795fa51948a07d9c427786b46da4677b8c1de001d9d058 SHA512 31992eb7fbe77113995beada712bb16cef0901a53daf566588146fff5472845eea2d6b78e33432e5d63dd14c97f7b10ba8863860cf40ecf3c3a0f64873b8266b
+EBUILD stellarium-0.19.1.ebuild 2265 BLAKE2B 771e9a62177396dffc9cfa8cd61bf76f59e609e4e72f22d210c66e653597cdb0b45dc0eb841aaf3ac345c1258c31298dc1f1c344d8ce9dd8166e3bcc021c0012 SHA512 0f4c2619c126ed46cbbb7da226a6b0a0856a07b1387fcbf9427cde6fa7d2b79ee41323f4c59cd66c8cf689dec3d45389974877006c36d7e1b9fe206346a4d4fa
 EBUILD stellarium-0.19.2.ebuild 2266 BLAKE2B 2ba0e1361e739b447ee3f5c3cddaba8edcedc3ad0f484b1a559a86fd7679195007ed7dbffab0944a4d13f351e82787ff45bb1bf97898810d4372e3881a484c48 SHA512 d8c216fe662f7a414119719623ca1bc7447dd78c6f8bd8899dd5a8239e4c09a5819157c680bfb44f2a0c8d9c01b48a11578d923fdb04de5309a398be31dc7a33
 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/stellarium-0.19.0.ebuild b/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
index 9d606e663e33..c0fa7fde1868 100644
--- a/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
@@ -21,6 +21,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps media nls stars test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
diff --git a/sci-astronomy/stellarium/stellarium-0.19.1.ebuild b/sci-astronomy/stellarium/stellarium-0.19.1.ebuild
index b47582c27bac..43dd151870e1 100644
--- a/sci-astronomy/stellarium/stellarium-0.19.1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.19.1.ebuild
@@ -21,6 +21,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps media nls stars test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index b8571ec71851..711d226ca4af 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,5 +1,3 @@
-DIST wcslib-5.15.tar.bz2 2222193 BLAKE2B 7e198b7d80d801794443fa6a0e6137588049605af131bdd547408d2eb8ac391078c750f782734bf8b86af99084bfc64bbd807245f452dee838a58037985ef022 SHA512 b98111d7ca4b14dd479b56a368fd89a4d6f5d3741a61edeecc4a738def35bf448b68daf6a553fe88d4c84f91f5fcab3bc8d3ead1dccbd4e7c4190f31de2242ef
 DIST wcslib-5.16.tar.bz2 2222111 BLAKE2B e11da145db6366804321cf415bdac621a930418f09d788c8b94413980710bb43357129a830462339127398082700a9f44f56dc0b8c96ef923d41ea0174dfd07f SHA512 bf7ab586995bdade8b96c77dee891c7d7ab6de82a7e2f94a09d89643e93658063f832efdb66e0bba11ad114b6e0ca555cba9308a84f0f22fb833e3a6303cefe6
-EBUILD wcslib-5.15.ebuild 1675 BLAKE2B 12ff159558252dc381c1cc6759239cf9e85b160c2ddb336b0a956acad9a536c8920445aef6715eaf14bbe4c6f3df22fd9903bca438e6b7aa331e0d3d2fc37948 SHA512 d2648e929258ceaa92d9651c456b8f71493143035a8950d21189cadf31921d2a92d7d1fd7cde7a07d8fdf7a105b3097da8a57eaf9f1484b08ae69e050f532f42
-EBUILD wcslib-5.16.ebuild 1677 BLAKE2B a1f699e1156aedf692ab1c212b8416ef1cbc091663482132529be8e5aff1bcd2d1f7cc105172af1d5ed08b59de9d7046f64be53c89e2c39634d1e2a626b687e0 SHA512 5c9a572e8cf41b650da3a7f98cc8abe331386c896193366b7ed6d73052208c5ab89ce8b68434268f2420da8a770a2368c2e5f90fb3c43d4c7257cbdcd0dea244
+EBUILD wcslib-5.16.ebuild 1672 BLAKE2B cb4b23307baf6e981b6760398a90e864bb1adcfb066d8c973e0c848febc4942a34647cfbaa170a31f35d1390d1fe9ac321127d69e66c431c8659b42c98f9affb SHA512 2b6c660d4683a5833aafdd0b379fc0c9df512ec1ff09d2792272b6bbe9659896ea9bab8789997abbbab74a381f5ddcd01cce6dc42004746c6313a85fffd9b366
 MISC metadata.xml 976 BLAKE2B 7507ba6725d4a27888d6bc57c2e6c10bcb4a2bd06a2809228423b40009aa1fbef15303cb8a78a510cca5771f3d7cd3b59501751a0969990130d297fe6b1d7312 SHA512 cd4bc1614ea120e04ced965a92fdd343db9e4d1a6046b57efd503674547cfa45ce6a03bb3a2d34a472dccd885d598cbf3cd3d9d9fe182a2fc067a801e8eb9577
diff --git a/sci-astronomy/wcslib/wcslib-5.15.ebuild b/sci-astronomy/wcslib/wcslib-5.15.ebuild
deleted file mode 100644
index 035f15d89123..000000000000
--- a/sci-astronomy/wcslib/wcslib-5.15.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/5"
-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_compile() {
-	# nasty makefile, debugging means probably full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 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
-}
diff --git a/sci-astronomy/wcslib/wcslib-5.16.ebuild b/sci-astronomy/wcslib/wcslib-5.16.ebuild
index 7b3cdbfbdf79..8dd1482b0a44 100644
--- a/sci-astronomy/wcslib/wcslib-5.16.ebuild
+++ b/sci-astronomy/wcslib/wcslib-5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/5"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="