From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1643780-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 CEFC815817D for <garchives@archives.gentoo.org>; Sun, 16 Jun 2024 18:42:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F306B2BC015; Sun, 16 Jun 2024 18:42:42 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC8D62BC015 for <gentoo-commits@lists.gentoo.org>; Sun, 16 Jun 2024 18:42:42 +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 250E733BEBE for <gentoo-commits@lists.gentoo.org>; Sun, 16 Jun 2024 18:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E2501D22 for <gentoo-commits@lists.gentoo.org>; Sun, 16 Jun 2024 18:42:40 +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: <1718563307.905fd404262e11e84b3707b0c0ecd3c99f24f89d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/plasma/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/targets/desktop/plasma/package.use X-VCS-Directories: profiles/targets/desktop/plasma/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 905fd404262e11e84b3707b0c0ecd3c99f24f89d X-VCS-Branch: master Date: Sun, 16 Jun 2024 18:42:40 +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: d3a0a466-a935-4050-ab20-5e93cb1795fb X-Archives-Hash: b4cbb02ad1ebc69e397225c1ef5bcc78 commit: 905fd404262e11e84b3707b0c0ecd3c99f24f89d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 16 18:39:38 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 16 18:41:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905fd404 profiles: desktop/plasma: Set dev-util/kdevelop:5[-plasma] by default Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/targets/desktop/plasma/package.use | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 5c5ac18bcde9..59b0daa6504e 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -1,6 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Resolve conflict between Plasma 6 and KDevelop 24.05 +>=dev-util/kdevelop-24.05.1:5 -plasma + # Sam James <sam@gentoo.org> (2024-06-13) # Needed by dependencies of KDE Plasma and KDE Gear app-crypt/gpgme qt6