From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09F6C1382C5 for ; Sat, 8 May 2021 22:17:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2ECCE0636; Sat, 8 May 2021 22:17:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7140E0636 for ; Sat, 8 May 2021 22:17:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92736340EC1 for ; Sat, 8 May 2021 22:17:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8881B59C for ; Sat, 8 May 2021 22:17:42 +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: <1620512161.fbafed2f4ee9877d56ed4b477e31ec937ba71e60.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fbafed2f4ee9877d56ed4b477e31ec937ba71e60 X-VCS-Branch: master Date: Sat, 8 May 2021 22:17:42 +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: 1970abb3-9023-41fc-babb-e7134155aa95 X-Archives-Hash: 99da39c573c36aeb67ccb625147b42dd commit: fbafed2f4ee9877d56ed4b477e31ec937ba71e60 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 8 22:14:41 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 8 22:16:01 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbafed2f kde-plasma/plasma-workspace: Drop spurious file Fixes file collision with kde-plasma/plasma-desktop. Reported-by: puchu (#gentoo-kde in IRC) Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild index b8e5237f6d..db34bfe37e 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild @@ -151,6 +151,8 @@ PATCHES=( ) src_prepare() { + rm po/ta/kcm_autostart.po || die # spurious file + ecm_src_prepare cmake_comment_add_subdirectory libkworkspace