From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 910CA1581F0 for ; Sat, 25 Jan 2025 10:52:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 76AC6343497 for ; Sat, 25 Jan 2025 10:52:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id AB21511042F; Sat, 25 Jan 2025 10:52:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 9768A11042E for ; Sat, 25 Jan 2025 10:52:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A494343497 for ; Sat, 25 Jan 2025 10:52:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A88CD236B for ; Sat, 25 Jan 2025 10:52:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1737802347.7afdad0cfb967ae8f29afff688d7c402e0391436.sam@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/plasma-desktop-6.2.91-r1.ebuild kde-plasma/plasma-desktop/plasma-desktop-6.2.91.ebuild kde-plasma/plasma-desktop/plasma-desktop-6.3.49.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7afdad0cfb967ae8f29afff688d7c402e0391436 X-VCS-Branch: master Date: Sat, 25 Jan 2025 10:52:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e566ef9e-83ff-4769-81fe-582ab2f1ecd8 X-Archives-Hash: b650c4e2e25d058f4e48e4ff59e921b4 commit: 7afdad0cfb967ae8f29afff688d7c402e0391436 Author: Alfred Wingate protonmail com> AuthorDate: Sat Jan 25 04:39:20 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 25 10:52:27 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7afdad0c kde-plasma/plasma-desktop: do not install kde-mimeapps.list Use kde-plasma/plasma-mimeapps-list instead. Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/kde/pull/1018 Signed-off-by: Sam James gentoo.org> ...desktop-6.2.91.ebuild => plasma-desktop-6.2.91-r1.ebuild} | 12 ++++++++++-- kde-plasma/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(-) 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"