From 7afdad0cfb967ae8f29afff688d7c402e0391436 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Sat, 25 Jan 2025 06:39:20 +0200 Subject: [PATCH] kde-plasma/plasma-desktop: do not install kde-mimeapps.list Use kde-plasma/plasma-mimeapps-list instead. Signed-off-by: Alfred Wingate Closes: https://github.com/gentoo/kde/pull/1018 Signed-off-by: Sam James --- ...6.2.91.ebuild => plasma-desktop-6.2.91-r1.ebuild} | 12 ++++++++++-- .../plasma-desktop/plasma-desktop-6.3.49.9999.ebuild | 11 +++++++++-- kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 11 +++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) rename kde-plasma/plasma-desktop/{plasma-desktop-6.2.91.ebuild => plasma-desktop-6.2.91-r1.ebuild} (95%) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.91.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.91-r1.ebuild similarity index 95% rename from kde-plasma/plasma-desktop/plasma-desktop-6.2.91.ebuild rename to kde-plasma/plasma-desktop/plasma-desktop-6.2.91-r1.ebuild index d97869e1bc..1bbb2aa213 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.91.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.91-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-${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,14 @@ 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.3.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.3.49.9999.ebuild index 23a5016d74..5a25e4a773 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.3.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.3.49.9999.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-${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-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index f969f3af14..54605886ea 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.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-${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"