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 8815B158099 for ; Mon, 27 Nov 2023 23:22:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EBC62BC118; Mon, 27 Nov 2023 23:22:56 +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 1C18A2BC116 for ; Mon, 27 Nov 2023 23:22:56 +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 34457342DF6 for ; Mon, 27 Nov 2023 23:22:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BA9913F8 for ; Mon, 27 Nov 2023 23:22:52 +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: <1701127295.e0f105ddb5fc31a00ff919de8140972ca2a5f3ed.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/ktexteditor/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild kde-frameworks/ktexteditor/metadata.xml X-VCS-Directories: kde-frameworks/ktexteditor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e0f105ddb5fc31a00ff919de8140972ca2a5f3ed X-VCS-Branch: master Date: Mon, 27 Nov 2023 23:22:52 +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: c9788768-0926-4be3-8a27-5a3a59eb12d1 X-Archives-Hash: 4e5e6d99f232e913227df5a21e2760a7 commit: e0f105ddb5fc31a00ff919de8140972ca2a5f3ed Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 27 22:01:15 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 27 23:21:35 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0f105dd kde-frameworks/ktexteditor: Add IUSE=kf6compat Removes dbus service and policykit files colliding with KF6 version. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild | 16 ++++++++++++++-- kde-frameworks/ktexteditor/metadata.xml | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild index a4276e7370..5ff1501898 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Framework providing a full text editor component" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="+editorconfig" +IUSE="+editorconfig kf6compat" RESTRICT="test" @@ -42,7 +42,9 @@ DEPEND=" =kde-frameworks/syntax-highlighting-${PVCUT}*:5 editorconfig? ( app-text/editorconfig-core-c ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kf6compat? ( kde-frameworks/ktexteditor:6 ) +" BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )" src_configure() { @@ -52,3 +54,13 @@ src_configure() { ecm_src_configure } + +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/polkit-1/actions/org.kde.ktexteditor.katetextbuffer.policy \ + "${D}"/usr/share/dbus-1/system-services/org.kde.ktexteditor.katetextbuffer.service \ + "${D}"/usr/share/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf || die + fi +} diff --git a/kde-frameworks/ktexteditor/metadata.xml b/kde-frameworks/ktexteditor/metadata.xml index 45f4b96ce4..9b335c7cb0 100644 --- a/kde-frameworks/ktexteditor/metadata.xml +++ b/kde-frameworks/ktexteditor/metadata.xml @@ -11,6 +11,7 @@ Enable support for EditorConfig configuration files + Disable components colliding with KF6, depend on KF6 components instead