gentoo resync : 22.12.2021

4 files changed, 2 insertions, 126 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index d7acca858415..126b76ce28da 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,7 +1,4 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
-AUX discover-5.22.5-no-updates-kcm.patch 925 BLAKE2B d1f5c52c3d9b47ae108712aad1e55621ae5be9d1ad5e97e3d907d0003e6c59b5296abaf1a79a05865598e71156e1fedbc5eb843c1f8a4f9058dfe2d4fd81b29f SHA512 03d1899af2c61465f9d8da050c55b35620c1624bc1fa89970fd73a490aaaa5d1e957b38cf0678a914598ddecf76dd762c1aa614a21db5ced10c06e50c8f5dfd8
-DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
 DIST discover-5.23.4.tar.xz 8237056 BLAKE2B 734c7fd44cf01d958fb9f6a4eb64192b0e608c75c58d83f20f64407762ca69ce4f9c90f538c0a1447e06853fb99952ce860d8d0e4a94071a1f6aae2514449764 SHA512 a2f36b80d14b72c3fa79b0bf1a06f61e66d4363c2167edcf862be97ce7d607ab7c5fad021c4317eee7c339730898e4a87817abeef538b498e08a050edaedd2b4
-EBUILD discover-5.22.5.ebuild 2344 BLAKE2B 2cec026b1669b2509e18fa1c8800662254ab1dab756b9f42f2e7a25da58dc4e326bb013dea9dd2589ed23e9c041dd41ddcacc1b3360f9823939733f639675199 SHA512 b59194b3b5b28e4c88e0b301eafa80d31a55143d1f5f7f022a05de591a6112040860fe3937345c815e25b53e7d2ed95b335137e79d676e8dd8ad1045e955e405
-EBUILD discover-5.23.4.ebuild 2297 BLAKE2B 829364d324271168b4c04e27f933e5c594676412d6efb19c67b650b71dde25783dc251dc445040398938e5264d74aebdd9f8747ada252beab49146656fbd0481 SHA512 38dd90840ea9ebf724482e4596afe0f9b73c1b7216cc8693d9d21fc0939c385a8e1737e036315a8e0ebb5a0400726c19b3051e8db2ed93925c04d9464779f384
+EBUILD discover-5.23.4.ebuild 2294 BLAKE2B a12295383f1dd23634f157fc7b09bd62a9869775707830018f3bcffbe6cbbe76416c2daab567d90cb29dabad8f3748b39001608134fc595be4497f50048b1407 SHA512 2bb0699146605a1b62c7ba5a38ac5304157ab4739292da7eab8917b72e7177c545a80c4c8a3902047d1fce53ea56788e483c6012610f67330280e9e829db1c62
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.22.5.ebuild b/kde-plasma/discover/discover-5.22.5.ebuild
deleted file mode 100644
index 72f770eee56d..000000000000
--- a/kde-plasma/discover/discover-5.22.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.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 ~riscv x86"
-IUSE="+firmware flatpak 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/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kidletime-${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-1.5.0 )
-	flatpak? (
-		>=dev-libs/appstream-0.12.8:=
-		sys-apps/flatpak
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
-	"${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch"
-)
-
-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_Snapd=ON
-		-DWITH_KCM=OFF
-		-DBUILD_FlatpakBackend=$(usex flatpak)
-		$(cmake_use_find_package flatpak AppStreamQt)
-		-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.23.4.ebuild b/kde-plasma/discover/discover-5.23.4.ebuild
index ffb613b84536..8974e25183c2 100644
--- a/kde-plasma/discover/discover-5.23.4.ebuild
+++ b/kde-plasma/discover/discover-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
deleted file mode 100644
index e2c21ac1b997..000000000000
--- a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 1 Jul 2021 22:24:40 +0200
-Subject: [PATCH] Make building updates KCM optional
-
-Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior.
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa27fc77a..26387b2f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,11 @@ add_subdirectory(libdiscover)
- add_subdirectory(discover)
- add_subdirectory(exporter)
- add_subdirectory(update)
--add_subdirectory(kcm)
-+
-+option(WITH_KCM "Build and install the updates KCM" ON)
-+if(WITH_KCM)
-+    add_subdirectory(kcm)
-+endif()
- 
- option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON)
- if(WITH_NOTIFIER)
--- 
-GitLab
-