commit: ea33b74d9af8cc6e3e451c18cde7b9cdc0d10899 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 14 23:59:05 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 15 00:25:54 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea33b74d
kde-apps/marble: Drop unused dependencies, always run ecm_src_configure Upstream commits: 9a8bd45e4b4f766ff3e5379504a0bf4e0edb9b21 6ba72d68b57d41c97a1440cfbc9027f8052c1887 IUSE kde: Replace bogus WITH_KF6 switch with deselecting all KF6 automagic. This is prerequisite to reproduce Unknown CMake command "qt_policy" error. Bug: https://bugs.gentoo.org/946470 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/marble/marble-24.12.49.9999.ebuild | 17 +++++++---------- kde-apps/marble/marble-9999.ebuild | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/kde-apps/marble/marble-24.12.49.9999.ebuild b/kde-apps/marble/marble-24.12.49.9999.ebuild index e221a2b345..c12c9d6081 100644 --- a/kde-apps/marble/marble-24.12.49.9999.ebuild +++ b/kde-apps/marble/marble-24.12.49.9999.ebuild @@ -38,11 +38,8 @@ DEPEND=" >=kde-frameworks/kcrash-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 >=kde-frameworks/kparts-${KFMIN}:6 >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwallet-${KFMIN}:6 ) pbf? ( dev-libs/protobuf:= ) phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) @@ -61,7 +58,7 @@ BDEPEND=" src_prepare() { ecm_src_prepare - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" + rm -r src/3rdparty/zlib || die "Failed to remove bundled libs" } src_configure() { @@ -71,7 +68,6 @@ src_configure() { -DBUILD_WITH_DBUS=$(usex dbus) -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) - -DWITH_KF6=$(usex kde) $(cmake_use_find_package pbf Protobuf) -DWITH_Phonon4Qt6=$(usex phonon) -DWITH_libshp=$(usex shapefile) @@ -80,9 +76,10 @@ src_configure() { # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi + # KF6KIO: src/thumbnailer/CMakeLists.txt + # KF6Runner: src/plasmarunner/CMakeLists.txt + for x in CoreAddons I18n Config Crash KIO Parts Runner; do + mycmakeargs+=( $(cmake_use_find_package kde KF6${x}) ) + done + ecm_src_configure } diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index e221a2b345..c12c9d6081 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -38,11 +38,8 @@ DEPEND=" >=kde-frameworks/kcrash-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 >=kde-frameworks/kparts-${KFMIN}:6 >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwallet-${KFMIN}:6 ) pbf? ( dev-libs/protobuf:= ) phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) @@ -61,7 +58,7 @@ BDEPEND=" src_prepare() { ecm_src_prepare - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" + rm -r src/3rdparty/zlib || die "Failed to remove bundled libs" } src_configure() { @@ -71,7 +68,6 @@ src_configure() { -DBUILD_WITH_DBUS=$(usex dbus) -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) - -DWITH_KF6=$(usex kde) $(cmake_use_find_package pbf Protobuf) -DWITH_Phonon4Qt6=$(usex phonon) -DWITH_libshp=$(usex shapefile) @@ -80,9 +76,10 @@ src_configure() { # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi + # KF6KIO: src/thumbnailer/CMakeLists.txt + # KF6Runner: src/plasmarunner/CMakeLists.txt + for x in CoreAddons I18n Config Crash KIO Parts Runner; do + mycmakeargs+=( $(cmake_use_find_package kde KF6${x}) ) + done + ecm_src_configure }
