gentoo auto-resync : 26:01:2025 - 06:49:21

6 files changed, 27 insertions, 12 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 1defb7c035d1..73610c8f150f 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 38900fa9b8d5..3c8ea8a00f2e 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -3,6 +3,6 @@ AUX plasma-desktop-6.2.3-tablet-kcm-optional.patch 3229 BLAKE2B f74fe4e69930e366
 DIST plasma-desktop-6.2.4.tar.xz 16335912 BLAKE2B 95b7ca6b5c98f372ffe9c57f1d06bd0dc6ed7050891640fc4a523cc5373c904086f7c47cec84f168be2384798cde0eb6d8bdaa8f8cc0759baf3e52fdab888ffa SHA512 9a766a2799bc96a803433a649884307fc40eb4e5d3c10578a3568ab433833b2a65462b5efb9275295dba5384eccb0365c52e7d98d42374c297adee9f42678f1e
 DIST plasma-desktop-6.2.5.tar.xz 16342172 BLAKE2B c59e4069360ee17ccc4c96a9d02eb34aeb2baf082d346354cfe29390a111aa519afc5c5f514ef36e193df583c3bb9b3dd56ee3d9e441f7f8f528f326eaf7f397 SHA512 c0d2776fa740dcfa072db606e7eb852e4c50b0b06a1e097c882addbbb04c81fc3d20384ba2cd8abce8d983f99e71824b770c6dc5420e5510f779b9e7eff4a2a2
 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
-EBUILD plasma-desktop-6.2.4.ebuild 5433 BLAKE2B bb8e4dacad307d682945ece53ce0b19657c021e1d83ae0772d8d08ea12775d19607d022dde086bc83c340ab7f4a9c96ff7e6e9ccfee0a7f945b185afe3082d36 SHA512 245f2941d4e1ce09dd8e5b83cdccbb8acf9f7a946fff6ef2a7c1f6164ce8d197039d0ea164186af9fea8cbc971d494323baaa6e2ffaa33ed67108dedd206dd99
-EBUILD plasma-desktop-6.2.5.ebuild 5451 BLAKE2B 6e4a97109c0e5b791e12c2627ec690845f24ad866d6ebdf03fb8c2e6f0b4d507ee8e1961c8d99bc3abec9cc427cde6f482bbaf1e4385969a28077d09d6d3669e SHA512 5a1e72825d8f8a082285fd5c5e870b344ee9a437f8d6fba3b0706cc7f36e40265b43db2989862a32259ce4a455a193ee8e576dbe39f136542888471ada7b3d31
+EBUILD plasma-desktop-6.2.4-r1.ebuild 5615 BLAKE2B 53e713c67881aed03333c02e04ff84966afa28f783afcc18adbf8af6473c0c719c122cfb5e55da079df1df5aefb18de3d37b00be857ded9316dbf6e945ba80dc SHA512 bde8005b0094d02c43dca74a1a73d48b8ed5971d6b32a19ff127b6419212af9db50d0f695357ac0fe9af90420c2128824123aa88251efa499420b65be2455865
+EBUILD plasma-desktop-6.2.5-r1.ebuild 5633 BLAKE2B 771fc0b98073b7f46f4b274892cab737db6cd7250e3f51cb68363561e212e0a88316b1e3f07ee3e82012fdfcc0c4113047e48e0a6e20b8aa94f4f183ac86285c SHA512 a07252a12d031426394430c8d6fe630f0c68634723d93d4fa20461a3fc2135d3c1042f4866f280cf745486dc26992af0c17eb413845b771f38efb50763d388d6
 MISC metadata.xml 560 BLAKE2B 04dc70f5284d8fc3e486718b5eb17ee773f90ff807828640f7ff63c0dffcc3bbe4f84600262d4f11ccb6df8d3af5e69aac1b81ddfd2a5ec50dee9bbbb5a5f656 SHA512 7a1df153e7327f1c3fcf7e5027745612bf6c7c24ceb66b71aec77ceecf43aada94f8dba7a33bac72524067845691831ec5cda411650fd9e834245d7d3dd86f0e
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.4-r1.ebuild
index e1a4f33a3d79..e5ce4fb125b2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -111,7 +111,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 	>=kde-plasma/oxygen-${PVCUT}:6
-	kde-plasma/plasma-mimeapps-list
+	>=kde-plasma/plasma-mimeapps-list-3
 	media-fonts/noto-emoji
 	sys-apps/util-linux
 	x11-apps/setxkbmap
@@ -175,6 +175,13 @@ src_test() {
 	ecm_src_test
 }
 
+src_install() {
+	cmake_src_install
+
+	# Provide kde-mimeapps.list with distribution kde-plasma/plasma-mimeapps-list
+	rm "${ED}"/usr/share/applications/kde-mimeapps.list || die
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "screen reader support" "app-accessibility/orca"
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.5-r1.ebuild
index a6bdf7c97ec1..263ad36a859b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.5-r1.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 	>=kde-plasma/oxygen-${KDE_CATV}:6
-	kde-plasma/plasma-mimeapps-list
+	>=kde-plasma/plasma-mimeapps-list-3
 	media-fonts/noto-emoji
 	sys-apps/util-linux
 	x11-apps/setxkbmap
@@ -174,6 +174,13 @@ src_test() {
 	ecm_src_test
 }
 
+src_install() {
+	cmake_src_install
+
+	# Provide kde-mimeapps.list with distribution kde-plasma/plasma-mimeapps-list
+	rm "${ED}"/usr/share/applications/kde-mimeapps.list || die
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "screen reader support" "app-accessibility/orca"
diff --git a/kde-plasma/plasma-mimeapps-list/Manifest b/kde-plasma/plasma-mimeapps-list/Manifest
index b739656d48c1..8b12ab4750ee 100644
--- a/kde-plasma/plasma-mimeapps-list/Manifest
+++ b/kde-plasma/plasma-mimeapps-list/Manifest
@@ -1,3 +1,3 @@
 AUX mimeapps.list 10685 BLAKE2B 58115703bdf4d6534566814449ea5165807d1bfe114a5c97fa82203c95b4e70ee5f771a7a17e57fea8a8285f952934d229da4fa9ce03646e2aeaf514860c964a SHA512 3ae4365fb5ffbb4cf41a15df990a951e7bbeaf40be4226413a31b0c2081a3f3ca760a5f27e94e25033cf5da3b4e8e3fbcc7b97054ac79464f786bf9132bfb10e
-EBUILD plasma-mimeapps-list-2.ebuild 635 BLAKE2B 5edbf2cb08b6d1eee493760de5c69da83453e8b6ba4222a78552cdc46495443dd17060f68bf476d77ad9f01daf65665157298cef4be4d3856f8e531f61d43e2d SHA512 4644048746006fe0187acd838dd02a1fe6c4092dcdb1cd43893c57b8965f636b3d0aa02012502c226f305ffc72e15bb750f8644b9b9b732d5a3f13180e63f029
+EBUILD plasma-mimeapps-list-3.ebuild 665 BLAKE2B 486448bc6415e57e3a0c0947c492571106ae00551c58ccf39dd0537a45b2f4b5bb5610aee152500d7c89b5a1594a87bd8bf62e704e5caac0d3038edcd3a6306f SHA512 fc5a4288a633aa99685b80955ad2636866a4420c2065c436e55a82d25ed8d98b69a4770631c2827a48cc7f608fedc0fbe78432310a95da3a88dcb88ddd1eb46b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
index 0e8df0284292..b2e6d173cf2b 100644
--- a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild
+++ b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
@@ -13,14 +13,15 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND=""
+# 6.2.4 and 6.2.5 both modified with a new revision to stop installing kde-mimeapps.list.
+RDEPEND="
+	!<kde-plasma/plasma-desktop-6.2.4-r1
+	!=kde-plasma/plasma-desktop-6.2.5-r0
+"
 
 src_install() {
 	default
 
-	# TODO: Should we just remove the upstream one in /usr/share?
-	# /etc/xdg should really be available for site-local overrides, but then
-	# again we have CONFIG_PROTECT...
-	insinto /etc/xdg
-	doins "${FILESDIR}"/mimeapps.list
+	insinto /usr/share/applications/
+	newins "${FILESDIR}"/mimeapps.list kde-mimeapps.list
 }