gentoo auto-resync : 22:08:2024 - 12:26:19

7 files changed, 108 insertions, 19 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8d9c99768728..8737e1de8920 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kio-gdrive-common/Manifest b/kde-misc/kio-gdrive-common/Manifest
new file mode 100644
index 000000000000..a7f40b45677b
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/Manifest
@@ -0,0 +1,3 @@
+DIST kio-gdrive-24.05.2.tar.xz 80828 BLAKE2B 2e5bd00895028969663ded3fe54ba077c4ec714e9dabda86d6b10ed7ab6407bac7e23438b137ad8a8dda88de00187904555a825e7bb5414d62232ced5d081ae8 SHA512 c6da9037e58e679d03bcf7a2899448ed05e81ae7337ede43f76ba2589800731a80aa0bef21468790308cd36428d43f1cb0ef17221a875f5b25065f5b9e732a2b
+EBUILD kio-gdrive-common-24.05.2.ebuild 1430 BLAKE2B 483d9b4a1b4805ffc602a24443c81e8616f523447318b0aadd9d836b869ab03990d8c51c600399bf807520d55500d4c7bd34dd365bcdac1fb016fb40550ffa24 SHA512 6ad53c3494f043d949dcfb082863ab9eee2978de3d5e1c62b2ae7ce0ef5c19d818bf62c2563c73e8a7819678e350a2e52230a833826e9776e498c8fdde3c11b0
+MISC metadata.xml 412 BLAKE2B 598ab8a203f4aec565ab91e91688fe89590c31c95d8c81a5fedbf0f87ad69b9fb8c68732c83d49b01815e611ac69b01060d2f800aa9f5c4b1086dee6c43d0c17 SHA512 7e1f8840fc29325c96079d530e5c7f2db3d132ef46941924a089112737d5226525d9aa46db27d763f6a70ad37923c0c6a3d053abccfda68af053884a4d5df87d
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
new file mode 100644
index 000000000000..732c572a03e6
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	!<kde-misc/kio-gdrive-23.08.5-r2:5
+	!<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+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}/kaccounts/google-drive.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=1
+	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-misc/kio-gdrive-common/metadata.xml b/kde-misc/kio-gdrive-common/metadata.xml
new file mode 100644
index 000000000000..676893a6308e
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/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=kio-gdrive</bugs-to>
+		<remote-id type="kde-invent">network/kio-gdrive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index b53524c50620..c08d5a1239c6 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,7 +1,7 @@
 AUX kio-gdrive-23.08.5-kaccounts-integration-24.02.patch 1753 BLAKE2B 113b3a8eb53fee9264ac1595a78e881b867a21e2c55a52bd016158943e1f285035076d61640d210c5c63f217b41be60c94fe5931951e85333adfe31b549b44d7 SHA512 5c3596d413b90ca80135b435c2ad04571b226416c8728080b0cc4faaa2d1b52cc5825b7335135a7c177ce582cdc47d2bc45cf4d82636886f54955a99efe4a429
 DIST kio-gdrive-23.08.5.tar.xz 79452 BLAKE2B 7fab730a2781a0cf534beda35a48a2663cdd9e067759991e277775d1d5a492596cbdf9b3427e67da0d10415bf717ba46dd0d3d11c143de3733065e836b4fb345 SHA512 9535e64997b026aa6a5b6a092986486f726151948614f76c1f044e9fab6c0651f861776e928613a757c656fdd12cbba529dd63d04e1f58d5a43966b8d9d448c8
 DIST kio-gdrive-24.05.2.tar.xz 80828 BLAKE2B 2e5bd00895028969663ded3fe54ba077c4ec714e9dabda86d6b10ed7ab6407bac7e23438b137ad8a8dda88de00187904555a825e7bb5414d62232ced5d081ae8 SHA512 c6da9037e58e679d03bcf7a2899448ed05e81ae7337ede43f76ba2589800731a80aa0bef21468790308cd36428d43f1cb0ef17221a875f5b25065f5b9e732a2b
-EBUILD kio-gdrive-23.08.5-r1.ebuild 1584 BLAKE2B f5b597ed23fc6033c6ea68a45577a9e0d9aa9604f1684fdd5fdf2e2bac7fc572a51ac36c08abd25a2dafde57b346d5e2273b59d5244a642892a2e33be2891770 SHA512 db7562666331352a754ae0c62d645d580ed91e80fa9bda0fc6d2b2e8f3396475f08243a1d0db88202a7e3603b8973a5abc3bb53587972840a235cb965406c535
+EBUILD kio-gdrive-23.08.5-r2.ebuild 1620 BLAKE2B 9cfd67c542879ff788e4768fd518f034a7844eacf3f50b6290f8b1702f73d742bb092aae57ffbd390dba0b01d345e41c56842330c5f14ba4474595db0cb87a2c SHA512 eadb92fbeba31cd99596fa452c812b6e3ab69909408e6149bebadc2fd4bc0229c3328001681b1c379ec9224a263470b922fc133d1a6621674536291e259b6e2f
 EBUILD kio-gdrive-23.08.5.ebuild 1063 BLAKE2B 115923bdc01ad33f1e81a911806c2e466d0de1cd36a718ca2bde741fd05d9a1396aa69151b1baf72f064d20a0396bd240a98173cdb4be08d4544626f7e59f62f SHA512 3b6c09cca249fe994a5b1e00e9807f84bfbe1b1a74be44bd1d898fc0009ed7773e816d1a155f98ccc8030dd290a4cab895e0e3d0969e4b2b32d7564a33ebcd39
-EBUILD kio-gdrive-24.05.2.ebuild 1029 BLAKE2B 4574a2195f49f2343abd270b15f4a394e3b6d17efcd309a38ee5fb069ce10f5c4ce063ce2529af5e8045334e09d419fd3b55a4b4301a91a78fcfd209d150008c SHA512 44c81d21c0d2f2591efb07d79da25ef6d37356bb1bfedac1c78f844bfc67b932d9b79440f74c5bbd7215c446870ebc716c698358e102a5bd1ca969d0867cdb97
+EBUILD kio-gdrive-24.05.2-r1.ebuild 1312 BLAKE2B a78b39c1fe9b010519767675b57e6112ace7efcd524f0c887e8fdd10cc16ee70c2e7717446626e821f6b343191efaa3c2208b326ce3ec694621bd20eb6058948 SHA512 ee8fa98e80884ce8232b63ece680bb3779ec8ad58c191548b4d0cbc52314e3f961cc53bf0dfcb7daa15bcd285fd41e651a7594e6be0f612f051b26b27e148770
 MISC metadata.xml 631 BLAKE2B a189fc3947f714e74b8c8537c6956dd9e6b77548617cdf1121815710a693b7aac736048b7963abaac15c128f2ecb60ea518dcf701c94dbd656dffac01acc19fb SHA512 f676fb95a4a01bf885f507d9733dcfe37d34c83a03674c18b54ebbafc96511734a63df23634e2466bca60b00bcb7ef640f8fa2228dbd3c5f4edd0281d6c40547
diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild
index f0e25f566bb1..629c3fcbffcc 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="optional"
 KDE_ORG_CATEGORY="network"
 KFMIN=5.106.0
@@ -21,7 +21,10 @@ IUSE="kf6compat +share"
 COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/kaccounts-integration:6[qt5]
+	|| (
+		kde-apps/kaccounts-integration:6[qt5]
+		>=kde-apps/kaccounts-integration-23.08:5
+	)
 	kde-apps/libkgapi:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -34,13 +37,25 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	kde-apps/kaccounts-providers:*
-	kf6compat? ( kde-misc/kio-gdrive:6 )
+	${CATEGORY}/${PN}-common
 "
 BDEPEND="dev-util/intltool"
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" )
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/accounts/services/kde/google-drive.service
+	/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml
+	/usr/share/remoteview/gdrive-network.desktop
+)
+
+src_prepare() {
+	if has_version -b "kde-apps/kaccounts-integration:6[qt5]"; then
+		PATCHES+=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" )
+	fi
+	ecm_src_prepare
+	ecm_punt_po_install
+}
 
 src_configure() {
 	local mycmakeargs=(
@@ -52,16 +67,7 @@ src_configure() {
 src_install() {
 	ecm_src_install
 
-	if use kf6compat; then
-		rm "${D}"/usr/share/accounts/services/kde/google-drive.service \
-			"${D}"/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml \
-			"${D}"/usr/share/remoteview/gdrive-network.desktop || die
-		if use handbook; then
-			rm -r "${D}"/usr/share/help || die
-		fi
-		if use share; then
-			rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
-		fi
-		rm -r "${D}"/usr/share/locale || die
+	if use kf6compat && use share; then
+		rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
 	fi
 }
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.05.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild
index 6afd296e86de..d34f7c76abe7 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-24.05.2.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="network"
 KFMIN=6.3.0
@@ -32,13 +32,25 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtbase-${QTMIN}:6[network]
 "
 RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 	kde-apps/kaccounts-providers:6
+	>=kde-misc/${PN}-common-${PV}
+	share? ( !${CATEGORY}/${PN}:5[share,-kf6compat(-)] )
 "
 BDEPEND="dev-util/intltool"
 
 DOCS=( README.md )
 
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/accounts/services/kde/google-drive.service
+	/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml
+	/usr/share/remoteview/gdrive-network.desktop
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package share KF6Purpose)