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 725081581F0 for ; Sat, 25 Jan 2025 10:52:56 +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 5AF8A343527 for ; Sat, 25 Jan 2025 10:52:56 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5AD0811042E; Sat, 25 Jan 2025 10:52:55 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 51D8611042D for ; Sat, 25 Jan 2025 10:52:55 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05EEB343497 for ; Sat, 25 Jan 2025 10:52:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F9A1170C for ; Sat, 25 Jan 2025 10:52:53 +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: <1737802299.fed334c0e3a8940ee591a8538e79243f5e36ecc5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-desktop/plasma-desktop-6.2.4-r1.ebuild kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild kde-plasma/plasma-desktop/plasma-desktop-6.2.5-r1.ebuild kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fed334c0e3a8940ee591a8538e79243f5e36ecc5 X-VCS-Branch: master Date: Sat, 25 Jan 2025 10:52:53 +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: 2958aaef-7bee-475d-be2c-110ceca9064d X-Archives-Hash: 3ebb598d2041cc9e9470c42d786d1578 commit: fed334c0e3a8940ee591a8538e79243f5e36ecc5 Author: Alfred Wingate protonmail com> AuthorDate: Sat Jan 25 04:39:20 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 25 10:51:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed334c0 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/gentoo/pull/40295 Signed-off-by: Sam James gentoo.org> ...ma-desktop-6.2.4.ebuild => plasma-desktop-6.2.4-r1.ebuild} | 11 +++++++++-- ...ma-desktop-6.2.5.ebuild => plasma-desktop-6.2.5-r1.ebuild} | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) 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 similarity index 95% rename from kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild rename to 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 similarity index 96% rename from kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild rename to 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"