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 AB0DE1582EF for ; Tue, 25 Feb 2025 18:15:59 +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 8D96A34318E for ; Tue, 25 Feb 2025 18:15:59 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8F4501103AC; Tue, 25 Feb 2025 18:15:58 +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 87D0E1103AC for ; Tue, 25 Feb 2025 18:15:58 +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 3C4FF3431C6 for ; Tue, 25 Feb 2025 18:15:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA0A81236 for ; Tue, 25 Feb 2025 18:15:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1740507324.18c1427cc47b2f64c71836d165f1fb9ac8b2dcff.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kmix/kmix-24.12.1.ebuild X-VCS-Directories: kde-apps/kmix/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 18c1427cc47b2f64c71836d165f1fb9ac8b2dcff X-VCS-Branch: master Date: Tue, 25 Feb 2025 18:15:56 +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: dfda7901-4bdc-4d0c-ae28-0ac3c5f96cab X-Archives-Hash: 4722c68b529a7109aa2c75c80121c879 commit: 18c1427cc47b2f64c71836d165f1fb9ac8b2dcff Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 25 18:15:04 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 25 18:15:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c1427c kde-apps/kmix: Cleanup accidentally added cruft Amends 844f8131b00063c6e3723304f63c8b54c19d5c77 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kmix/kmix-24.12.1.ebuild | 9 --------- 1 file changed, 9 deletions(-) diff --git a/kde-apps/kmix/kmix-24.12.1.ebuild b/kde-apps/kmix/kmix-24.12.1.ebuild index eb66fa7a4ed1..e7369612f269 100644 --- a/kde-apps/kmix/kmix-24.12.1.ebuild +++ b/kde-apps/kmix/kmix-24.12.1.ebuild @@ -41,16 +41,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -<<<<<<< HEAD:kde-apps/kmix/kmix-24.12.1.ebuild PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream -======= -PATCHES=( - # TODO: upstream - "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" - # Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29 - "${FILESDIR}/${PN}-24.05.2-revert-kcm_pulseaudio-dep.patch" -) ->>>>>>> aa17c6dbaed7 (kde-apps/kmix: Reference pending upstream MR):kde-apps/kmix/kmix-24.08.49.9999.ebuild src_configure() { local mycmakeargs=(