gentoo auto-resync : 31:08:2024 - 12:01:05

8 files changed, 165 insertions, 45 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 777e0328c32d..0787f719ded3 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 8b0167aa4499..8c9dd23283e4 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -2,6 +2,7 @@ DIST kio-extras-24.05.2.tar.xz 3468452 BLAKE2B 396a057299bf48357083321c30c5ca1d3
 DIST kio-extras-24.08.0.tar.xz 3474308 BLAKE2B 508063a9bc6071974e6699e8ca8eee66e5d291917462bcb4e8f58c77137e41cdedcef99206314f318e4da8d95d33d18e689fc0c225729bc1bf54807a178ab925 SHA512 82952feaf739d27b54ed59b7051fc1dfe17668dbfcb1330cbd72553b3aef244155de49ec8919c947a3e2e7074ea84a125ccb4111d05b3aa4e9b4b135979425cf
 DIST kio-extras-kf5-24.02.2.tar.xz 1468060 BLAKE2B a578cebef92e2531e7a1565109470585022ad740220d7cf11547c50e4f2cd4b0336619b76cdfb4cfa07c3c6a5db5e421d89f5e2caaa11d60dffd17047bd96304 SHA512 b8bb00d59d4f84d58ea22bdda6dccd5151a7e48f788fe8827ca9576cf7e287b91c08ebb77b76cd93007593f4d9f0210d75ef551a92e8448796b83b5ffd37255a
 EBUILD kio-extras-24.02.2-r1.ebuild 2843 BLAKE2B 41c52978899290cea78d185ed3d43c8f625d9d7685960f08842c42352bd2099a4118a7401af417756760ec9d90182d90539baea8015874a26605e32d6ccb8a22 SHA512 b59969562ac66cda1c827a96b95e3ea518941f3f61c6bd4abbbce53c2876106cf85a499e20d74262d7086068496247c49ecb3879798d65c5d205df7f80d258cb
-EBUILD kio-extras-24.05.2.ebuild 2621 BLAKE2B 4b8996473ccde4c906790b2d163ddba68036bbc991f4cf5a2cefcdad7b6ed44df7300b2969af68fe39e8debe1b3be9bfc20b48baab45e449ad1062217364ff9f SHA512 ac8ac80b818084ff4f9b63658c61bfe7b5f8ffd3e507602374c4d913d499d32c1920596737eb1bb2b806f2318c7fe99b8fe0915f6aa40c0b21e2d1ff414b8e4b
-EBUILD kio-extras-24.08.0.ebuild 2621 BLAKE2B 13169e296f32cc75583319ff37fd4582a59abbb5fa9be597770db88bbd0b131061eeed6b76709734794f3dcb1d6a5a80086650004ec820280d96078ec1e80b24 SHA512 e3d3f2ab30615c2e20a5a1b442bfed9f249832d4ef4564d9dd923b24e210e1632be4fb072cc2ebd5b9ce2c270707ce70a70bf6b125abaf0c132de36a793e856f
+EBUILD kio-extras-24.02.2-r2.ebuild 2846 BLAKE2B 3e66cd94eebd4fc6d585f1aaee8e57eda1d9bae55b2f089061b5d81aded683a340a4b331c7d2bfd327354fd851781403093eae400a55aefbde37d84e9b9d9fde SHA512 5a9697a98883403e826f506f96c5e8e57a3aea3590484b4df9e56899ef9abc8656f77cf791264a4e13f12eb6dcad6d4a6ec3f686f09b4f32a1d1924efceea838
+EBUILD kio-extras-24.05.2-r1.ebuild 2648 BLAKE2B abb39daec273af3593605df337e2f779f25f6d1c918ed8ed2575b2443395afac9c887d0050c200f25884030a3c6b70c2814b7a80ef4ac61b22e9e2daaf3f666a SHA512 3ea5a75d80c6d0fe0ffb07eadf12d296b2ac62b8214b8b88ad4ae5e9dd6864ac772c66fa672db9a746b91fd22801f898c30b26b695b079ee58efb152d195ff8e
+EBUILD kio-extras-24.08.0-r1.ebuild 2648 BLAKE2B 67bacf0f8cdb32b8d0541e7877f9bd38275830ed28d2aa2a64505ae76cac28b133bde800295c071c68fa06da186bc3f04e4a5b6d19e86ffa09cbff9a26bcf4b6 SHA512 5f62e64298d6e0262ab9910fe34bda3ecd8f28fffcdb337b4121d24da236ffc81e3d86135d02ad9d4893e13e6d47ab3dbde2460f134039b97b64851a4cecb67b
 MISC metadata.xml 1230 BLAKE2B 9b567eac809ae4520744b33f1bac2230e14e8666b7d12be0dab5b99a750626ff6f87b93f15c3ebfded9ca0540b6244105ec5531aa61778e052fe9610130f3a17 SHA512 60f5c4fe5c342680b50d3c8796142d41477468edab3aeb7b45f8e4d8ae932d2ee781bb49034272ca1d726031ab14c73fa137541318dcefd62f28aeba271c4295
diff --git a/kde-apps/kio-extras/kio-extras-24.02.2-r2.ebuild b/kde-apps/kio-extras/kio-extras-24.02.2-r2.ebuild
new file mode 100644
index 000000000000..a25aa1d5f591
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-24.02.2-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KDE_ORG_TAR_PN="kio-extras-kf5"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras/-/tree/kf5"
+EGIT_BRANCH="kf5"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="activities ios kf6compat +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	kde-apps/libkexiv2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-plasma/plasma-activities-${KFMIN}:5
+		>=kde-plasma/plasma-activities-stats-${KFMIN}:5
+	)
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	nfs? ( net-libs/libtirpc:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap:=[qt5(+)]
+	)
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kio-extras-kf5:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	kf6compat? ( kde-apps/kio-extras:6 )
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Libmtp)
+		$(cmake_use_find_package nfs TIRPC)
+		-DKF6_COMPAT_BUILD=$(usex kf6compat)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
+		-DWITHOUT_X11=$(usex !X)
+	)
+
+	use samba && mycmakeargs+=(
+		# do not attempt to find now Qt6-based system version
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDSoapWSDiscoveryClient=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kio-extras/kio-extras-24.05.2.ebuild b/kde-apps/kio-extras/kio-extras-24.05.2-r1.ebuild
index d6afb2b48687..959f12b6bf5f 100644
--- a/kde-apps/kio-extras/kio-extras-24.05.2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-24.05.2-r1.ebuild
@@ -69,8 +69,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kio-extras:5[-kf6compat(-)]
-	!kde-apps/kio-extras-kf5:5[-kf6compat]
-	!kde-frameworks/kio:5[-kf6compat(-)]
+	!kde-apps/kio-extras-kf5:5
+	!<kde-frameworks/kio-5.116.0-r2:5
+	!kde-frameworks/kio-trash-desktop-file:5
 	>=kde-frameworks/kded-${KFMIN}:6
 "
 BDEPEND="man? ( dev-util/gperf )"
diff --git a/kde-apps/kio-extras/kio-extras-24.08.0.ebuild b/kde-apps/kio-extras/kio-extras-24.08.0-r1.ebuild
index 6e535d02aa5f..b907daec37f3 100644
--- a/kde-apps/kio-extras/kio-extras-24.08.0.ebuild
+++ b/kde-apps/kio-extras/kio-extras-24.08.0-r1.ebuild
@@ -69,8 +69,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kio-extras:5[-kf6compat(-)]
-	!kde-apps/kio-extras-kf5:5[-kf6compat]
-	!kde-frameworks/kio:5[-kf6compat(-)]
+	!kde-apps/kio-extras-kf5:5
+	!<kde-frameworks/kio-5.116.0-r2:5
+	!kde-frameworks/kio-trash-desktop-file:5
 	>=kde-frameworks/kded-${KFMIN}:6
 "
 BDEPEND="man? ( dev-util/gperf )"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 6442c24e8719..da413293d6fa 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -2,7 +2,7 @@ DIST libkgapi-23.08.5.tar.xz 335116 BLAKE2B 0d2c4515efa9a8adf9388b6447bef3d06887
 DIST libkgapi-24.05.2.tar.xz 339032 BLAKE2B 5fc1b454bdae7b613ccfc7a5158944c0a7ee0e2d7e1c1c76e2b49abdc3090b67ecd0df8b53ad9e7bc9fd3004e291427cbcc22f36bafc243cd6d2b06f2281b809 SHA512 ee24f38be43086ad2651a0d1a611cb01eefc21e7b76b983641a65374c0e187f5ee555f3f20a4eb99fc17c4592daf031d6149155e4a440c8df3c7996bc866e00a
 DIST libkgapi-24.08.0.tar.xz 339452 BLAKE2B 9ab7cf70e366ae70b88d3281329f3aeeef8449c3d32629526518c089e99115dee9d5208507501b598ec139fda2779336a4716606c62b209ffc7c967ccb41742b SHA512 237ef5dec44adf9ad90ea1fd50fb374a6b72fca92d7617b4ab14ccc3518c7bcc721918819c55efe14c39b76a77fc8097859e640797d7032d19f1a54063e01718
 EBUILD libkgapi-23.08.5-r1.ebuild 1509 BLAKE2B 7fa07b6ec19f1052ea7f07ee63c907d99d0a40e4e283671074624eda97f1ab35a6e92e1496ffb07ae624f92e356ec5e70856d1111410bbce77948565f00a01be SHA512 faa4464b7e2b49dbb7ea46a8f9d3c57aa0f11e21c9abd3ea46e34c727a00dffcacae2ccc26c9a1c1b380a47b52a36a5518074e12e8c711d798cc4c06bf4eb673
-EBUILD libkgapi-23.08.5.ebuild 931 BLAKE2B 562d9d3e46714e30859ce3883600798b755da4e3e785e2e0b516e3cbcd0f959c9657c222e25be5943b3e2d6174d2e5a448f20647e5ab3f0fa388887033fe10cc SHA512 5ca14253737b76a7d74a52da4c2d50af71873fa1821ddc8edb2952eebaa0d21d14bb473a16a0839e2f1ab98f26730e99c323d9d97cb78092217240037ae4110f
+EBUILD libkgapi-23.08.5-r2.ebuild 1512 BLAKE2B ce28cdf0238c6e56c64bbe1375032ee6cd2ef28461c764d63700e4a770bf0b7f04a80f51f59b2fcd3e0c047fb5fe4afe9da0c24f5d14c6acc8b3a1b63e2f91c1 SHA512 7707a8fa224b9564ed1cf886869f23a7aaf0f03c2a14652f807deb8e124265adb29dcc2f2684a88342cca34996e1c7d76b98769d5e8f90a8a88c55e761ab4236
 EBUILD libkgapi-24.05.2.ebuild 890 BLAKE2B fafcd18402e8e41c5892c78f8f6bce734870a2b5e11ce1224a197c75b119510eeee21d90ae92ed839a8c0182b5ee3da0afac2a6ad46bfdd143ec3b4c4de9f009 SHA512 a3bc287955d13e1820b20d47315858a15f308e5843cd22a9b2e61a9693cbbf8ea6ffb6deb7fe0201341f598646c16f5f50dc7f04de83d3816690f508c193c3a4
 EBUILD libkgapi-24.08.0.ebuild 890 BLAKE2B 461507de09d22e65fac865da05a2f990b6141db3577c38901ead66a5c9528c7e7c819afef1ebd334d4d371c5c8a9662c7d01d0e5d61ecef050f46d142348d383 SHA512 6eeaa09de415d1878c63fd4f37b5c4bf7d797019175a3f8d4cf255a47e5010359ea3d093ad6aa0df4fc68231414bde1b555d73816c7d3b7aadd7360a7fa6109a
 MISC metadata.xml 437 BLAKE2B 2003b1d95cf9e5003a00dee70b38f274c19409d922c0f9db381c0b64631541183d642951af2c2e088fdd4ca019728e4692346397a664cfbfea5adf76bd154901 SHA512 742e962cd1f78a6eee879e58da6d665211f55c30f84c1cd6f0b87921646965c1e6348b9c8ec161cbc7ef2983f0f950b9f05b28836671fa5c298262eaf4db473e
diff --git a/kde-apps/libkgapi/libkgapi-23.08.5-r2.ebuild b/kde-apps/libkgapi/libkgapi-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..4bb890933a7f
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-23.08.5-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kf6compat"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	!kf6compat? ( dev-libs/cyrus-sasl:2 )
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-apps/libkgapi:6 )
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SASL_PLUGIN=$(usex !kf6compat)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Both fail for multiple distros, see bug #832709 for more discussion
+		# Revisit at least once Qt 5.15.3 is in wider distribution (in Gentoo at least):
+		#   contacts-contactcreatejobtest, contacts-contactmodifyjobtest
+		# More failures not specific to Gentoo, bug #852593, KDE-bug #440648:
+		#  calendar-eventcreatejobtest, calendar-eventfetchjobtest, calendar-eventmodifyjobtest
+		-E "(contacts-contactcreatejobtest|contacts-contactmodifyjobtest|calendar-eventcreatejobtest|calendar-eventfetchjobtest|calendar-eventmodifyjobtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/libkgapi/libkgapi-23.08.5.ebuild b/kde-apps/libkgapi/libkgapi-23.08.5.ebuild
deleted file mode 100644
index 916b879155c2..000000000000
--- a/kde-apps/libkgapi/libkgapi-23.08.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-CMAKE_SKIP_TESTS=(
-	# Failures not specific to Gentoo, bug #852593, KDE-bug #440648:
-	calendar-event{create,fetch,modify}jobtest
-	# bug 924625
-	tasks-task{create,modify}jobtest
-)