From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1579133-garchives=archives.gentoo.org@lists.gentoo.org> 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 D16A7158013 for <garchives@archives.gentoo.org>; Tue, 12 Dec 2023 20:02:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8690A2BC071; Tue, 12 Dec 2023 20:02:16 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 6598A2BC071 for <gentoo-commits@lists.gentoo.org>; Tue, 12 Dec 2023 20:02:16 +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 7F45C335D63 for <gentoo-commits@lists.gentoo.org>; Tue, 12 Dec 2023 20:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3C2514BE for <gentoo-commits@lists.gentoo.org>; Tue, 12 Dec 2023 20:02:12 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> 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" <asturm@gentoo.org> Message-ID: <1702411319.157d7f3818cb7da95b7d9c18ba4517fb9b29aee8.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kio-extras/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kio-extras/kio-extras-9999.ebuild X-VCS-Directories: kde-apps/kio-extras/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 157d7f3818cb7da95b7d9c18ba4517fb9b29aee8 X-VCS-Branch: master Date: Tue, 12 Dec 2023 20:02:12 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd9be34c-a4b3-4639-aa6f-7d01fdeebbab X-Archives-Hash: 806084d98fd0fc3a7fd966f357a743b6 commit: 157d7f3818cb7da95b7d9c18ba4517fb9b29aee8 Author: Mehmet Karataş <krtsmmt <AT> gmail <DOT> com> AuthorDate: Tue Dec 12 19:29:17 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 12 20:01:59 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=157d7f38 kde-apps/kio-extras: Fix co-install with KF5 KIO https://invent.kde.org/network/kio-extras/-/commit/edae36345810fef100bbb7f09c5bb44f8d0d9fea kcm_trash.desktop is provided by both. Signed-off-by: Mehmet Karataş <krtsmmt <AT> gmail.com> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/kio-extras/kio-extras-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild index 2fa15c4fcd..8be566c4d9 100644 --- a/kde-apps/kio-extras/kio-extras-9999.ebuild +++ b/kde-apps/kio-extras/kio-extras-9999.ebuild @@ -67,6 +67,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} + !kde-frameworks/kio:5[-kf6compat(-)] >=kde-frameworks/kded-${KFMIN}:6 " BDEPEND="man? ( dev-util/gperf )"