gentoo auto-resync : 23:12:2023 - 19:46:41

4 files changed, 25 insertions, 6 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 8b10ade9fb10..743fb122ab47 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,8 +1,9 @@
-AUX kio-extras-24.01.80-no-activities.patch 1571 BLAKE2B 4337722f2fe40fd62c891769a51cf9f876a6178b0f5e214c33a02ad996d781ed9c028cd8cf597d82b69c008a770be0954343165a6454827dd7da101bbf619b3e SHA512 d13e7eeae8fcd138f3e0445ba4a0f741f82362d45dd0e8334d8cc917f7ca3e327a6b81297984ef30f6c234c4d3d2a8620e582e77316bb8f190b7922d9d99d0a1
+AUX kio-extras-24.01.85-activities-optional.patch 1571 BLAKE2B 4337722f2fe40fd62c891769a51cf9f876a6178b0f5e214c33a02ad996d781ed9c028cd8cf597d82b69c008a770be0954343165a6454827dd7da101bbf619b3e SHA512 d13e7eeae8fcd138f3e0445ba4a0f741f82362d45dd0e8334d8cc917f7ca3e327a6b81297984ef30f6c234c4d3d2a8620e582e77316bb8f190b7922d9d99d0a1
 DIST kio-extras-23.08.3.tar.xz 1489156 BLAKE2B 6ad66a1658ac2ad8a5b88ca5f7c66cb3fd5dfbcee9baa49feeea185eb935121a7e51035f539e84c79af066fb50c68cba850eeefaf0f99a65d457a06e1f46fe9d SHA512 dac80cce3e47a6b0686feae297cf6707bbbb2ede0930d2636a4c93b43610beea391148df92ba381fec3ba8b8eed279de19ad5315b3aa989436b0bc8e6937e680
 DIST kio-extras-23.08.4.tar.xz 1490584 BLAKE2B f38b87c9934a2d8f7862131d6ad8200035cdd55696918e1e8164e7811907a17ae583f392856fb4e709a2a09dcb560fb40c08d2485caed12331da9068bc3b3932 SHA512 ac2be6e745121962e13fe952d746281fa45778b6d491b001b9ea7a65caedfd5d6354ee75537fde0bf174638d248eb8796db6710830641149dcf35544048cfe27
 DIST kio-extras-24.01.85.tar.xz 3552164 BLAKE2B 23fcf051f47c3dc1a29923c535552201967cc213a137a70749d70bed5454e98526fcbfa1fabc89aab2f854ce84c5c18618dec8bfb0bd70187deaa53f2a5dcf39 SHA512 f0564fbd1be10f635f3e4374057f17a285fca2674592f338ed1af324710358501ef4949a79e0112e68d18636d99fccf59dfd4b7886e6827786080f9947283027
 EBUILD kio-extras-23.08.3.ebuild 2798 BLAKE2B e137158c8eed073fa0b4b441b3ad91c8d707f5cc667303829b26e630cf97e3d568dce6b6e69edeb38d3a92cac40082b6da486570ef8d19a6066641c40b70f4f5 SHA512 223e73e605103fb3bbac5c17c6858a0c6aa4f5f2232353eceab0e65b7c8b3b8c0cc48809e4fd0d44fb6eae05498adb8887d7657c6c693629eeade91164bf1bd0
 EBUILD kio-extras-23.08.4.ebuild 2801 BLAKE2B 3112d09ea49d38bf60f58a2533c1ce1b27df286aedf3303fdea1eda100b5daccee4a1050144332c18f10341846ca768165ba054bc9000655a1982f335c2e8dc2 SHA512 cce96a436f8227ce4e3167989704689f098e820a33ceeb912e71bbeacf7f3ce24bc521656c265c45bffbd7f4787373c26c7c1af58cf46fb06ef4d8697675616d
-EBUILD kio-extras-24.01.85.ebuild 2770 BLAKE2B 88ed52bfc5cee0d5c9b8ab2c4c09e3758e92cf97b22bce3f6d926f825c1ecaad5adf08ff9b8372bb309ede3a3d2f0977d2fee621e7ca433925f41e5c449bb10a SHA512 4c7377b8fc3ba9dccfb2288eb0856ff687cabc11a166b87873d5399ff850e378b54cda9b21039f88a121b92e271a9ebbe3dc4d6c747efc957a484d2e2d084418
+EBUILD kio-extras-23.08.5-r100.ebuild 335 BLAKE2B 2a045ff2eea1f82f38b7f847dcd0abcaacd0efd8b552be4bcfcce79f82f6178391a0aa992c4518721d13561c3bd2681b2f482c7ad7236b70e01edb6be1badad2 SHA512 31fe0220f1775734db5eb9bd5de46d4e900290740b1c0ce8bfc83e790250338790ad1e565d7a8d9e625612fd87560785e20204c28fe5f26ef190d5bac5b1d4a9
+EBUILD kio-extras-24.01.85.ebuild 2930 BLAKE2B ca6d59ecbb915a3ade9c56701573f068a5853d3125b84d1ebb536143576061aca8d99eb6e7e2ed0b69284f58bc46bc06d6748eeae87d7fc714fccd21ef8b55fd SHA512 c9c450ea4a0f005ffa1f7a8330d164cb82bfea078e01eb26d7ed9e20f842d233d695b92e15e9bf92714e3ab3782172bbabbcf610b43163740e9113fe44d8e632
 MISC metadata.xml 1126 BLAKE2B c0d81be1cdef0408907a5edd4475a80e1cdb5d34b64841f9f77dee91b1aac70cceab2e69a598761553bb4d39f8872bee51ccc6682d83148fc07f5ea354551f97 SHA512 a8819b4e309dbed0a35d0879de8e1b5342e8c6a1626bd9278f4ed274d714b491f3e1f6a58e291fed17e98cee3e4a6c12ddd429e4a9bd33ab9d125f7dfddde2a8
diff --git a/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch b/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch
index 73ce35a37188..73ce35a37188 100644
--- a/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch
+++ b/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch
diff --git a/kde-apps/kio-extras/kio-extras-23.08.5-r100.ebuild b/kde-apps/kio-extras/kio-extras-23.08.5-r100.ebuild
new file mode 100644
index 000000000000..d97f688ef147
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-23.08.5-r100.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shim kio-extras to divert slot 5 users to kio-extras-kf5"
+HOMEPAGE="https://invent.kde.org/network/kio-extras/-/tree/kf5"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64"
+
+RDEPEND="kde-apps/kio-extras-kf5:5"
diff --git a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild b/kde-apps/kio-extras/kio-extras-24.01.85.ebuild
index a82cf978fa4c..fe471ef1aa7c 100644
--- a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild
+++ b/kde-apps/kio-extras/kio-extras-24.01.85.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE="ios +man mtp openexr phonon +sftp taglib X"
+IUSE="activities ios +man mtp openexr phonon +sftp taglib X"
 # TODO: activities: collides with Plasma-5, plus:
 # https://invent.kde.org/network/kio-extras/-/merge_requests/320
 # TODO: samba (net-libs/kdsoap packaging issue w/ upstream)
@@ -47,6 +47,11 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/solid-${KFMIN}:6
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	activities? (
+		>=dev-qt/qtbase-${QTMIN}:6[sql]
+		kde-plasma/plasma-activities:6
+		kde-plasma/plasma-activities-stats:6
+	)
 	ios? (
 		app-pda/libimobiledevice:=
 		app-pda/libplist:=
@@ -68,18 +73,18 @@ DEPEND="
 # 		>=net-libs/kdsoap-ws-discovery-client-0.3.0
 # 	)
 RDEPEND="${DEPEND}
-	!kde-apps/kio-extras:5
+	!<kde-apps/kio-extras-23.08.5-r100:5
 	!kde-apps/kio-extras-kf5:5[-kf6compat]
 	!kde-frameworks/kio:5[-kf6compat(-)]
 	>=kde-frameworks/kded-${KFMIN}:6
 "
 BDEPEND="man? ( dev-util/gperf )"
 
-PATCHES=( "${FILESDIR}/${PN}-24.01.80-no-activities.patch" )
+PATCHES=( "${FILESDIR}/${P}-activities-optional.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_ACTIVITIES=OFF
+		-DBUILD_ACTIVITIES=$(usex activities)
 		$(cmake_use_find_package ios IMobileDevice)
 		$(cmake_use_find_package ios PList)
 		$(cmake_use_find_package man Gperf)