gentoo resync : 06.04.2022

4 files changed, 42 insertions, 2 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 80d64f74d496..25986edda279 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 4dc805ce48a7..2505bbe62a72 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,6 +1,7 @@
 AUX krfb-21.12.2-optional-pipewire.patch 910 BLAKE2B 9e43a73004b463c592116c3e39038e2be0f8eea22340958283356a3f05347d4a3ee8a6bba8d93091502e9685e9db3a5d2d2b845fe5a6b8874e6f4602e6e5edff SHA512 0c527021bf9e2fe6f3b9a35f40c765f72e6d4c3af160ee770ff5cd5f506d72ebd5d05bcb4aa5ad0983839f2c230069d355ac1a8ba09bd3f415d47f9f8585925a
+AUX krfb-21.12.3-optional-wayland.patch 1083 BLAKE2B c546e68fc1126c12ba286bf2a6b2c583491b97112c23aa93820989b71adf2695e2e7a16dbcd5e55b9ac98a61da4b16d454b47d7e2e847f7689f2b3a5a5f6ff81 SHA512 74031ee200d67bc64463031d0e3bb0ab031cdbd62ea8982cb467fdd752dc23165032b429b6bf857cc73dc48a772d50f3fb0687d5f904dfd2eb7e886818601491
 DIST krfb-21.08.3.tar.xz 1293896 BLAKE2B a7d162e087b1792e68dbd18ca047e6d50256f0c1103665bcd57c5f7e2171aeba610f06dd92ff84a437b1ca79c0e48e4e5c5555e4cbbc872dcfe84c5d2eed5573 SHA512 2386b5bb08ce6e45d5ea43043a3b73aff52f0b82e6f464a2c8f29a5e82a90f745ae59716747e5f977f1099fb655bb4427c51a3f3498a1e42dc84e1e5fef40728
 DIST krfb-21.12.3.tar.xz 1302484 BLAKE2B 05ad97456acbf20251ad46525e37e78f5bcfb869382b33003ad9fdc18d006741216ceb15834c692dede6478d22812f84734530506bc54aef8bfa2508d6ba9b05 SHA512 b365259391aaf7870ef87566b82354119aea60303e104ea5c5b82c28ad135ac66b3687638c28af997ade2851989d4d1bb0a455bd241a3aeaa1475e032442071e
 EBUILD krfb-21.08.3.ebuild 1596 BLAKE2B 570063b4fb1824b15b473ccc45604eaf193d958c2460db46d41b9fb872bb98b87430b38cbb7260511a8e563c614dd1c06070e32f4f4d30e35c92ae03022b266b SHA512 d807b381ca5d3940d49a483babd3a9a99645ccdbdd9252f1a63b00fe12b1354fb03da38bdf66a0b3505787697dba0555ac0e90864c9bb894037ebaa5a8eaf7f8
-EBUILD krfb-21.12.3.ebuild 2020 BLAKE2B 163d438300905d332bde6676d5e6b0d3ca554488a2669c9b65f4d277963889e183388147e4ffebba75d6819c87178e35803061d930a006e7f06f5934f3eea1f0 SHA512 03ced425486f243fdb5696848e4e65866f1b7976fc682b03b8d17d1c09d6cafe0154a793b90f1563b7bcdec0e6afa59690a65db8cd74b28135cdb37fd77e3084
+EBUILD krfb-21.12.3-r1.ebuild 2103 BLAKE2B 714e4c3f2a4c326670b74d3d768a3c218d61c12e2643f219b48cc3893993b350bceff2d7657c1416f6c02ad9e453cdc0d75e3683ecb725e361be498dd81d3e73 SHA512 8a8641454e0a89a62d79d1665c26dbd2d297e0320b2ddd100d2cdf7ae62f2f0b51d7e51ac06712f6fc7b883e92169f7f4342076a626092077a8e8f40c25c6ec3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/krfb/files/krfb-21.12.3-optional-wayland.patch b/kde-apps/krfb/files/krfb-21.12.3-optional-wayland.patch
new file mode 100644
index 000000000000..3c074ad82b1a
--- /dev/null
+++ b/kde-apps/krfb/files/krfb-21.12.3-optional-wayland.patch
@@ -0,0 +1,35 @@
+From 4b7985db1b7ba0ef4fa0c5e2a664f0531026d0be Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Mar 2022 17:12:39 +0100
+Subject: [PATCH] Make KF5Wayland optional behind existing DISABLE_PIPEWIRE
+
+We have an option so let's be consistent.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29218ff..82b02f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     DocTools
+     Notifications
+     Wallet
+-    Wayland
+     WidgetsAddons
+     WindowSystem
+     XmlGui
+@@ -90,6 +89,7 @@ add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugi
+ find_package(PlasmaWaylandProtocols 1.5.0)
+ 
+ if(PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
++    find_package(KF5Wayland ${KF5_MIN_VERSION})
+     find_package(QtWaylandScanner REQUIRED)
+     find_package(Qt5WaylandClient)
+     find_package(Qt5XkbCommonSupport)
+-- 
+2.35.1
+
diff --git a/kde-apps/krfb/krfb-21.12.3.ebuild b/kde-apps/krfb/krfb-21.12.3-r1.ebuild
index 503b92e52a4f..4b13224a1e90 100644
--- a/kde-apps/krfb/krfb-21.12.3.ebuild
+++ b/kde-apps/krfb/krfb-21.12.3-r1.ebuild
@@ -46,6 +46,7 @@ COMMON_DEPEND="
 			>=dev-qt/qtgui-${QTMIN}:5[X]
 		)
 		>=dev-qt/qtwayland-${QTMIN}:5
+		>=kde-frameworks/kwayland-${KFMIN}:5
 		media-libs/libepoxy
 		media-libs/mesa[gbm(+)]
 		>=media-video/pipewire-0.3:=
@@ -67,7 +68,10 @@ BDEPEND="
 	) )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-21.12.2-optional-pipewire.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-21.12.2-optional-pipewire.patch"
+	"${FILESDIR}/${P}-optional-wayland.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(