gentoo auto-resync : 12:01:2024 - 01:06:32

6 files changed, 16 insertions, 14 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 7a51d0dd55e0..c7aae8ba4ac1 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kio-extras-kf5/Manifest b/kde-apps/kio-extras-kf5/Manifest
index b7b8ebd1a01d..971be4caa2d6 100644
--- a/kde-apps/kio-extras-kf5/Manifest
+++ b/kde-apps/kio-extras-kf5/Manifest
@@ -1,3 +1,3 @@
 DIST kio-extras-kf5-24.01.90.tar.xz 1466180 BLAKE2B 0de557b4d007205a0718610e7f37066637de377083eb632af0a4c540c4a920ba62d692b8abc07919c0449cde6ecf29e9642caa743169423ca5330dc651115f76 SHA512 cf64766340e7a6d947493094bed74aa44eb3d6459478661b0b273954b4f0f647d147880558ffdf363a8e838ca7f8a8678ff024bab432aeac12f370d71b2ef922
-EBUILD kio-extras-kf5-24.01.90.ebuild 2837 BLAKE2B 4c21220f5e74650b316ab94eb997fd091152a5076423cde945fa08a5bdf75ea9350cc25ea173f7683898d5fee17a34fef95576eb7054fbcf6896e9858480ad21 SHA512 eb05188455a0ece3bf10af014f79791e94c16636f1d5127765d8831de64ddbf39eda5e8a83f58d20031564d181aad2a5eb32909703b0fa600f7b8d50ff7d31ad
+EBUILD kio-extras-kf5-24.01.90.ebuild 2868 BLAKE2B 0f870bb97e4b96f09777519799f6f0192812f1d5813c4627ada35639c6e6ee621389e96f43534d6a21050bf924a6cf5e763eac15b9b65167f1ee54a1e7f8f48f SHA512 2d6d778bea13c8e8bae423bb410d0bacc2d836d37d9cbe1dd36f5123d8404020d5037e8eed30465d93c8622df22b743165b13a44900ba5879fcf2a24f8575888
 MISC metadata.xml 1230 BLAKE2B 9b567eac809ae4520744b33f1bac2230e14e8666b7d12be0dab5b99a750626ff6f87b93f15c3ebfded9ca0540b6244105ec5531aa61778e052fe9610130f3a17 SHA512 60f5c4fe5c342680b50d3c8796142d41477468edab3aeb7b45f8e4d8ae932d2ee781bb49034272ca1d726031ab14c73fa137541318dcefd62f28aeba271c4295
diff --git a/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.90.ebuild b/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.90.ebuild
index e6245623a940..acb19adb061b 100644
--- a/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.90.ebuild
+++ b/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.90.ebuild
@@ -59,7 +59,10 @@ DEPEND="
 	nfs? ( net-libs/libtirpc:= )
 	openexr? ( media-libs/openexr:= )
 	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-	samba? ( net-fs/samba[client] )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap:=[qt5(+)]
+	)
 	sftp? ( net-libs/libssh:=[sftp] )
 	taglib? ( >=media-libs/taglib-1.11.1 )
 	X? (
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 55a3625a2484..4ff8f51a21d3 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,6 @@
 DIST kio-extras-23.08.4.tar.xz 1490584 BLAKE2B f38b87c9934a2d8f7862131d6ad8200035cdd55696918e1e8164e7811907a17ae583f392856fb4e709a2a09dcb560fb40c08d2485caed12331da9068bc3b3932 SHA512 ac2be6e745121962e13fe952d746281fa45778b6d491b001b9ea7a65caedfd5d6354ee75537fde0bf174638d248eb8796db6710830641149dcf35544048cfe27
 DIST kio-extras-24.01.90.tar.xz 3552416 BLAKE2B be9ceb907df17d2494170d120b89744900b90fc079438350f631176de227ff654eda4a18a680e0e2426c32efcb2bd6f1373e70040cefd7dd00d99f8a901abea0 SHA512 cfd17fb1164c8f6a9e9ba67bb8dd90b6c744ce1ece115dcac83caed9854f26706a42d62fad4fcb9988f81cce8319b6fccda1c1052ab41376c88beb7df3929567
-EBUILD kio-extras-23.08.4.ebuild 2798 BLAKE2B a6d9ea9dd6d0e86a7125dd816bfcfe46a95590d92654e688a9488fcd519c38e9ba689141b0e051fb52d67a6502b32cf78b2e5072bde32867eddbae1010ce0362 SHA512 9bde827586747fc448ccce00d7fc4b95fb14e3fe8108ddf175b6a5408856fd98d5df55a2e28e7f844d94b2517f8480a8d08fd03acd4b7f78faee538ae28bae4e
+EBUILD kio-extras-23.08.4-r1.ebuild 2813 BLAKE2B 502406e0c89b14dee76d18056c676675f7936372799214c4744ee14041085f8a437d79a4f5e36d7e479e6008441a6d0fb4357efe45cc2c1bb1f2e21fa676e20b SHA512 96cafb5b54a01691121e520606a56f539930c040ae40beea329b73ef92abe14ccb6b3d195973f237ec238cf38ff40f4f19ee0196ae282f8e5f8d3f8a57a77c78
 EBUILD kio-extras-23.08.5-r100.ebuild 335 BLAKE2B 2a045ff2eea1f82f38b7f847dcd0abcaacd0efd8b552be4bcfcce79f82f6178391a0aa992c4518721d13561c3bd2681b2f482c7ad7236b70e01edb6be1badad2 SHA512 31fe0220f1775734db5eb9bd5de46d4e900290740b1c0ce8bfc83e790250338790ad1e565d7a8d9e625612fd87560785e20204c28fe5f26ef190d5bac5b1d4a9
-EBUILD kio-extras-24.01.90.ebuild 2757 BLAKE2B befbeefb7cbfc59c12054ef8da7a7d281c4459ae81d430df6a38e88936bc6c8a1616c064f95741cd84ef8b6aa8c0fd134998c334432eaff6ce8cef39dd200e6a SHA512 dc1a0530adba3f7855419a3fe8c2faf2934e56c7880be7811105ecf09806ed62c723a120466cd0ce9cf2cc496f06008cbd25851c1abe477904f9b4a169c28f90
+EBUILD kio-extras-24.01.90.ebuild 2695 BLAKE2B b0a1be9841215322184982a53eef4cab20a8a32a933cbe28855fa0ef09b917b4d2fc54ddc04dfa715642e5c28729195e135a5c5bf535710681f7827f16a02ceb SHA512 7a6ffe5db25761c02521613bc87dcad846825cdb2ab96491fa0425a215b8a9ac797de5b191ee9b2ca46469a308eb0e9fc27c38713d0003735952417f986c4499
 MISC metadata.xml 1126 BLAKE2B c0d81be1cdef0408907a5edd4475a80e1cdb5d34b64841f9f77dee91b1aac70cceab2e69a598761553bb4d39f8872bee51ccc6682d83148fc07f5ea354551f97 SHA512 a8819b4e309dbed0a35d0879de8e1b5342e8c6a1626bd9278f4ed274d714b491f3e1f6a58e291fed17e98cee3e4a6c12ddd429e4a9bd33ab9d125f7dfddde2a8
diff --git a/kde-apps/kio-extras/kio-extras-23.08.4.ebuild b/kde-apps/kio-extras/kio-extras-23.08.4-r1.ebuild
index bfdd09beddd1..4d748c4d8215 100644
--- a/kde-apps/kio-extras/kio-extras-23.08.4.ebuild
+++ b/kde-apps/kio-extras/kio-extras-23.08.4-r1.ebuild
@@ -59,8 +59,8 @@ DEPEND="
 	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
 	samba? (
 		net-fs/samba[client]
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
+		net-libs/kdsoap:=[qt5(+)]
+		<net-libs/kdsoap-ws-discovery-client-0.3.0
 	)
 	sftp? ( net-libs/libssh:=[sftp] )
 	taglib? ( >=media-libs/taglib-1.11.1 )
diff --git a/kde-apps/kio-extras/kio-extras-24.01.90.ebuild b/kde-apps/kio-extras/kio-extras-24.01.90.ebuild
index de423f025f84..fa14db52c28b 100644
--- a/kde-apps/kio-extras/kio-extras-24.01.90.ebuild
+++ b/kde-apps/kio-extras/kio-extras-24.01.90.ebuild
@@ -15,8 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE="activities ios +man mtp openexr phonon +sftp taglib X"
-# TODO: samba (net-libs/kdsoap packaging issue w/ upstream)
+IUSE="activities ios +man mtp openexr phonon samba +sftp taglib X"
 # disabled upstream: nfs
 
 # requires running Plasma environment
@@ -57,6 +56,11 @@ DEPEND="
 	mtp? ( >=media-libs/libmtp-1.1.16:= )
 	openexr? ( media-libs/openexr:= )
 	phonon? ( >=media-libs/phonon-4.12.0[qt6] )
+	samba? (
+		net-fs/samba[client]
+		>=net-libs/kdsoap-2.2.0:=[qt6]
+		>=net-libs/kdsoap-ws-discovery-client-0.3.0
+	)
 	sftp? ( net-libs/libssh:=[sftp] )
 	taglib? ( >=media-libs/taglib-1.11.1 )
 	X? (
@@ -65,11 +69,6 @@ DEPEND="
 	)
 "
 # 	nfs? ( net-libs/libtirpc:= )
-# 	samba? (
-# 		net-fs/samba[client]
-# 		>=net-libs/kdsoap-2.1.1-r1:=
-# 		>=net-libs/kdsoap-ws-discovery-client-0.3.0
-# 	)
 RDEPEND="${DEPEND}
 	!<kde-apps/kio-extras-23.08.5-r100:5
 	!kde-apps/kio-extras-kf5:5[-kf6compat]
@@ -88,7 +87,7 @@ src_configure() {
 # 		$(cmake_use_find_package nfs TIRPC)
 		$(cmake_use_find_package openexr OpenEXR)
 		$(cmake_use_find_package phonon Phonon4Qt6)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Samba=ON
+		$(cmake_use_find_package samba Samba)
 		$(cmake_use_find_package sftp libssh)
 		$(cmake_use_find_package taglib Taglib)
 		-DWITHOUT_X11=$(usex !X)