gentoo resync : 28.04.2021

5 files changed, 115 insertions, 12 deletions

diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 90ac3a193703..0d4272dd495a 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,6 @@
-DIST kaccounts-providers-20.08.3.tar.xz 36188 BLAKE2B 90694addc96e68ef87ba53115e1e0021543e5d4731f31b42e419bfa7c282581efd175723f89a5f091400ba69d23c929d26d75f0ccbe365ce00bcd19c91362348 SHA512 d83e66c315f0b6bd2cc6bc7a438812ca45aed2327e57e9007e29be78e20b947cb47eea929f787e97bf18d0c555ff10bbbace26d6c791c6b78dc0048f8f4804fc
+AUX kaccounts-providers-20.12.3-qtwebengine-optional.patch 2822 BLAKE2B c303be4a5291ab18945e73a83167fb563daef52aebe68c3ec94f98327f01d3fbdcae1390cf51a1334c950d7f04cc7d8de17dac388340d15c773ed2a9d1275c91 SHA512 50dee13af1c01df73bea1d7f3f36588f415c959e1d7bcd84d73f17c88808df9b0fcd434b5a9a0281c9dbfaab416e852627f68a4bfeef41451c2a1d4560a10d0a
 DIST kaccounts-providers-20.12.3.tar.xz 61612 BLAKE2B 89861cc15a73f7003900b8ee540c904a0e426ed254c802a4116e5a9861f4483daecd00dafbc4f28eca7edc97f52af58d3c5503396e8d3168575e5f654129fd1d SHA512 9ad534fd4e4bfd4992265fb2722b09eb09fc3f4a880751a44b5f29da7250d2827dc1bf62a7df04449064d63d2b0b30ce4038f0920f9a6838f8f4876bf680b2c2
-EBUILD kaccounts-providers-20.08.3.ebuild 803 BLAKE2B 727f43ef62287c6e074f8de7789b781306744ba269731e19021c237bb882eedb92b30e1a55be1c5f8d62050e2aa394a53478be843f3882cb641256550ce83bc3 SHA512 3862b0c8f6cdcc4d1939236c49eb6e6b9eabdd9d3919792a1cb410e93ca3d32619ee166343eece064bd0859d26185a1a9c4aac82f77392046fa9b185675e2e8b
-EBUILD kaccounts-providers-20.12.3.ebuild 797 BLAKE2B b71b835aba833c5012b64db895c44797c2b9965537f0716c6695ecf2ea33eb61deb16abf15dcd5f0933d9a94880da60085fbc4b78464a60b3a558da6ae42e73f SHA512 66f719a7dc2e4be48d0f159bcb3727b3567835d76c78495c6065421bfab1c7045065cc391e666daea585edd3a8ffe8551a37ba68bf15efc2e608cdf8453e4c48
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST kaccounts-providers-21.04.0.tar.xz 62304 BLAKE2B b292de65f70157e041ceb966044fe38660a38a0a2d64ea12f71736688acc41fbe38e3b10331ba48d37a2072cac0c00657ad19dba39dfd96308608498c825d9f2 SHA512 acb4cde37abac5b696e52b012fb79e381bb32e00f2afb7f240d7ce7cf41b743bfd017f82e3cdd9a062dc325c95062bf158793bd008ff9e2dde63b8509b61f1f4
+EBUILD kaccounts-providers-20.12.3-r1.ebuild 1006 BLAKE2B cf5d7c5018dada508ce84f2bff23e55d8d8a945be882102e417a7e50e45c297c3a2a22f1864a3176dcfcb8a024e99e419edbad15d64f5a08322fb0f8fe9a82be SHA512 905a180bea05586009022dcc2d4e2d3283f9b144fcf91fc21ca70b68fa1e96845177726d5c51f458cad57f6311cd1235d43b1840572ba0124acd0bf98f3e674e
+EBUILD kaccounts-providers-21.04.0.ebuild 1018 BLAKE2B e99dab445005c70ad998554680b021f5986f58ff104474bb6b8406e6b857699fc3e1ec26e473ede90c0170d6b28ec4a662dc2a26bfdff69bcffb6e19185621d3 SHA512 84c1d27d55701b3fa9c8ffbe70f2bdf45d58992155b88efac6034beebbcd135ce63170ca8557f7ae94b839cc913b4904bc8892f436fae3926e1ffbf5d52a532f
+MISC metadata.xml 366 BLAKE2B 7d04e3030abdea6593027fcdbbb1825369569be3de6312d1b66ca699d0c0817a3ef1bb8b685480a28b703cd6f20698174aaaaca42c886807cbd6dc50aeb3d32a SHA512 18a7a40fae8cd9bd9932a754033e80a8a4a67423964c8bc72c2ced8f9f85ce15843ebfbb2c6850a04965c39e2067d2f52323395d2668d1dba7e32b4fcbf86c2c
diff --git a/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch b/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch
new file mode 100644
index 000000000000..02e5c9ee1d93
--- /dev/null
+++ b/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch
@@ -0,0 +1,81 @@
+From 7a22a7fb85804c834c4597adca4a69dd5a82ffa4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 4 Apr 2021 17:01:12 +0200
+Subject: [PATCH] Make Qt5WebEngine optional
+
+Qt5WebEngine is a very big package and not easily available on every
+architecture. It should be optional at least when easily possible.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt           | 9 ++++++++-
+ plugins/CMakeLists.txt   | 4 +++-
+ providers/CMakeLists.txt | 9 +++++----
+ services/CMakeLists.txt  | 9 +++++----
+ 4 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c7207b..906893e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,10 +16,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
+ 
++include(FeatureSummary)
++
+ find_package(Intltool REQUIRED)
+ find_package(KAccounts REQUIRED)
+ 
+-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml WebEngine)
++find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml)
++find_package(Qt5WebEngine ${QT_REQUIRED_VERSION} CONFIG)
++set_package_properties(Qt5WebEngine
++        PROPERTIES TYPE OPTIONAL
++        PURPOSE "Required for Nextcloud Accounts plugin"
++        )
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED KIO I18n Declarative Package)
+ 
+ include(KDEInstallDirs)
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index 3ea1817..f87b8f6 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -1,2 +1,4 @@
+ add_subdirectory(owncloud-ui)
+-add_subdirectory(nextcloud-ui)
+\ No newline at end of file
++if(Qt5WebEngine_FOUND)
++    add_subdirectory(nextcloud-ui)
++endif()
+diff --git a/providers/CMakeLists.txt b/providers/CMakeLists.txt
+index 987fb6e..cff3420 100644
+--- a/providers/CMakeLists.txt
++++ b/providers/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-file(GLOB provider_in_files *.provider.in)
+-foreach(provider_in_file ${provider_in_files})
+-    kaccounts_add_provider(${provider_in_file})
+-endforeach()
++kaccounts_add_provider(google.provider.in)
++kaccounts_add_provider(owncloud.provider.in)
++if(Qt5WebEngine_FOUND)
++    kaccounts_add_provider(nextcloud.provider.in)
++endif()
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 93e14fc..cc58f91 100644
+--- a/services/CMakeLists.txt
++++ b/services/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-file(GLOB service_files_in *.service.in)
+-foreach(service_file_in ${service_files_in})
+-    kaccounts_add_service(${service_file_in})
+-endforeach()
++kaccounts_add_service(owncloud-storage.service.in)
++if(Qt5WebEngine_FOUND)
++    kaccounts_add_service(nextcloud-contacts.service.in)
++    kaccounts_add_service(nextcloud-storage.service.in)
++endif()
+-- 
+2.31.1
+
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-20.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3-r1.ebuild
index d3e7056ab52b..5edc0450b26b 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-20.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.75.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE accounts providers"
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
+IUSE="+webengine"
 
 BDEPEND="
 	dev-util/intltool
@@ -22,7 +22,6 @@ BDEPEND="
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,8 +29,18 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	net-libs/signon-oauth2
 	net-libs/signon-ui
 "
+
+PATCHES=( "${FILESDIR}/${P}-qtwebengine-optional.patch" ) # bug 753274
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.0.ebuild
index 36d288e4a231..0121ca06ed2e 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
+IUSE="+webengine"
 
 BDEPEND="
 	dev-util/intltool
@@ -22,7 +22,6 @@ BDEPEND="
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,8 +29,18 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	net-libs/signon-oauth2
 	net-libs/signon-ui
 "
+
+PATCHES=( "${FILESDIR}/${PN}-20.12.3-qtwebengine-optional.patch" ) # bug 753274
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kaccounts-providers/metadata.xml b/kde-apps/kaccounts-providers/metadata.xml
index 2fdbf33d963d..915d461d6529 100644
--- a/kde-apps/kaccounts-providers/metadata.xml
+++ b/kde-apps/kaccounts-providers/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="webengine">Enable Nextcloud KAccounts plugin using <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
 </pkgmetadata>