diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-12-07 20:17:47 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-12-07 20:32:28 +0100 |
| commit | afdc377389f60066687f5049e16561b5ec8f68ae (patch) | |
| tree | 6a6446a0b501bd2d8c9e33ef00725534f9654677 /kde-frameworks/ktexteditor | |
| parent | kde-frameworks/krunner: Drop IUSE activities (diff) | |
| download | kde-afdc377389f60066687f5049e16561b5ec8f68ae.tar.gz kde-afdc377389f60066687f5049e16561b5ec8f68ae.tar.bz2 kde-afdc377389f60066687f5049e16561b5ec8f68ae.zip | |
kde-frameworks/ktexteditor: Co-installability fixed upstream
Upstream commit 55bd0a256c56584e926c78c81e6e71930786f952
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/ktexteditor')
4 files changed, 5 insertions, 32 deletions
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.113.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.113.0.ebuild index 4a47713d7e..b988be30ce 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-5.113.0.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-5.113.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Framework providing a full text editor component" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="+editorconfig kf6compat" +IUSE="+editorconfig" RESTRICT="test" @@ -42,9 +42,7 @@ DEPEND=" =kde-frameworks/syntax-highlighting-${PVCUT}*:5 editorconfig? ( app-text/editorconfig-core-c ) " -RDEPEND="${DEPEND} - kf6compat? ( kde-frameworks/ktexteditor:6 ) -" +RDEPEND="${DEPEND}" BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )" src_configure() { @@ -54,13 +52,3 @@ 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/ktexteditor-5.239.9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.239.9999.ebuild index 5ff1501898..a4276e7370 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 kf6compat" +IUSE="+editorconfig" RESTRICT="test" @@ -42,9 +42,7 @@ DEPEND=" =kde-frameworks/syntax-highlighting-${PVCUT}*:5 editorconfig? ( app-text/editorconfig-core-c ) " -RDEPEND="${DEPEND} - kf6compat? ( kde-frameworks/ktexteditor:6 ) -" +RDEPEND="${DEPEND}" BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )" src_configure() { @@ -54,13 +52,3 @@ 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/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild index 313ca13827..ef1dab9be4 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild @@ -41,9 +41,7 @@ DEPEND=" =kde-frameworks/syntax-highlighting-${PVCUT}*:6 editorconfig? ( app-text/editorconfig-core-c ) " -RDEPEND="${DEPEND} - !${CATEGORY}/${PN}:5[-kf6compat(-)] -" +RDEPEND="${DEPEND}" BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )" src_configure() { diff --git a/kde-frameworks/ktexteditor/metadata.xml b/kde-frameworks/ktexteditor/metadata.xml index 9b335c7cb0..45f4b96ce4 100644 --- a/kde-frameworks/ktexteditor/metadata.xml +++ b/kde-frameworks/ktexteditor/metadata.xml @@ -11,7 +11,6 @@ </upstream> <use> <flag name="editorconfig">Enable support for EditorConfig configuration files</flag> - <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> </use> <slots> <subslots> |