From f1634517e73f2faf342a366354c3e0f2edb45952 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 11 Jan 2025 06:41:28 +0000 Subject: gentoo auto-resync : 11:01:2025 - 06:41:28 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-24.12.0-r1.ebuild | 96 ------------------------------- kde-apps/marble/marble-24.12.0-r2.ebuild | 97 ++++++++++++++++++++++++++++++++ kde-apps/marble/marble-24.12.1-r1.ebuild | 92 ++++++++++++++++++++++++++++++ kde-apps/marble/marble-24.12.1.ebuild | 91 ------------------------------ 5 files changed, 191 insertions(+), 189 deletions(-) delete mode 100644 kde-apps/marble/marble-24.12.0-r1.ebuild create mode 100644 kde-apps/marble/marble-24.12.0-r2.ebuild create mode 100644 kde-apps/marble/marble-24.12.1-r1.ebuild delete mode 100644 kde-apps/marble/marble-24.12.1.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 9eeb88306c54..8eb5d5066594 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -4,6 +4,6 @@ DIST marble-24.08.3.tar.xz 52449740 BLAKE2B 8d2712b0aad3dd092245d6e3a6a5df5cb883 DIST marble-24.12.0.tar.xz 53635296 BLAKE2B 96a54ec1d94bb2dbeab24c4d69baa5917a6d729c7992a00b5c0cfae5192a2815c344aa88f26efaa7a4f8c79c2a2682fbbfa94b8cfd2251a409acdac74799ee71 SHA512 196b4fde279bf05f50fc4cce40153d2be47e0d69ef7a7e6eefa97a13d4163fac92748759981f7f76a11014fbeb9c02c363f3c1bd35a9deac88bbff258b457fdd DIST marble-24.12.1.tar.xz 53605040 BLAKE2B 680f86527cb1bffc4a00a5f472ca87b40a78cd32c4eb29b51e689d9a8900c0355d425b345ce824c88451f89bc81102376b8236b9f8216fbb41212dff6d80da3a SHA512 6a5e8feb8bf2be189aa449f28eca6e7b82638c7343569b208975c418544e4c2bdcb8af317b4b3fd6d5fcc19f8389e56a2f6c33accf6f3bdb41352d0c6cb403f5 EBUILD marble-24.08.3.ebuild 2792 BLAKE2B 84c9eea800ef9f2376820d2a113b9671e037b1081b0961901eb5762703859f03584c6eb75aab2ba2d1b8dd61da6bcaadc2aeec3a7257667413cc0d81994900d9 SHA512 f61ebb0c97f1086cd2a34530dde22804dc9c7f2c74230ae09b91373b6f033cc42b9be2302c070bcec4102c3cf37af72045350859772969d3059ae3b31deeb7d4 -EBUILD marble-24.12.0-r1.ebuild 2680 BLAKE2B 469d613355fc10e5ffe2c6e4066d9708d14959bafac3c9c5524e894ac62dc2f78ab82d0d0b43da1ebaa1a0435ff536debddbb47dcc296eb26052be912158dca8 SHA512 72da4738a5e6dd68e064b50438b1bba41ea507571e0d6a801e2436965796482459de31ad2cda138cc4c1c3809521a24762b7164e035984f9002511212c54aae6 -EBUILD marble-24.12.1.ebuild 2541 BLAKE2B f619b45334bffcbdfdfbe31c9886f0e645a7b1effa862c5cd3773ffd67702a1e2704e67163a618e785cf01cbb2c12b24a532700e369c31467f3071d3385fb8ae SHA512 c040ecad8f86cbbdcd95e3cdbc10fb7071c7fb92b918a89643ca31fe37e125a0bd1632f88b046eb784a0c5dc1e5f100a032bddc61ecd7c18630ff11425af5437 +EBUILD marble-24.12.0-r2.ebuild 2734 BLAKE2B a0571a76a8f4c8a7338f636128ad5bd112164889c6dc24246032089b5415b99617b9b1c3513d99ad41ba23f73f2a987d81613a4ab57cf2e057b2843d975b396a SHA512 8e52c98d2bcfff46a84425b38424a07edd7beb0e34e6d8ca56675f3965f6a4bd2338c85ec75c3d5c8b142263813e39dd9a597126a2f6ef44d1e9c724f9adca46 +EBUILD marble-24.12.1-r1.ebuild 2595 BLAKE2B 12128b975e70b26526a76e315e81494e51b4287d788287253b420596235e69437bf42cee2a3edb381ee85c81dd60d8fae5ff4330e59c7d90e261cd602ee4ab59 SHA512 f4a869ec350d7246bad2faf1440cd5941d1977ce164388c39817a9465d77fa7a1334377db2a2033bee5a163e63eb88247a00f612355001f1cc89ae1986254865 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f diff --git a/kde-apps/marble/marble-24.12.0-r1.ebuild b/kde-apps/marble/marble-24.12.0-r1.ebuild deleted file mode 100644 index 53d2a28a43fa..000000000000 --- a/kde-apps/marble/marble-24.12.0-r1.ebuild +++ /dev/null @@ -1,96 +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 - ) - 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 -} diff --git a/kde-apps/marble/marble-24.12.0-r2.ebuild b/kde-apps/marble/marble-24.12.0-r2.ebuild new file mode 100644 index 000000000000..0e1b719fb40f --- /dev/null +++ b/kde-apps/marble/marble-24.12.0-r2.ebuild @@ -0,0 +1,97 @@ +# 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 +} diff --git a/kde-apps/marble/marble-24.12.1-r1.ebuild b/kde-apps/marble/marble-24.12.1-r1.ebuild new file mode 100644 index 000000000000..34419e4a3239 --- /dev/null +++ b/kde-apps/marble/marble-24.12.1-r1.ebuild @@ -0,0 +1,92 @@ +# 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.7.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 ) +" + +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 +} diff --git a/kde-apps/marble/marble-24.12.1.ebuild b/kde-apps/marble/marble-24.12.1.ebuild deleted file mode 100644 index 285cbac695e9..000000000000 --- a/kde-apps/marble/marble-24.12.1.ebuild +++ /dev/null @@ -1,91 +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.7.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 - ) - 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 ) -" - -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 -} -- cgit v1.2.3