gentoo resync : 03.09.2021

3 files changed, 39 insertions, 4 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 5323a765e00f..ba6eb374add7 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,7 @@
 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.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
-DIST discover-5.22.4.tar.xz 8459460 BLAKE2B caa7dea7884a2822888b0faa4bc33339f441aed19a947da49fa71f6a6cccc322925b330169628208ada6910f91a777023a3cd56344d8984652f5b8106882edcf SHA512 3045ba5b4260c3098eb6d536de3598e78df8f31e26667a2b2b4c1588d8cd920586bc18a642dbfb91e3a36e527e2c34756e83fd567df29f2e31bf04fe566eada6
+DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
 EBUILD discover-5.21.5.ebuild 2217 BLAKE2B d6f0facf92e314fd59f5dd10422d0c065d9103ccfa0e3a78c1a9a7d39a00eb5bf31ab5d1855edd0e225a4d09ad387a9d37cd296702d21ea8b293da5ac9b8cd94 SHA512 c1e6c91410e560705e1be62818bbef63016bf879df5c8792be4f95451dd2c173016cb029c82bb75a801dba190120e6940c439db7d801294ea6cf0de16afd7158
-EBUILD discover-5.22.4.ebuild 2280 BLAKE2B d3c71d672b0930c5cfc30f91237cc67e69ba548a4e06f8cda39f3e259a01226b3a86c7b83b488202e449cc6ca6511f07188cd11cc3c04b8faa51cf85271fda74 SHA512 b9688d085f55d338cd51e6196f6199fa51a50dc8d3b1b3d599655c76d2e6aaa8cacffe85e49ac20c00fbde72a373674432eeb3b8e97410d8e287b6114e0ba88b
+EBUILD discover-5.22.5.ebuild 2347 BLAKE2B 5266eb2446071420557738c916c1fd0ffb0c9ac2b8e2db6c3cc26797384481220435f56a7e5305300d937f88ed01e24f0b4bb078b6c75c8c7b936c7f2ab3f776 SHA512 96e1e18671e68109f37906e20e018f89c5a132340574c460f497ae5854210613daf1cc9ae8655386216a568333586e9de18148a536a00e6256732f798a6168f3
 MISC metadata.xml 536 BLAKE2B 20850eeb588c1fc58274a9c8ea680c7bbc77948719fd543e45c227ad327f381ea2554d0145975537f14c0039603fa723a4c3fe30612cbc04ca598ccc436817fd SHA512 1004127dac27d477b091b145abefb1b8e97be36c5b082c8ed036498e9dbe154c4baa91ca0a0122f1f9a3942e84f057cfa3dbdcbed974aaef4c5cda4bf48cc34e
diff --git a/kde-plasma/discover/discover-5.22.4.ebuild b/kde-plasma/discover/discover-5.22.5.ebuild
index 0061af9f0caa..b3d6a84e5b58 100644
--- a/kde-plasma/discover/discover-5.22.4.ebuild
+++ b/kde-plasma/discover/discover-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KFMIN=5.82.0
@@ -56,7 +56,10 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
+	"${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch"
+)
 
 src_prepare() {
 	ecm_src_prepare
@@ -68,6 +71,7 @@ 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)
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
new file mode 100644
index 000000000000..e2c21ac1b997
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
@@ -0,0 +1,30 @@
+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
+