gentoo auto-resync : 02:07:2024 - 08:01:06

8 files changed, 104 insertions, 16 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b5e7e0f5276d..f031fb8bee3a 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 7d46a4d07b54..f021d050076c 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -3,5 +3,5 @@ AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19ed
 DIST akonadi-23.08.5.tar.xz 1662512 BLAKE2B 4e52e2b09e7f0376f7d63fdb590ba0372eb515b7f033d97d8fb76e1e85f9b598775936828d8c9b524807824d88cc9de93ea0efc445009e96f361f754ccd96d44 SHA512 3c1e851b519d8808b7be95b980d362eb525ec61ed06122be3795ba6b6a831aa80c77d799608686a49716a98a8bb9300e70f1c82cfe1de061cdc0af5ad9f30247
 DIST akonadi-24.05.1.tar.xz 1702864 BLAKE2B 48b339c44b8a3a160a4f9d2266f96f157ae3013bdbbc0b4f28a241a1f78ffce95e1724f4c4d47198cb8ef624dce9a78cf275a212796dc3f31f978c1d10d20b61 SHA512 acd42ec500fc12413811443d7c0b7658d2ca4b516678d98574cbfa5d5cc70a9ac164940cc81fedeaaf64301a67b4fdf477331974b71c85abc42ba750779ef575
 EBUILD akonadi-23.08.5.ebuild 3005 BLAKE2B a86f8818170abfbfb17df1f350ccb96eadcc40fe56554caddd6cd06d06c09a4dfc44fd9ba4cc298afe9323807ed25461ac53ee1b942d051c4b9284c22691b1e0 SHA512 8308c0557418a18efcabfc89e9bcc18f18f1d8c8359fe75d058dfe8afcdcb6c2223da2830ad93f3c2959a798b02468621cb9da82bb70657e884f070d6d642fd1
-EBUILD akonadi-24.05.1.ebuild 2481 BLAKE2B bdcef206ce1cf6166a2dd2acc7f86625f399bcf710a5d5bb3a4a97581e61c7b80e0875a57307d83cade36da48c5f38cde91b47e7ae82b8cc00442d30e1b1a98e SHA512 190e271c1eb731ca2214cb48a899a1825d40c9fa2b2b46b3b657c2929c07eb8c111ab20477a5d8ce6fe360198dc2c2649c5c8d222912d1a437e19426aac5aee2
-MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808
+EBUILD akonadi-24.05.1-r1.ebuild 2481 BLAKE2B 28f3bfabaf5d5b8e39bc25d150abdeec731dbce04632534f65fe29998786af68166ce29fd0fadb23da6cfc3a6a41a6a7bb44fd9f2310bef7f9153797cd75e683 SHA512 63443a80e54e44169c96cdca547eee9f050efc78550ebd62290956130f3ed41d0e212b66a2c476276867a97c4fa5a2bc2b22c1c054e27998c29f3290427d8527
+MISC metadata.xml 641 BLAKE2B 6422fb303810cfe62a1651dd24bfbf911ea1d05ac4f7e384fb4310466b9d8cb2bf491448a0c0ee4586dc747888e84cdda8fbb530f4fd3e1c59cc93f2a6ebb298 SHA512 b16c6e54455bf9d6d8dd6d587aef340fddf49d45cce6cd550322eb60e421375015a59ddd10813ab5115d3c51232c215ed9ad9b3301fb06adfaf5214070891be6
diff --git a/kde-apps/akonadi/akonadi-24.05.1.ebuild b/kde-apps/akonadi/akonadi-24.05.1-r1.ebuild
index 2807ad436d2e..0c0a8d9ddd86 100644
--- a/kde-apps/akonadi/akonadi-24.05.1.ebuild
+++ b/kde-apps/akonadi/akonadi-24.05.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 LICENSE="LGPL-2.1+"
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
+IUSE="+mysql postgres sqlite tools +webengine xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	kaccounts? (
+	webengine? (
 		kde-apps/kaccounts-integration:6
 		>=net-libs/accounts-qt-1.16_p20220803[qt6]
 	)
@@ -65,9 +65,9 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt6)
-		$(cmake_use_find_package kaccounts KAccounts6)
 		-DBUILD_TOOLS=$(usex tools)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
 		$(cmake_use_find_package xml LibXml2)
 	)
 
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index 33648cb5413d..7e0dd3b08bd9 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
 		<flag name="tools">Install tools for developers and testing</flag>
+		<flag name="webengine">Enable support for system-wide defined KAccounts</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 5f6d4fd1d699..4ed1422ba853 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,6 @@
 DIST kaccounts-integration-23.08.5.tar.xz 88544 BLAKE2B 6f21ea51c822ffde6c7d1db8f37a924009bcac16cf4e3955d86e1636d0eff7572f5fae89923c37c69ecfa7d8762c4c93ba165cf8d0cf5365ad9c683a0fdbff72 SHA512 dd959cf18dd91586b689c9fd832a2b8d62ef0630985078405b220007727bd9f773664b94d2922d1d9fd97b4e8e0f3ec1fae3a3bbbe0532241b96374045b35423
 DIST kaccounts-integration-24.05.1.tar.xz 92372 BLAKE2B 972f4c482042c3ba3d71afef1569d4c692a1e226769ed0502bb1d982900de8941fd4be01334c24bb764bfdbfce701523e19e481f2b09c528295bcf958471ec25 SHA512 62ad78c3ccce64784d2812609ec7e25e7fe64809832713eee29ea2b3fa1f41b5d69ef9a2c21ffc49c7c3abe5ec12d2dcaa075f43d4b0c1758916773a94ee18bc
 EBUILD kaccounts-integration-23.08.5.ebuild 1167 BLAKE2B fa31f0e44528cdc62c809b4407057e7738728f19f558bcb8a59e90aefbf74e1bed53d77092436baa53397a91200c0d1d52f55f599b9f3a40db042c4665c68f50 SHA512 38fb7ffd92ffa00362e719c80cadcb2877019e9e28f77b26f6539f6181dc40045ddd7c97be39aff0839ca10d35b6afc71cafc2fa048342d6846bca8e44fb4e75
+EBUILD kaccounts-integration-24.05.1-r1.ebuild 2177 BLAKE2B 48962e1438ef139fc8caa21e38257f7370acb1001f6142200fcd0bad8ec8635bacc9f8d07405aca9e2ff9699c8e59abdb6e61a41c92ee156cc8c35323867b27f SHA512 044fdfd4cce9526109db786b519d82cb8db9c7acefeb21fc55ead3aeebf99dd58d8fab40052950c8da9cfbd114bf839f6d82f881a95ed18d262ff050894ad805
 EBUILD kaccounts-integration-24.05.1.ebuild 1988 BLAKE2B 3cdecc5afe5c2f322da7607195a55baf7b70be9dd12e53dd95e6d0edb36ebb75f5e7e89509129f8a70609a7b48cae31067aa47d89a7e39f7ee5d523764253d42 SHA512 46107f95c1a89a0f24f6236fd56cb3e5be2aed502931376e302fa7c77eafd633121e1a0445020f23b31d066cd811fae23386fdcafdac019817ba77392f439a9c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-24.05.1-r1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-24.05.1-r1.ebuild
new file mode 100644
index 000000000000..b67d834279e3
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-24.05.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KF5MIN=5.115.0
+KFMIN=6.3.0
+PVCUT=$(ver_cut 1-3)
+QT5MIN=5.15.12
+QTMIN=6.6.2
+VIRTUALDBUS_TEST="true"
+inherit ecm gear.kde.org multibuild
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="qt5"
+
+# bug #549444
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=net-libs/accounts-qt-1.16_p20220803[qt5?,qt6]
+	>=net-libs/signond-8.61-r100[qt5?,qt6]
+	qt5? (
+		>=dev-qt/qtdeclarative-${QT5MIN}:5
+		>=dev-qt/qtgui-${QT5MIN}:5
+		>=dev-qt/qtwidgets-${QT5MIN}:5
+		>=kde-frameworks/kconfig-${KF5MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
+		>=kde-frameworks/kdbusaddons-${KF5MIN}:5
+		>=kde-frameworks/ki18n-${KF5MIN}:5
+		>=kde-frameworks/kio-${KF5MIN}:5
+		>=kde-frameworks/kwallet-${KF5MIN}:5
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/qcoro
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	kde-plasma/kde-cli-tools:*
+	qt5? (
+		dev-libs/qcoro5
+		>=kde-frameworks/kcmutils-${KF5MIN}:5
+	)
+"
+# KAccountsMacros.cmake needs intltool; TODO: Watch:
+# https://invent.kde.org/network/kaccounts-integration/-/merge_requests/61
+RDEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	kde-apps/signon-kwallet-extension:6
+"
+BDEPEND="sys-devel/gettext"
+PDEPEND=">=kde-apps/kaccounts-providers-${PVCUT}:6"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) default )
+}
+
+src_configure() {
+	my_src_configure() {
+		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
+			local mycmakeargs=( -DKF6_COMPAT_BUILD=ON )
+		fi
+
+		ecm_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant ecm_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant ecm_src_install
+}
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index f6e1e1db759c..08f71d4965df 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-23.08.5.tar.xz 66184 BLAKE2B 964d186ec371c089f855a40d4113fd44cd0047b5f14642a21211a0ccfadfd148ee78222d50399f6046036ec9847d684daac5a2838cea26459a988013b5cfdde2 SHA512 740a4cef4fb555add1559eddba606537b452cbb0e67b8ce0e21079dd82aa5196c3fa975a8b121e43de69ca19d2f0744ab67a7581b634b931a52ead91d74dc074
 DIST kaccounts-providers-24.05.1.tar.xz 68644 BLAKE2B 42e13b0564c22a601d66645b4d93654b5133de5a2e70d565722d7a7bc3168ab84530c2dc5fcfbd41c2c71e01218e6dbb8a3aa8b65c2e8e60559ea5d47103cfd4 SHA512 5cbc5755ba052687fcd1b24acb5f0315bd4d8d6a0b1ff6edb0d3b8960227cba047995358622be4356b6fdd70281a65387973a3e8f846b1d2f1cea6efca9533f9
 EBUILD kaccounts-providers-23.08.5.ebuild 992 BLAKE2B 39ad46d980f9282b65a940919b20bf1f7ab3548b0e9385414943ea6f84a54c36cbd35c30479954d0eaadde19520a72bb4f017f7fc73e1dfea1196fbba5066bb6 SHA512 d4c02c0e86378642712e4c74d677d722a69227ca8243d4be0c848297081882ac3faaa921b2b4dd52c65f59628914276b7e8f4514cb55c2f6819c1d8756134e1d
-EBUILD kaccounts-providers-24.05.1.ebuild 903 BLAKE2B 26b78be588825d4642de4ab2875bc07d121a23f90a34eb11045790a2aad0a495f9a339c05ad50d1301f13ff89d4411983fdc4083f092c33aa75d2b6df0e57eef SHA512 2327314948ecf22f6a21f15bc921836cce4324f89c4d50c9ab28c9d21afe6ed3e461f25060c04353dc3b3960404e934e2af6c9bbb3ff55b01df5694063f96fa3
+EBUILD kaccounts-providers-24.05.1-r1.ebuild 763 BLAKE2B 02734821975292abaf1f69427881c393763cfd6369442615be351ed3751c834decc94dd2ef770a724f6da8cfdc35346ae115fca5840976eff762d7f3b2c4af5f SHA512 67987c32e60f4775cb4476d92d6a466a16f06067cdc77e62a71f0b58421ad3982ec9fa311e412d93022a50b8bc1f19b2fe6e64fd50129780749138ddf2e54588
 MISC metadata.xml 435 BLAKE2B 7500606054feb92f23fe39021ed214b15e2e3bc434a19d70a3aecd79b2cad8cc41d0a0d59f85f75ad7503a7f41ae2e68de9a6982f88f44edef213418cff04998 SHA512 154aa6b34b5798d87b3c2f2e7c048df1a05bf1f79e84aea0ec21438a572e999fdb14a5f962af97ad803606374dc56625eae673fde563f33715c680e213180e23
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-24.05.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-24.05.1-r1.ebuild
index bc60d4fb937b..eb96e0153e26 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-24.05.1.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-24.05.1-r1.ebuild
@@ -14,27 +14,20 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE="+webengine"
+IUSE=""
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[qml]
 	>=kde-apps/kaccounts-integration-${PVCUT}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kpackage-${KFMIN}:6
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 )
 "
 RDEPEND="${DEPEND}
 	>=net-libs/signon-oauth2-0.25_p20210102[qt6]
 	>=net-libs/signon-ui-0.15_p20231016
 "
 BDEPEND="dev-util/intltool"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt6WebEngineQuick)
-	)
-	ecm_src_configure
-}