commit: 3a650e6450bb7a3b90854ed2994ed29e12f83daf Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 2 21:09:26 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 4 11:43:01 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a650e64
kde-plasma/kde-cli-tools: Drop kdesu, spin off handbook/i18n to $PN-common Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kde-cli-tools/kde-cli-tools-6.1.49.9999.ebuild | 20 +++++++++----------- kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild | 20 +++++++++----------- kde-plasma/kde-cli-tools/metadata.xml | 3 --- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.49.9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.49.9999.ebuild index 1cc2678c62..8ec00a5187 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.49.9999.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.49.9999.ebuild @@ -3,10 +3,9 @@ EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="forceoff" ECM_TEST="true" KFMIN=6.5.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -16,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"; LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" -IUSE="kdesu X" +IUSE="X" # requires running kde environment RESTRICT="test" @@ -36,24 +35,23 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?] - kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:6 ) X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) " RDEPEND="${DEPEND} - kdesu? ( sys-apps/dbus[X] ) + >=${CATEGORY}/${PN}-common-${PV} " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" +src_prepare() { + ecm_src_prepare + ecm_punt_po_install +} + src_configure() { local mycmakeargs=( - $(cmake_use_find_package kdesu KF6Su) + -DCMAKE_DISABLE_FIND_PACKAGE_KF6Su=ON -DWITH_X11=$(usex X) ) ecm_src_configure } - -src_install() { - ecm_src_install - use kdesu && dosym ../libexec/kf6/kdesu /usr/bin/kdesu -} diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild index 20cda12c32..6b6c64a41a 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild @@ -3,10 +3,9 @@ EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="forceoff" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -16,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"; LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" -IUSE="kdesu X" +IUSE="X" # requires running kde environment RESTRICT="test" @@ -36,24 +35,23 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?] - kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:6 ) X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) " RDEPEND="${DEPEND} - kdesu? ( sys-apps/dbus[X] ) + >=${CATEGORY}/${PN}-common-${PV} " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" +src_prepare() { + ecm_src_prepare + ecm_punt_po_install +} + src_configure() { local mycmakeargs=( - $(cmake_use_find_package kdesu KF6Su) + -DCMAKE_DISABLE_FIND_PACKAGE_KF6Su=ON -DWITH_X11=$(usex X) ) ecm_src_configure } - -src_install() { - ecm_src_install - use kdesu && dosym ../libexec/kf6/kdesu /usr/bin/kdesu -} diff --git a/kde-plasma/kde-cli-tools/metadata.xml b/kde-plasma/kde-cli-tools/metadata.xml index 90af160c0c..7e9d56c900 100644 --- a/kde-plasma/kde-cli-tools/metadata.xml +++ b/kde-plasma/kde-cli-tools/metadata.xml @@ -9,7 +9,4 @@ <bugs-to>https://bugs.kde.org/</bugs-to> <remote-id type="kde-invent">plasma/kde-cli-tools</remote-id> </upstream> - <use> - <flag name="kdesu">Build graphical frontend for <pkg>kde-frameworks/kdesu</pkg></flag> - </use> </pkgmetadata>
