7 files changed, 172 insertions, 3 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 5fb98e715866..eb88b203a232 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/purpose-kaccounts-services/Manifest b/kde-frameworks/purpose-kaccounts-services/Manifest
new file mode 100644
index 000000000000..29234bec78e8
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/Manifest
@@ -0,0 +1,3 @@
+DIST purpose-6.5.0.tar.xz 174700 BLAKE2B 780682a8308023e40723616f3f69704fc168d4a3391194948a7345246cf0014572d0100fccb2575c11251b067c26a21f40997418bb98e35287e7c88b3454c9e2 SHA512 8f0947545c125b08ed34a36321d73ff99725e6e537ec7675f8cff0673c11b7a4570bf194da409b43c997927a844f2236ebaf07fd193f887d57e768485f41ca0b
+EBUILD purpose-kaccounts-services-6.5.0.ebuild 1564 BLAKE2B 12c6acb1bf7616fd90b45f4a19b0af98aedccac88f6468bf9cbd1b14972f33d5c2c14a4701abaf4be4ade86625cf1b313fecb587a5f6a55006c9f55458955e1a SHA512 a9e3cfcd1553430674d05a957256b858a2451ec62b6c52d18a26b3cbec0e0464e5f01ee1fe144d3d8497412de48e18d67f65c0c27ee32234168da6d6d4f36293
+MISC metadata.xml 420 BLAKE2B c5a3f6b3ddcf187d92f66657b30136c4442b3ea50e1019fe68b88be0a02ea558507ed503010e25c93579c9225559f305e2994a703d93fd43d028d9f2926d6d44 SHA512 985db02466383d3e716678190af2570e11ace4bf38a303b48b7d7eddbaed70612df601fc0cd2926708cf74ca82b2b39d62e23e27049a001fe90e6810b30f704a
diff --git a/kde-frameworks/purpose-kaccounts-services/metadata.xml b/kde-frameworks/purpose-kaccounts-services/metadata.xml
new file mode 100644
index 000000000000..ec7aae97d041
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=frameworks-purpose</bugs-to>
+		<remote-id type="kde-invent">frameworks/purpose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild
new file mode 100644
index 000000000000..11d7765f9513
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# this is purely for service file creation
+ECM_I18N="false"
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-kaccounts-services/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common frameworks.kde.org
+
+DESCRIPTION="KAccounts generated service files for nextcloud and google services"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	!<kde-frameworks/purpose-5.116.0-r2:5
+	!<kde-frameworks/purpose-6.5.0-r1:6
+"
+
+ecm-common-check_deps() {
+	return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		if(KFSLOT STREQUAL "6")
+			find_package(KAccounts6 REQUIRED)
+		else()
+			find_package(KAccounts REQUIRED)
+		endif()
+
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/nextcloud/nextcloud-upload.service.in)
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/youtube/google-youtube.service.in)
+	_EOF_
+}
+
+src_prepare() {
+	ecm-common_src_prepare
+
+	# Safety measure in case new services are added in the future
+	local known_num_of_services=2
+	local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+	if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+		eerror "Number of service files mismatch!"
+		eerror "Expected: ${known_num_of_services}"
+		eerror "Found: ${found_num_of_services}"
+		die
+	fi
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 5031082bae1e..f236ea91a488 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,6 @@
 DIST purpose-5.116.0.tar.xz 181148 BLAKE2B 9b4b267128511929fe0e81256f046552a1d70654c9a3e46ca52c2e5035003f96bf42cebf91b2ff0c19d8ca846b3dbd9106d5fd2df5dda11ec17c16bb8c419447 SHA512 3447135ad33c725e0512c6b20a9be81082737146fa0c5a32b0c7d50a21cb5697b2b4796d1cbffc8661dd845ee3ef51bc57af0c94cce0ed14cc1542df822139d5
 DIST purpose-6.5.0.tar.xz 174700 BLAKE2B 780682a8308023e40723616f3f69704fc168d4a3391194948a7345246cf0014572d0100fccb2575c11251b067c26a21f40997418bb98e35287e7c88b3454c9e2 SHA512 8f0947545c125b08ed34a36321d73ff99725e6e537ec7675f8cff0673c11b7a4570bf194da409b43c997927a844f2236ebaf07fd193f887d57e768485f41ca0b
 EBUILD purpose-5.116.0-r1.ebuild 2276 BLAKE2B 6cb0f88db90235fc25505a9dea4f790c1a4e3a80755e5f93cdc79fca736e3f0ea753ddeb34f0dd5a207139ae51d17b3268c3eab8c8b1a52d3d292da03ea85fc2 SHA512 c7c5ee67483762c788dda410b505246c3da213acb64c5d0707c483ca69d06e80d62f8bd58a0595d2d95791038be41d28ef753bc3c2e0692e55b065eb26ce259b
-EBUILD purpose-6.5.0.ebuild 1675 BLAKE2B 68e7ffe03dc7a050575848390d0841ba41b7319114c195b9929c5c2c8b956bc4b7e4413ae2b29e21e3e42bf76a65947d6ceeaf1b1628a234cfcb81f2c2df455d SHA512 c628cd197d75793c6c5f8b8efe98aeb61fb5a69608935daee0462e4a9bea8e6b878a8024ff88c869bbec4a62933ff980fca4c8fc250e068824077b7d3782c106
+EBUILD purpose-5.116.0-r2.ebuild 2142 BLAKE2B 7ddefd46a71b8f85e31c34044b43d353c16b3b52d4322ae93c740cd9573ef73f22ad130b814129df1e6880ce103d5bf69695fe4a5886dc21f5658d9857c4183d SHA512 08770b839bc7f4f1bc92c6acb820a8c42efe2bc114978591f216bfc6786e67b624cd12b5859fb74b7849ba5367868e38c04e03f76057fe27c154b3c878e1e72d
+EBUILD purpose-6.5.0-r1.ebuild 1945 BLAKE2B 60dfd538b94a172647b10d915a5ab98124166c2dd8d9687d3758b4b93fe78e372495a9be528e4d33e3db9dd18e5dcd952defc81bf352b87b3ea67f3118b87175 SHA512 434b380b6f40ca832a136bdcd51271aea6c9533cbd54e7e94c6348d423baf199bb0657419b4a13657621ddf8e50a85524383d77108b40c8ce38173d8d94e2c6f
 MISC metadata.xml 839 BLAKE2B 5ab90ccdb4c3e173a03b182fb9d7c3cac08966ad928318aad6c5e03bd4c2e16b304e55b9a121cbecde05a66f05d347a025ca7ef91ff652482772e3d66cb0431a SHA512 216fbf48978dacb6a87b283c296ad51d5478da8d5a1211cda500e755f3890417d2c5faa93f67a48202eff221951f9d0c6c90b24a9550bbf122f236f6a5713f89
diff --git a/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild
new file mode 100644
index 000000000000..e399592c8dd3
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="bluetooth kaccounts"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/prison-${PVCUT}*:5
+	kaccounts? (
+		|| (
+			kde-apps/kaccounts-integration:6[qt5]
+			kde-apps/kaccounts-integration:5
+		)
+		>=net-libs/accounts-qt-1.16_p20220803[qt5(-)]
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? (
+		kde-frameworks/purpose-kaccounts-services
+		>=net-libs/accounts-qml-0.7_p20231028[qt5(-)]
+	)
+"
+BDEPEND="kaccounts? ( dev-util/intltool )"
+
+src_prepare() {
+	ecm_src_prepare
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts KAccounts)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	# Shipped by kde-frameworks/purpose-kaccounts-services package for shared use w/ SLOT 5
+	use kaccounts && ECM_REMOVE_FROM_INSTALL=(
+		/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service
+	)
+	ecm_src_install
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/purpose/purpose-6.5.0.ebuild b/kde-frameworks/purpose/purpose-6.5.0-r1.ebuild
index 601eaf910a3c..3addb28b15b1 100644
--- a/kde-frameworks/purpose/purpose-6.5.0.ebuild
+++ b/kde-frameworks/purpose/purpose-6.5.0-r1.ebuild
@@ -35,10 +35,12 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 	>=kde-frameworks/kdeclarative-${PVCUT}:6
 	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 )
-	webengine? ( >=net-libs/accounts-qml-0.7_p20231028[qt6] )
+	webengine? (
+		>=kde-frameworks/purpose-kaccounts-services-${PVCUT}
+		>=net-libs/accounts-qml-0.7_p20231028[qt6]
+	)
 "
 BDEPEND="webengine? ( dev-util/intltool )"
 
@@ -57,6 +59,14 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_install() {
+	# Shipped by kde-frameworks/purpose-kaccounts-services package for shared use w/ SLOT 5
+	use webengine && ECM_REMOVE_FROM_INSTALL=(
+		/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service
+	)
+	ecm_src_install
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "Send through KDE Connect" kde-misc/kdeconnect