gentoo resync : 05.12.2021

4 files changed, 10 insertions, 94 deletions

diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 6cb34902e535..a5e0f7c47409 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,6 +1,5 @@
-AUX kaccounts-providers-20.12.3-qtwebengine-optional.patch 2822 BLAKE2B c303be4a5291ab18945e73a83167fb563daef52aebe68c3ec94f98327f01d3fbdcae1390cf51a1334c950d7f04cc7d8de17dac388340d15c773ed2a9d1275c91 SHA512 50dee13af1c01df73bea1d7f3f36588f415c959e1d7bcd84d73f17c88808df9b0fcd434b5a9a0281c9dbfaab416e852627f68a4bfeef41451c2a1d4560a10d0a
-DIST kaccounts-providers-21.04.3.tar.xz 62920 BLAKE2B 6f399fe0bc8127f085e8e8b3071b048f5c9dc52b6cb81d5ecf8e7383ef120b9954fe616f55564b06d7c189301bf9d7874338f6f2fad8274254c71a410a5838a0 SHA512 429bbe610c2613da430b3a641e374eb98d81f874c63a508a30f7acda2774a0dc31bf5fbf26a142dee15f4ec8556ecb2a28d78d67b6378177ec00d68204512055
 DIST kaccounts-providers-21.08.3.tar.xz 63488 BLAKE2B 6ba3d6d093048fd4b71210ce207788288bb753f432805dfa1ea690e2e5a864f8b52bc09c1975936f7b31ca067891574c7453e7887a757556ae7ba28d95bc3ed0 SHA512 5cfd92a8b1c57745c349b6f4ceb4d0773d94129be3ab6a96fa489737800ad76514dd35b8bfe42ac6432179ed21d2f6761fc24471dacebcf64a98dd65cd4e7a88
-EBUILD kaccounts-providers-21.04.3.ebuild 1015 BLAKE2B f9098765cb2df3fb3f956bb2e3e9d4af61a9f440d6e0e9f92b4c173a217b1035c1983d7749adcbe3e81e20a4b8f01ff875890762983501fe53cab9a9736ee0f4 SHA512 fa4b4a3e95988ae9bdbe021bfdc95e1ae33bbf45773dfafd8c1e2866c13de0016f13562203c30a3713d396fd145db27d8b7bd643c266b40d59e09799fd121dab
-EBUILD kaccounts-providers-21.08.3.ebuild 937 BLAKE2B ec72f060b7bf8e56c8dd7a6f220ace3f48dab893f52ac719a1e6fded6389e08be2076231d20737f63751a80d45fa1b803d3caf4a6c60154f4d74b7d35e021519 SHA512 9873323019c4d77af71f97def5be23a710db174bf63fd7c4201593265aea7c35bd71ab07c9a21bc1613ceaf762fe7cc097fbcd538bd0519a85187104a7e758b0
+DIST kaccounts-providers-21.11.90.tar.xz 64044 BLAKE2B e643a91cb321b966dc0ae44c9271400e7cf26e94887e1488b109807d2a483984dc3163754fad4eaa707a543f92b09be1b813faba0ca1c898c5b30056dd12e4b8 SHA512 30ccd8cfbddc91d778d303c2685fbec2f6bb8035160c8ef120e0c89fb57a8e5bd29c9efdee2731f4b00a97820d5dcc0e532bd7269c92d77129f2e17558d661ad
+EBUILD kaccounts-providers-21.08.3.ebuild 934 BLAKE2B 2c0f9a8bc3947668ff4de32dcabe56e177c175511ff3807d5d327d02734b2d02faa06872aa77fffef64a00a801502824dfe7ad7b634b6af5589654f866260fe1 SHA512 0ea24fe45fe8446f7bafc13ea0de0e3f54df2402f85446e599d1d122e1e8c3a6ef010ca0205c89552163d1c857edc45c91f7291e1140d39b0e2b04097751c3da
+EBUILD kaccounts-providers-21.11.90.ebuild 937 BLAKE2B 198f1f17daa8e57bd120884a9ed1f76f241f9e7e7a0a2b2839852e3f3d11b1e0dbc6ef7df24c4ba81a85efd5fec34c8ed00c301814b66cf5350c0f9afa6f5796 SHA512 a3232bbfa1fdeae8de6fc2e3485c602ff2fc7e71956e59ff00d7581be7f903eaddad9e78a05a934ac1476f466c81e597ba90a0f45efb88cc358e88e4dc3edd37
 MISC metadata.xml 435 BLAKE2B 7500606054feb92f23fe39021ed214b15e2e3bc434a19d70a3aecd79b2cad8cc41d0a0d59f85f75ad7503a7f41ae2e68de9a6982f88f44edef213418cff04998 SHA512 154aa6b34b5798d87b3c2f2e7c048df1a05bf1f79e84aea0ec21438a572e999fdb14a5f962af97ad803606374dc56625eae673fde563f33715c680e213180e23
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
deleted file mode 100644
index 02e5c9ee1d93..000000000000
--- a/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-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-21.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild
index 11f500fd94c0..29d90661a923 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+webengine"
 
 DEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.11.90.ebuild
index 1fd67a2841a7..9f5fb8a4fcd4 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,12 +13,9 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+webengine"
 
-BDEPEND="
-	dev-util/intltool
-"
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -35,8 +32,9 @@ RDEPEND="${DEPEND}
 	net-libs/signon-oauth2
 	net-libs/signon-ui
 "
-
-PATCHES=( "${FILESDIR}/${PN}-20.12.3-qtwebengine-optional.patch" ) # bug 753274
+BDEPEND="
+	dev-util/intltool
+"
 
 src_configure() {
 	local mycmakeargs=(