gentoo resync : 05.12.2021

4 files changed, 19 insertions, 16 deletions

diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index e7c8c8b12d82..846eb0839165 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.04.3.tar.xz 567512 BLAKE2B 5cfa3140b5b40ee7b9c78688b1d8289ad9d0b2bc78781883021a2678096412c8ebe1c09172d945ffd5c2111fc3573637735cc0c70512da3c62ea7a868b770415 SHA512 5f2104424c5ddf56eb27bfa0cb3425db6ceb9ecab8844fabfc263e8f0bb165b68077c302df5c06106c15b82836925a730951bada3e0ef09aee1aa99936341f07
 DIST kdeconnect-kde-21.08.3.tar.xz 591412 BLAKE2B ce43bc34b1243cf75d12d58cff98a1a7b4aa0ac0ce17253776990420f3f698684adb8b0d572a41d2bbf7bbabc3bfb07738473e7c0357edcca5367c17ec09a3ad SHA512 f3d0a52edbafde3abd6dda2e8182e257afc37f7bce472a220508d5d75fe359c61322ed26ad21165715a3677c04706eb2a3b9891ac984efbd7a6c6bb46bb8d720
-EBUILD kdeconnect-21.04.3.ebuild 2288 BLAKE2B 5c9eea75193721637968cc7f128d44ce74b66c255d3ddeff1008df41e45328f85d3ae44c88f8f48ab536e651e9a4dd834946057b89ff1da84119af3bc9f7ad6f SHA512 02e6117ba731caf2d3f4314b1a2af169e9776d7fdae8b1f6231fedaf4e1f97a2b2d00a9153fb9f141986f1664cfc91ad9ef8b2471fef3c437c8873dce669d3cd
-EBUILD kdeconnect-21.08.3.ebuild 2443 BLAKE2B 8330101b11f2ec505cbec4404e26c859e3070e4bfeba58bf7aaa9b8ef894a636d81c82391a50dadfff9e410540f675de97e3082bcbf53ae0c2d17501cb7fb30d SHA512 b84f85bba2f4ead75e98a81082f2dc68180e882ab2408c29471b6a9e1dc66d6059ea089508a8f7a1ee701e913f86097d88bd313f87c8b7686cebec72b932af60
-MISC metadata.xml 646 BLAKE2B 7cab431596b6c04d30323d837aeb037f33f64414907a60f1ff555c351c6d7dd569fccfa663694f7229c706d63c9fa33fbf706b3ece0da4be4d194fa3c4dc251b SHA512 7badd856b60df45a45a75679844a347d33e29facf5ea118cf8238078fe1d6715fe8930838a0e105a116e27b6e5061bf45c8f4cb17ec1d948f733d4c4fb9d4efb
+DIST kdeconnect-kde-21.11.90.tar.xz 608516 BLAKE2B 4c370439c08a6fa39c0f75e2ed0969201e5e42040bc5f2558ec94ecf3d853923bbfad7aca480d333150d18d5c0f67c588ec900620de65963e40456c88bbcc896 SHA512 ec75d0930d53935fb1f34fa743b48b03984432bf6967bbef08b559b45469be260268eb27c792ce5a139a9724bffff197c7708fefa0f1d255cd1322934f0a0a58
+EBUILD kdeconnect-21.08.3.ebuild 2440 BLAKE2B efbc54f4f86a396b4e98d0bf20e77d3fb9efc4e725feeaff9ed71a0255a34c120786b3b0ebf11e3b3659c571e933ff1e044e78d2fe7335ec8c04273763b87583 SHA512 6247b5f39cdeecb4cefeb9be4bddbe2b85fd1f7efc0ad037c4e738efd9a76ba50797042effbfcb38e8704b60b8568b632f38d9ef5c694b09ed9632c3fb3cb223
+EBUILD kdeconnect-21.11.90.ebuild 2443 BLAKE2B 6fd813dc3989b013a95fb2ace817e55153358fe6f137c188da9e326c96a617a768d83295dd46076b44ff395f92b5f79438335dee3363256a1423df5e014389c4 SHA512 4349b092b6ea80ef133a40a9a9449d9d8f597064d6864ad39caf5dc21a61804cf16e5ad65002cecffb216d883f6dbaa4984043646489caa8b074ec4d8fe137f1
+MISC metadata.xml 539 BLAKE2B df52f44f6c2a6c7f0226cbd25a7cb96b0b105ceed441987e9be966d4b5ac808635a54adabca2bcb2aa0bb70697d2f253ce603a69cd16bf164b156941905cbc0c SHA512 740c11ab7c2bbb9f49619b26de97e0971de0a480ab553875aeb8e588271a445cc0d295a736c9123e1518a0834fdf9fcc28763bbe193e5a53b549038d9f38aaae
diff --git a/kde-misc/kdeconnect/kdeconnect-21.08.3.ebuild b/kde-misc/kdeconnect/kdeconnect-21.08.3.ebuild
index 925bb15bbbfe..3143bc7ebda5 100644
--- a/kde-misc/kdeconnect/kdeconnect-21.08.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-21.08.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"
diff --git a/kde-misc/kdeconnect/kdeconnect-21.04.3.ebuild b/kde-misc/kdeconnect/kdeconnect-21.11.90.ebuild
index 6ac6b2583e3c..1c9b55b22926 100644
--- a/kde-misc/kdeconnect/kdeconnect-21.04.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
 KDE_GEAR="true"
 KDE_ORG_NAME="${PN}-kde"
 KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -17,19 +17,21 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bluetooth pulseaudio wayland X"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth pulseaudio X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-libs/wayland-1.15.0
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=
 	>=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
@@ -44,8 +46,11 @@ 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
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
 	X? (
@@ -53,8 +58,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/libXtst
 	)
-	pulseaudio? ( media-libs/pulseaudio-qt )
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+	pulseaudio? ( media-libs/pulseaudio-qt:= )
 "
 RDEPEND="${DEPEND}
 	dev-libs/kpeoplevcard
@@ -64,14 +68,14 @@ RDEPEND="${DEPEND}
 	net-fs/sshfs
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" )
+
 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
 }
 
diff --git a/kde-misc/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml
index e6d2d9d849d6..65474bc92199 100644
--- a/kde-misc/kdeconnect/metadata.xml
+++ b/kde-misc/kdeconnect/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="pulseaudio">Enable system volume control plugin using <pkg>media-sound/pulseaudio</pkg></flag>
-		<flag name="wayland">Enable remote input mousepad plugin using <pkg>kde-frameworks/kwayland</pkg></flag>
 		<flag name="X">Enable remote input mousepad plugin using <pkg>x11-libs/libfakekey</pkg></flag>
 	</use>
 </pkgmetadata>