gentoo resync : 12.05.2022

3 files changed, 11 insertions, 20 deletions

diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index f02177d8613a..fcabd43e8934 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,6 +1,6 @@
 AUX kdeconnect-21.07.80-revert-disable-kpeople.patch 961 BLAKE2B 01322bdec48897cb763c551ed2210d4d86edd456d734639eda83dd4062197332c565fe337c90329de33290d55609a5586585376a4c28ac86cde645b3ae9d1d06 SHA512 d75a3b02c35d5d14cde7d34aca5b3e762dd12eb1492e5871c1db23d783f4f4caedec0116f041b9230e783ccdb1fde8a2625a58aec9d07bc0f708299048e1f885
-DIST kdeconnect-kde-21.08.3.tar.xz 591412 BLAKE2B ce43bc34b1243cf75d12d58cff98a1a7b4aa0ac0ce17253776990420f3f698684adb8b0d572a41d2bbf7bbabc3bfb07738473e7c0357edcca5367c17ec09a3ad SHA512 f3d0a52edbafde3abd6dda2e8182e257afc37f7bce472a220508d5d75fe359c61322ed26ad21165715a3677c04706eb2a3b9891ac984efbd7a6c6bb46bb8d720
 DIST kdeconnect-kde-21.12.3.tar.xz 610608 BLAKE2B cf3bc2c502cbff03d8dc738192b36f61f30e6d223446c8117cd612b987adfe60a20aa612a2b3a6a972068f92f8b03162701ac8f8e51c374d28bb05d309c4d346 SHA512 3cb399ee13c538646650b7360fd6fb7285ad8f1f56fb41c94dce44daf72dd66815aaa2b0d54aa02cdc206336e1ed582417b0aafe806b3f67af0c9503183a86f6
-EBUILD kdeconnect-21.08.3.ebuild 2555 BLAKE2B d7bf06957be75b0ac2803005ce9a31c90ad7093df4320b91f75f5d5fcb9c860f7c4520673022e298bad88e461f93a8139f8f6f9d38cab861d9d22c2d47026fe6 SHA512 f40726067cdf8ebadbc7e0b4a78b32ea6b8856019aa574dc308036f5bf3d755162b49573d8fc60dadce9ff332092a796d0af83aeb27e014996e5050627e41a58
-EBUILD kdeconnect-21.12.3.ebuild 2556 BLAKE2B dfda5f963f7115b5ec39ab24885cd126efe3a740d86e8f8488c9f5fce4a6d1e60ee823d450c56a3bce6d6052d1bc72ddb17b21615eacec8be5a264392bc07c10 SHA512 ba10343d71f9a16c475bf63b061aa0dd4fab5a6c6311199a5c862acfbe2866bc695d026e232861192779e2f633d6adbd50ac5a143975adbb075a4921ce5903de
+DIST kdeconnect-kde-22.04.0.tar.xz 608700 BLAKE2B 92c456bf9a141a460de477830256623d4954239a021acf0dc3107955739d68607baa174112ef0ecd52e723e827cd83575ff390ebb45c920aec7e8d681108eeb3 SHA512 8c0906aad9984b1a380808aa5ee453e41acec49b27979087e8eb1229f79bf29da9333dd4262a896606dbf5b0a887c67ca6f7a81a8fef8b1e8fb4e3641a8743ea
+EBUILD kdeconnect-21.12.3.ebuild 2516 BLAKE2B 20edf776d871acaf47f2ec3046543ad32ffcb1fd159ce411fb33034804e6d60764ddce573a7636ce9a8c26a5bccfcfe54df9e9ba4df3eacff2e728cad9cd23bc SHA512 71233011e7925c92cbe93c3177e0385a2198a1645d8cbef094268a56e29d57f6663b7ec09d97e76e81b87b93da64a0b535b75ff0e873745a8dc3ea4ca5c5fd62
+EBUILD kdeconnect-22.04.0.ebuild 2520 BLAKE2B 39454d86c6ce1b750dfd4f290099f02c232dd3543cd6debffce89caa2a8d04631b912bd5e8a8095339e5ee6569ec3cd578b9995522cb3e78fec7110e72b9c34f SHA512 3dd46f15c51ce1b5afc8754fbb94a453830ec6fa643f9851a235db7ed7594d482252b873b21915d849fccb2688e120d9412d053a4ccd0bd0cdd387b475471c95
 MISC metadata.xml 539 BLAKE2B df52f44f6c2a6c7f0226cbd25a7cb96b0b105ceed441987e9be966d4b5ac808635a54adabca2bcb2aa0bb70697d2f253ce603a69cd16bf164b156941905cbc0c SHA512 740c11ab7c2bbb9f49619b26de97e0971de0a480ab553875aeb8e588271a445cc0d295a736c9123e1518a0834fdf9fcc28763bbe193e5a53b549038d9f38aaae
diff --git a/kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild b/kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild
index 9e0106498180..a80a8efb173e 100644
--- a/kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="bluetooth pulseaudio X"
 
 RESTRICT="test"
@@ -68,10 +68,7 @@ RDEPEND="${DEPEND}
 	net-fs/sshfs
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 "
 
diff --git a/kde-misc/kdeconnect/kdeconnect-21.08.3.ebuild b/kde-misc/kdeconnect/kdeconnect-22.04.0.ebuild
index e80513c6ffb6..8fbec221ffe4 100644
--- a/kde-misc/kdeconnect/kdeconnect-21.08.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-22.04.0.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 KDE_GEAR="true"
 KDE_ORG_NAME="${PN}-kde"
 KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -17,8 +17,8 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bluetooth pulseaudio X"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth pulseaudio wayland X"
 
 RESTRICT="test"
 
@@ -31,7 +31,6 @@ DEPEND="
 	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -39,6 +38,7 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -46,7 +46,6 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kpeople-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
@@ -59,6 +58,7 @@ DEPEND="
 		x11-libs/libXtst
 	)
 	pulseaudio? ( media-libs/pulseaudio-qt:= )
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	dev-libs/kpeoplevcard
@@ -67,13 +67,6 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	net-fs/sshfs
 "
-BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
-	dev-util/wayland-scanner
-"
 
 PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" )
 
@@ -81,6 +74,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBLUETOOTH_ENABLED=$(usex bluetooth)
 		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
+		$(cmake_use_find_package wayland KF5Wayland)
 		$(cmake_use_find_package X LibFakeKey)
 	)
 	ecm_src_configure