gentoo resync : 16.09.2021

4 files changed, 4 insertions, 103 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 5c08a06c3309..dd1b22ebd38c 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,6 +1,4 @@
 AUX kstars-3.5.3-fits-w-o-libraw.patch 954 BLAKE2B 0735f834e3979f5c5676b3635bb3ab2270b28338ca9f7db4813e83d93dfcfe64ef6fe163dd719826dce5225d4858f142a555379d86b6be8c8748911d896461e9 SHA512 190e9f624a9ed99e07f72ad3973f58443cb80b3645ee16378cbc0d18c215845baeffb5b871f8eaacb9aa8fb0385ea33122738bb7799c9237ed6ba824c2752873
-DIST kstars-3.5.2.tar.xz 78893892 BLAKE2B 3fc5c0544b3145af770f59b7c4ddbca3578c03a44e87b3114c1ca414242da9df44eb8cfe1440f1c55491a8e73ff329e8e4482c6becb610683fd2fb210a16dd2e SHA512 0ddd2987b4c34ff4d8a6287c61601eb33311d2403b3f1b0e503aa4bb6adb2b61f9c5d3aedfc7146b3503d2da6a0a9c6dd73d237135a06a7c824c84699bac0f3f
 DIST kstars-3.5.3.tar.xz 79228112 BLAKE2B c82e76398630a657887a8b6720a801bce74bb2ebff5bb86f4546672794709a68c970c897074e9cc6846210250ad2d05e2b53af75b70ef2c0fa5504be12aa592b SHA512 383071130fa4674ba373cba2ecd46143a9cdef9f9e636f0bf33f66d9302baa913af4aa1713ba871dd7cee6eed95d8196055a02ab41c24e2729d74950aea742f8
-EBUILD kstars-3.5.2.ebuild 2520 BLAKE2B ff759a51e60d389edd5b271877b33cacdcb5cf34959b10aa9191e7c8b2070ca1faf96ffdba6c95ac306d60f4381cfb42f8b8e39cb37183c47b115d4bb9b026c5 SHA512 832a3c5f312544074922b4c97f2ff925ee3ad8441c007ace687a5e724d4acf4eef137f5d66dd1a40ba2af7eb2d620201cd5486ee8219ccd8ca60a77ceba0fa88
-EBUILD kstars-3.5.3.ebuild 2588 BLAKE2B b28a61cdf0220d4498b4a46d3add30c354be555d773c055ff472518cfcd66b594e09d96252288af20b06d327e56c9f3789880783383a4a687d303db819f689f5 SHA512 f7489143e7f0438f520983967558cbdff5a5689322e63e5d7ec09045a81ebb02110b2e045c96a9913043592e9d8d2005b054d053c7b071a7fee796ea27153d7d
-MISC metadata.xml 691 BLAKE2B 1bef4f8eb394babd6688786a869e44d10d1c22b762ac424442acbab3775f4f037dd17b5baa2bcf6330dc2f5df5a69bc2ae31187d0b042439b0f3a58775d7e3d9 SHA512 2fdf4a58b7a567f35546666185d3f362e79d6e9b6b9f6e572cbf5a71acf35f7f22c40fd55922289bbc4a2d6316dd732f54a91062c187f0c30f19c0adf62aae79
+EBUILD kstars-3.5.3.ebuild 2587 BLAKE2B d06b66b27b64a7a480c6d5cce1fe9fd851464429d51d998e99cfe1157fe4bf3370f2e22dc1acac45f639fe239f0ee3cc7a26c3808888a5c594723fc2041d4d03 SHA512 04530c5e25e710766c9d6af1126f4ff9d339debab6dca99b0633ad3ebde3eab098f3d5184e7d32290b00520d8ef7ff7394583d7a149e8336787981e35ece5fe4
+MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
diff --git a/sci-astronomy/kstars/kstars-3.5.2.ebuild b/sci-astronomy/kstars/kstars-3.5.2.ebuild
deleted file mode 100644
index 99aa66572d66..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://apps.kde.org/en/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.7.5
-		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_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.3.ebuild b/sci-astronomy/kstars/kstars-3.5.3.ebuild
index cacea491b9cb..b9300d695e86 100644
--- a/sci-astronomy/kstars/kstars-3.5.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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/kstars/metadata.xml b/sci-astronomy/kstars/metadata.xml
index a45e778eca2c..75867d29e217 100644
--- a/sci-astronomy/kstars/metadata.xml
+++ b/sci-astronomy/kstars/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>