gentoo resync : 15.01.2020

4 files changed, 111 insertions, 12 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 2911653ce8b1..a86ccaa8cc22 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,5 +1,7 @@
 DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c SHA512 29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
 DIST kstars-3.3.8.tar.xz 70991244 BLAKE2B f8f1508d0eb019d5247df8bdd5472dff42113ed24625f581482e2f403da0d1e6311b6c6e9d78a67548b9cec8b2536fbe1e3f886f16bd493d275b7414c8af8033 SHA512 bfc6b6a4e1d9856d290468b44071f02fe3e2c0f0b3bd90f9c3ebe671abee9e18c24898777065a21adbd4794e8e64beb17c6d339b88cabe750bf3b3a9efb327d0
-EBUILD kstars-3.2.3.ebuild 2195 BLAKE2B adde3a59e6159cd1034c64ab700f71d124c7ac19c8d8efd11261eaa6909c468f75353c1a4b0147c80158108fd9a46819aabd99b8cca13c62c34babffe9c07805 SHA512 24b9198d06e3171ac6652b3210a44640ab93391377e88cf52d5c29a3df7f16dc19f52becdff125f57e6d366dec6cd535b8da01a7c4cfa8961efb87cfb64b4614
-EBUILD kstars-3.3.8-r2.ebuild 2561 BLAKE2B 58715f67ef2200b007e80e42e0469ec38db2ae4d590ed94a62063bd7b1b5632089504bd239d0d368b3351877dedad09ae26065bb12f7ae0ef1072e08b3354624 SHA512 71a4845567e9ef7928d2500420dbef5d1250ebc2f08c1da1bad6e8ee60a0acef1d2c1cb4214d6e431ad0859e8c135b52ed8bbc091ff08c405a9c6d698b794587
+DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
+EBUILD kstars-3.2.3.ebuild 2165 BLAKE2B 8e1734cddbd2ad9ef3095ec6e22eca86a6daeb15faef2d4bcff7213abd8eedab5a541408c1f75566763e5a9e6f8bf2384441d3ae295882a487f085739d79122a SHA512 5a52b90a603576b7936e9905e0fb75edeae7c4bc8280512b67840cf0c23114c214d829eded66dc119d548f5c45d349d291ee256bb5dcd349756547f38d1f9a9d
+EBUILD kstars-3.3.8-r2.ebuild 2531 BLAKE2B 6b6ffa9bec072790579c9786a1db18d84be4e31c9713a4879b0479fd0f460ae5662df52ff82af731eb52e429352907fd1bd997d60e7e3a0b13065deb0fe383e6 SHA512 7b49a6656b53b777f7d06ab0d7ed2e1617b7250599c89c58fe6d34252b5db94d202be475f9b899da8731f97d6973dc1ea4616e92f4b7f60e2985fee91ce6c7aa
+EBUILD kstars-3.3.9.ebuild 2532 BLAKE2B 4ba6158282de19076247a076b4592b9bdc4bcaa68b989968b619f9b965981538194e3f9be848208e7d4d045d38ed559a086289ba156d996ac433a84bb2f463ae SHA512 59c53a247c82e06ae15b35a8ff9bc24e904593e63ca1b9e3a32b5eb8ae4c13a60a29b5b89f4af55a1d11f5f0af68f26aa85a63cf80eb9c204f578947db352afd
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.2.3.ebuild b/sci-astronomy/kstars/kstars-3.2.3.ebuild
index 37fbdb6ba508..e0851ef4ce80 100644
--- a/sci-astronomy/kstars/kstars-3.2.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.2.3.ebuild
@@ -65,11 +65,11 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package password Qt5Keychain)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
 	)
 
 	kde5_src_configure
diff --git a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
index bcc1c779389f..11712ad2839b 100644
--- a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
@@ -77,11 +77,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
 		-DBUILD_DOC=$(usex handbook)
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package password Qt5Keychain)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
 	)
 
 	ecm_src_configure
diff --git a/sci-astronomy/kstars/kstars-3.3.9.ebuild b/sci-astronomy/kstars/kstars-3.3.9.ebuild
new file mode 100644
index 000000000000..027a65724d58
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.3.9.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kstars
+https://edu.kde.org/kstars/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio )
+	indi? (
+		>=sci-libs/indilib-1.7.5
+		sci-libs/libnova
+	)
+	password? ( dev-libs/qtkeychain:= )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
+		elog "${PN} has optional runtime support for x11-misc/xplanet"
+	fi
+	# same for AstrometryNet, which is not packaged.
+}