gentoo resync : 14.08.2021

3 files changed, 50 insertions, 14 deletions

diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 610dc19d42d7..a7a77ca7ebe7 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,6 @@
-DIST kdeconnect-kde-20.12.3.tar.xz 551780 BLAKE2B 5bffabba63f40d6e1210f393c36d82796fe216163f175a596c271b7ec713ad2369bbb777b866a151ce2d823301b36c8a5a4e3931e56e5f2403a4fb01dc1ca1a4 SHA512 ad40aba6cb879353ecc369b727ef5181aab89d6e645f7997eeb3751913c47ac2ebef82e68efc56837f154508b049bf15511717d314612440f3824d004b9e425c
+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
-EBUILD kdeconnect-20.12.3.ebuild 2299 BLAKE2B bb235e13d7ea0226419daad7323e0ce1241cd7869d3e436a2f0a2e39d005d5bbecc29d67016e5d3590fcf4bed9e2595d0752953cdb5cee4468c680715e3b29cf SHA512 42398be059eef0f3c2facf8682f094502e6a61640066734d281e977cfad4d771fe08b9835643f77db89d69603421ad83571513f60a292a5ca876ce990381d513
+DIST kdeconnect-kde-21.08.0.tar.xz 589272 BLAKE2B 6009aca7ca304c4fe2acc88c47b831d0b6364d154344e863b62da4aa9a791258220da458581cc71e5174982cf7c64438463f761eea4fd0c29679d95cd4a41ed5 SHA512 caaf729781a76c198f7f71a3e9f796a9920a589c5c9937376ccc87a03f89fc51a0ec5a0a6a7096279674cbeda8a9fe6bcca4d39f5e9a356a784b07909a53b288
 EBUILD kdeconnect-21.04.3.ebuild 2288 BLAKE2B 5c9eea75193721637968cc7f128d44ce74b66c255d3ddeff1008df41e45328f85d3ae44c88f8f48ab536e651e9a4dd834946057b89ff1da84119af3bc9f7ad6f SHA512 02e6117ba731caf2d3f4314b1a2af169e9776d7fdae8b1f6231fedaf4e1f97a2b2d00a9153fb9f141986f1664cfc91ad9ef8b2471fef3c437c8873dce669d3cd
+EBUILD kdeconnect-21.08.0-r1.ebuild 2443 BLAKE2B a4900f6ce933a30d95f6af7a711141f87a16534c209e75b8fb3fb702aac922f722c8b5f4740faed69a50d8cdc3eb255755baf365795a34e4d3e905353c00a90a SHA512 9f8203cce4faa1923a9466a091121c0f91b98dd61bc317d5b05dac60f3b6dacb5f1642c53b01d62c9592f7157922d767a0b9e8aadafeff807f83cbb58754cc77
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch b/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch
new file mode 100644
index 000000000000..bd7063f93ee6
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch
@@ -0,0 +1,31 @@
+From eab3dd5f39b7633a3bc074713da69c53f123345d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 16 Jul 2021 23:15:26 +0200
+Subject: [PATCH] Revert "Disable kpeople qml module finding"
+
+This reverts commit 89f52af4389e9e98f7428db670355d144b6045a2.
+
+We don't have to do that, because we already apply downstream magic
+and set -DECM_DISABLE_QMLPLUGINDUMP=ON globally.
+
+See also: https://phabricator.kde.org/D25812
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 44af637f..b2027e92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ else()
+ 
+     add_definitions(-DHAVE_KIO)
+ 
+-    #ecm_find_qmlmodule(org.kde.people 1.0) FIXME This results in KPeople code being called which triggers DBus calls which breaks the Windows CI
++    ecm_find_qmlmodule(org.kde.people 1.0)
+     ecm_find_qmlmodule(QtQuick.Particles 2.0)
+ 
+ endif()
+-- 
+2.32.0
+
diff --git a/kde-misc/kdeconnect/kdeconnect-20.12.3.ebuild b/kde-misc/kdeconnect/kdeconnect-21.08.0-r1.ebuild
index 5e4ceb747961..eb3be63d7706 100644
--- a/kde-misc/kdeconnect/kdeconnect-20.12.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-21.08.0-r1.ebuild
@@ -5,10 +5,10 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
+KDE_GEAR="true"
 KDE_ORG_NAME="${PN}-kde"
-KDE_RELEASE_SERVICE="true"
 KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.75.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -17,17 +17,23 @@ 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"
 
 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
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -40,42 +46,40 @@ 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? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libfakekey
 		x11-libs/libX11
 		x11-libs/libXtst
 	)
 	pulseaudio? ( media-libs/pulseaudio-qt )
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	dev-libs/kpeoplevcard
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	net-fs/sshfs
 "
 
-RESTRICT+=" test"
+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
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	ecm_pkg_postinst
 
 	elog "The Android .apk file is available via"