gentoo resync : 29.01.2021

3 files changed, 2 insertions, 83 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 59316648238c..ecfdbb85ede5 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,3 @@
-DIST discover-5.19.5.tar.xz 10296324 BLAKE2B d19662ea90f8be4e090e62587ae79b19c072dfac28d90c2bc1476ff4e375498e938e0b76d02487e8cdc64e297193dc62bce34484f81122d827ae0fcc5070fc3f SHA512 524fc45331631a305620f05fe67f780aee2dba7714978f32d9baa0d488185da801ee7a4d11592f2e07dfe395726b0c34d4ae7dfe3abf2b0e7632bdea27a714fd
 DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
-EBUILD discover-5.19.5.ebuild 2032 BLAKE2B 885e08114d9fa1440380f6fad21f64a816d39776242a2aa53b14d253e17053693e069dae7e5ed62fec03772474c2ce3e690f4692f57abc7be96f5041626f0ca0 SHA512 55bd727d282f46296930d399dec6299be3dd686b3a2cc1c8e87d7816ccae73dd2cdfce5dd200ed55f9aeeff63fbe6cbc7c3fe10986f2838cb3d7a9df76921ec9
-EBUILD discover-5.20.5.ebuild 2092 BLAKE2B 1548778b36c5159a65cf196f900ead99e96bafa26532395a61f1ebf42f9257950ec8dceb02d1ec94ca920eebfb3466d130820d7dbdfb76c8af9fa20d3722bc0e SHA512 e9cd4b317bb695be0a030e64400559fc905b7dceea1857c24b166c8647f3e718dbd1df5c1fb2c26edc5c65e903e43e44968d882f128d2a6dd27eb3a24d7ed294
+EBUILD discover-5.20.5.ebuild 2090 BLAKE2B 1827c172905a2f72feff67fe2c2581fb4e5de133b04b5ecc07ef9bbff64e321954f5a23f072ed3c58d528540f50bd99f02a781239319fca55d0a98b206b0adb8 SHA512 1c4f19424f1403912d9a2ada4b001e7bd67924393c3f4ecde7199674d0b7dc130362fced07ad684955c6cc3a2a94b412948fed762e9c0ee7d7e3eba4817f5687
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.19.5.ebuild b/kde-plasma/discover/discover-5.19.5.ebuild
deleted file mode 100644
index 48dfafd990e1..000000000000
--- a/kde-plasma/discover/discover-5.19.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+firmware telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	firmware? ( sys-apps/fwupd )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-5.20.5.ebuild b/kde-plasma/discover/discover-5.20.5.ebuild
index 2e60240ec3c4..6acdfc13dd6a 100644
--- a/kde-plasma/discover/discover-5.20.5.ebuild
+++ b/kde-plasma/discover/discover-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend