commit: c5201c1599ae28631753675d66e0b963c36e6feb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 30 16:28:01 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 30 17:18:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5201c15
kde-apps/marble: drop 24.08.3, 24.12.0-r2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/marble/Manifest | 2 - kde-apps/marble/marble-24.08.3.ebuild | 99 -------------------------------- kde-apps/marble/marble-24.12.0-r2.ebuild | 97 ------------------------------- 3 files changed, 198 deletions(-) diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index f6ca413ca2b2..c561660a9532 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,3 +1 @@ -DIST marble-24.08.3.tar.xz 52449740 BLAKE2B 8d2712b0aad3dd092245d6e3a6a5df5cb883fa0fbfb928e172bb6c43fe6ad5021a663b6f4e08e83666bc10d5dafd8a4e932d60b2b0381e3ae067a7410cde3f4c SHA512 8b39bfe6622c0a8377fdc0dc83b73453f877289717d0b8bada637001da7bf4ead26532c6bc2754647ff680a72b89ed217afdd80d3efb17aa5dda9be786a9d763 -DIST marble-24.12.0.tar.xz 53635296 BLAKE2B 96a54ec1d94bb2dbeab24c4d69baa5917a6d729c7992a00b5c0cfae5192a2815c344aa88f26efaa7a4f8c79c2a2682fbbfa94b8cfd2251a409acdac74799ee71 SHA512 196b4fde279bf05f50fc4cce40153d2be47e0d69ef7a7e6eefa97a13d4163fac92748759981f7f76a11014fbeb9c02c363f3c1bd35a9deac88bbff258b457fdd DIST marble-24.12.1.tar.xz 53605040 BLAKE2B 680f86527cb1bffc4a00a5f472ca87b40a78cd32c4eb29b51e689d9a8900c0355d425b345ce824c88451f89bc81102376b8236b9f8216fbb41212dff6d80da3a SHA512 6a5e8feb8bf2be189aa449f28eca6e7b82638c7343569b208975c418544e4c2bdcb8af317b4b3fd6d5fcc19f8389e56a2f6c33accf6f3bdb41352d0c6cb403f5 diff --git a/kde-apps/marble/marble-24.08.3.ebuild b/kde-apps/marble/marble-24.08.3.ebuild deleted file mode 100644 index 14c52634272a..000000000000 --- a/kde-apps/marble/marble-24.08.3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -ECM_TEST="forceoptional" -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm gear.kde.org - -DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" -HOMEPAGE="https://marble.kde.org/"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/$(ver_cut 1-2)" -KEYWORDS="amd64 arm64 ~riscv x86" -IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" - -# bug 588320 -RESTRICT="test" - -# FIXME (new package): libwlocate, WLAN-based geolocation -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - sys-libs/zlib - aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - designer? ( >=dev-qt/designer-${QTMIN}:5 ) - geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - kde? ( - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - pbf? ( dev-libs/protobuf:= ) - phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=dev-qt/linguist-tools-${QTMIN}:5 - aprs? ( dev-lang/perl ) -" - -src_prepare() { - ecm_src_prepare - - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - - cmake_run_in src cmake_comment_add_subdirectory plasma - cmake_run_in src cmake_comment_add_subdirectory plasmarunner - use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package aprs Perl) - $(cmake_use_find_package geolocation Qt5Positioning) - -DBUILD_MARBLE_TESTS=$(usex test) - -DBUILD_WITH_DBUS=$(usex dbus) - -DWITH_DESIGNER_PLUGIN=$(usex designer) - -DWITH_libgps=$(usex gps) - -DWITH_KF5=$(usex kde) - $(cmake_use_find_package pbf Protobuf) - -DWITH_Phonon4Qt5=$(usex phonon) - -DWITH_libshp=$(usex shapefile) - $(cmake_use_find_package webengine Qt5WebEngine) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi -} diff --git a/kde-apps/marble/marble-24.12.0-r2.ebuild b/kde-apps/marble/marble-24.12.0-r2.ebuild deleted file mode 100644 index 0e1b719fb40f..000000000000 --- a/kde-apps/marble/marble-24.12.0-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -ECM_TEST="true" -KFMIN=6.5.0 -QTMIN=6.7.2 -inherit ecm gear.kde.org - -DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" -HOMEPAGE="https://marble.kde.org/"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" -IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" - -# bug 588320 -RESTRICT="test" - -# FIXME (new package): libwlocate, WLAN-based geolocation -DEPEND=" - >=dev-qt/qt5compat-${QTMIN}:6 - >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus?,gui,network,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - sys-libs/zlib - aprs? ( >=dev-qt/qtserialport-${QTMIN}:6 ) - designer? ( >=dev-qt/qttools-${QTMIN}:6[designer] ) - geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:6 ) - gps? ( sci-geosciences/gpsd:= ) - kde? ( - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/krunner-${KFMIN}:6 - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[qml] ) - ) - pbf? ( dev-libs/protobuf:= ) - phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:6 - >=dev-qt/qtwebengine-${QTMIN}:6[widgets] - ) -" -RDEPEND="${DEPEND} - kde? ( - dev-libs/kirigami-addons:6 - >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=kde-frameworks/kirigami-${KFMIN}:6 - ) -" -BDEPEND=" - >=dev-qt/qttools-${QTMIN}:6[linguist] - aprs? ( dev-lang/perl ) -" - -PATCHES=( # bug 946470 - "${FILESDIR}/${P}-cmake-drop-qt_policy.patch" - "${FILESDIR}/${P}-cmake-behaim-marble-maps-kf6-conditional.patch" -) - -src_prepare() { - ecm_src_prepare - - rm -r src/3rdparty/zlib || die "Failed to remove bundled libs" -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package aprs Perl) - $(cmake_use_find_package geolocation Qt6Positioning) - -DBUILD_WITH_DBUS=$(usex dbus) - -DWITH_DESIGNER_PLUGIN=$(usex designer) - -DWITH_libgps=$(usex gps) - $(cmake_use_find_package pbf Protobuf) - -DWITH_Phonon4Qt6=$(usex phonon) - -DWITH_libshp=$(usex shapefile) - $(cmake_use_find_package webengine Qt6WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - # 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 -}
