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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F964158041 for ; Sun, 3 Mar 2024 09:38:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BE75E29B6; Sun, 3 Mar 2024 09:38:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 27E79E29B6 for ; Sun, 3 Mar 2024 09:38:06 +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 5B69433BEED for ; Sun, 3 Mar 2024 09:38:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE083E95 for ; Sun, 3 Mar 2024 09:38:03 +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: <1709458655.0c892640fe16bc944640267ff01440948b7efae3.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konqueror/konqueror-24.02.49.9999.ebuild kde-apps/konqueror/konqueror-9999.ebuild X-VCS-Directories: kde-apps/konqueror/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0c892640fe16bc944640267ff01440948b7efae3 X-VCS-Branch: master Date: Sun, 3 Mar 2024 09:38:03 +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: 673bf6d9-68ae-4402-8f03-c388668711f4 X-Archives-Hash: 12cc35af261f0c774111cd3c2846db44 commit: 0c892640fe16bc944640267ff01440948b7efae3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 3 09:33:34 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 3 09:37:35 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c892640 kde-apps/konqueror: Block kde-apps/kio-extras:5 File collision at /usr/share/kio_bookmarks/kio_bookmarks.css Bug: https://bugs.gentoo.org/926057 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/konqueror/konqueror-24.02.49.9999.ebuild | 1 + kde-apps/konqueror/konqueror-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/konqueror/konqueror-24.02.49.9999.ebuild b/kde-apps/konqueror/konqueror-24.02.49.9999.ebuild index cd367e7e04..e05b353683 100644 --- a/kde-apps/konqueror/konqueror-24.02.49.9999.ebuild +++ b/kde-apps/konqueror/konqueror-24.02.49.9999.ebuild @@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND} activities? ( kde-plasma/plasma-activities:6 ) " RDEPEND="${COMMON_DEPEND} + !