gentoo resync : 17.02.2020

4 files changed, 2 insertions, 188 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index f941da8fc948..f89ca69ef468 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,7 +1,3 @@
-DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c SHA512 29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
-DIST kstars-3.3.8.tar.xz 70991244 BLAKE2B f8f1508d0eb019d5247df8bdd5472dff42113ed24625f581482e2f403da0d1e6311b6c6e9d78a67548b9cec8b2536fbe1e3f886f16bd493d275b7414c8af8033 SHA512 bfc6b6a4e1d9856d290468b44071f02fe3e2c0f0b3bd90f9c3ebe671abee9e18c24898777065a21adbd4794e8e64beb17c6d339b88cabe750bf3b3a9efb327d0
 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 2531 BLAKE2B cd9033859157e6acc3bad8419358454b860500f0e9a8931aa33afe9592136c0a03410e2738e5418d3612587ce8ca1f05d0b38969742a4150838e5e48cf1a6d2f SHA512 84179475a8a913e539f21f23c9dd327fdbe8e8319516c16c1b9e8858c232a8dcc33407bddf8ef5d594f1a7cf4560b0630c40793f11df66001ffadf638ef10073
+EBUILD kstars-3.3.9.ebuild 2530 BLAKE2B ef8bb365fe170b9382195bacc0958084aa73125ccc8ab852d92ff3106ab2dc76555c0aac47ce5e0afa70c923a4f742aaee8216feeeab809502364a8b5627d10f SHA512 bbc4a0c64c9d7a2426a48075ecdb31c13fcf0ee6ed21f0c94d25331e49c2812506c0380270ebe0a9d92ff6d9cfc016fb6f5a46679c6b6d8e15cf6fb7609983c1
 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
deleted file mode 100644
index e0851ef4ce80..000000000000
--- a/sci-astronomy/kstars/kstars-3.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://kde.org/applications/education/kstars https://edu.kde.org/kstars/"
-IUSE="fits indi +password raw wcs"
-
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdatavis3d)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebsockets)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio )
-	indi? ( >=sci-libs/indilib-1.7.5 )
-	password? ( dev-libs/qtkeychain:= )
-	raw? ( media-libs/libraw:= )
-	wcs? ( sci-astronomy/wcslib )
-"
-# TODO: Add back when re-enabled by upstream
-# 	opengl? (
-# 		$(add_qt_dep qtopengl)
-# 		virtual/opengl
-# 	)
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	dev-cpp/eigen:3
-"
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		$(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
-}
-
-pkg_postinst () {
-	kde5_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/kstars/kstars-3.3.8-r2.ebuild b/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
deleted file mode 100644
index 11712ad2839b..000000000000
--- a/sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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_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.
-}
diff --git a/sci-astronomy/kstars/kstars-3.3.9.ebuild b/sci-astronomy/kstars/kstars-3.3.9.ebuild
index 33ecf5ac5e8a..c64678a238f2 100644
--- a/sci-astronomy/kstars/kstars-3.3.9.ebuild
+++ b/sci-astronomy/kstars/kstars-3.3.9.ebuild
@@ -14,7 +14,7 @@ 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+"