gentoo resync : 16.09.2020

5 files changed, 2 insertions, 241 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 24cc8e2518ef..ffb2f1bd653a 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,8 +1,3 @@
-AUX kstars-3.4.2-cfitsio-optional.patch 1100 BLAKE2B d4c19fa448a43e1851fd80fbe87c1401eab6afb2a97d9d41d4a56c231acc2e9f25d6317131f21b08cf1cc68eea20fd5542bdd27b61fb5d5f93701e23c5299a30 SHA512 2b7cfa980ee8318431109d5aa0aace1babb9eb71f7f2c26d8a7e69c2f94746c1fb69e4201c311f12ac5b678e1a71261fd7121d4e91fc432dd1e735699bf7221c
-DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
-DIST kstars-3.4.2.tar.xz 76494596 BLAKE2B 228f4d9250ef6584e6de1164fc0fc2ba506574f34cfda4ad1347984adeeaaa4eee8e8d93cb2d8822635ad200e2df5d43ccc2cf48d2cd24449f21627de9189c9c SHA512 10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304
 DIST kstars-3.4.3.tar.xz 77697704 BLAKE2B a64901f74952268fb05ab9ef90d4161f48ada210a0c3099218488bb0c327d29855c58f7226ac399e522abe9846fe7109dcbecbdb789d9c3afc1180448ba1fe69 SHA512 47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4
-EBUILD kstars-3.3.9.ebuild 2529 BLAKE2B 69969a3abe445536b217c1b04129161d09f2fa662bc3fc9daf0968f729feccaedc0067835b532660600f945142a3d348ca480e2ec4d66c3d341a56bbcecf6186 SHA512 4d99467b932bcb5c3bae57f8e864de4cf2dc63a60903cfca568e969ba186a2d90ec30c2c7b63e062d1e624e9b71a450864f2dfa94ac3da1ca107b58ad939a462
-EBUILD kstars-3.4.2.ebuild 2587 BLAKE2B 02a4dc34e43617239f993df310ca017791c499db82f99778e4f1353df4c5dc382c70d758788097efb3a7681c60c4bfbcd8802270b2653dbf8782a0d69d1cac6b SHA512 d29dbdc71f0ff607206152e8f92480c568d87c4b94ef5b0f861d514bca76697fe8650f7ab1b9e09736b32a86a478976b0171a0a46f6b78fa0f714bafe63b51ef
-EBUILD kstars-3.4.3.ebuild 2569 BLAKE2B 74364f77f326559117eeee9b732e118c1173fd03fc6fc914241fc43b1b5d9e90d1532d1df22bfd9152aa50c9ed0072d95a7c76fd79fc8cd92ab7f1b66aae253c SHA512 e63e3ac3c0b883f11ddfd4f8243d50306fddf64b682aff7eb21ccd5ba930ab7f34088070534ba6210a0ee8bb0f01038f485a7c34c2a80d427ee46de4949ee1f1
+EBUILD kstars-3.4.3.ebuild 2567 BLAKE2B 0989cbb9d979229e24f7e254c95f7a3a8651b153af1ccef241d61b96b969ad61d95f011a288c5d5efd855730fa3a5979e4fbd54254e0430a6d450a20fb6c0932 SHA512 e07cc97c0e7b8ce2f68dee6c51734553ffa3c16d439fa0277fe255e14e4fcb76e29d99ecb3301180dcbbecbadd600d2568e10b032b909863acf72714239925a3
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch b/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
deleted file mode 100644
index b486debf3e4c..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f66d634768fb8d18caded24646946f134b8e70c2 Mon Sep 17 00:00:00 2001
-From: Jasem Mutlaq <mutlaqja@ikarustech.com>
-Date: Sun, 3 May 2020 20:13:15 +0300
-Subject: Don't run fitsviewer test if no fitsio
-
-Summary: Should fix https://build.kde.org/view/Failing/job/Extragear/job/kstars/job/kf5-qt5%20WindowsMSVCQt5.14/ (tests are not working as fitsio not available on Windows)
-
-Reviewers: #kstars, TallFurryMan, mutlaqja
-
-Reviewed By: #kstars, TallFurryMan, mutlaqja
-
-Subscribers: TallFurryMan, kde-edu
-
-Tags: #kstars, #kde_edu
-
-Differential Revision: https://phabricator.kde.org/D29388
----
- Tests/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index 020f697..1e3a09a 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -32,7 +32,10 @@ SET( TEST_KSLITE_LIBRARIES
- 
- add_subdirectory(auxiliary)
- add_subdirectory(skyobjects)
--add_subdirectory(fitsviewer)
-+
-+IF (CFITSIO_FOUND)
-+    add_subdirectory(fitsviewer)
-+ENDIF ()
- 
- IF (UNIX AND NOT APPLE AND CFITSIO_FOUND)
-     IF (BUILD_KSTARS_LITE)
--- 
-cgit v1.1
diff --git a/sci-astronomy/kstars/kstars-3.3.9.ebuild b/sci-astronomy/kstars/kstars-3.3.9.ebuild
deleted file mode 100644
index a5b59154562b..000000000000
--- a/sci-astronomy/kstars/kstars-3.3.9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.
-}
diff --git a/sci-astronomy/kstars/kstars-3.4.2.ebuild b/sci-astronomy/kstars/kstars-3.4.2.ebuild
deleted file mode 100644
index 0b20d1db44c3..000000000000
--- a/sci-astronomy/kstars/kstars-3.4.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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
-"
-
-PATCHES=( "${FILESDIR}/${P}-cfitsio-optional.patch" )
-
-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.4.3.ebuild b/sci-astronomy/kstars/kstars-3.4.3.ebuild
index 3c1a48fa23e8..ce93bf63b360 100644
--- a/sci-astronomy/kstars/kstars-3.4.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.4.3.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+"