From d5599da3055bf9b900513a61c3c6e4bdbb524503 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Jun 2023 15:45:39 +0100 Subject: gentoo auto-resync : 08:06:2023 - 15:45:39 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-23.04.1.ebuild | 98 ----------------------------------- kde-apps/marble/marble-23.04.2.ebuild | 97 ++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 100 deletions(-) delete mode 100644 kde-apps/marble/marble-23.04.1.ebuild create mode 100644 kde-apps/marble/marble-23.04.2.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index f2464590485b..8a3b28cd6cf8 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ DIST marble-22.12.3.tar.xz 53752524 BLAKE2B 69ca99dca4af10d1e994f224838f9f3414d08dc0379c57fb481f7b499ecb80d317b44c1124caca9f63b0305b824818f1b3efe791485bfb83d8f9cb6b438ca63b SHA512 c673b8e9de38cbedff5a15a48f21156f4dd5fe6c469ba70cfee8426952308ae6d9498d23298215d2acd04f432f09f0a16e12c794524d51ac87eafac6d8013fbd -DIST marble-23.04.1.tar.xz 53760656 BLAKE2B dcda88f8b966906306564ec4c3874a9ac5659dd8cd9625891340af91e7eea161bc0a20b58b76c39439770af3cc7f4ff5fa1c8a46ad9ab7b8daec1def038fd025 SHA512 24a7f6db5395742f864fb0cca76d59516d158d1f20e5de64feb7ab27620369f1bd44c8735985ac60a3f6cabdc894fc880b30a03af9d2f444383ce6242a24beb3 +DIST marble-23.04.2.tar.xz 53758928 BLAKE2B ea98a05e43761bb4708892112ad8e652091d28a09d681da588195681fb3ef971400882c2ff613db17feac32eb13af62af7b612e21d9ffa911e421bbd0030c7b5 SHA512 9b9449fc9af66d9cc024e9f00142cd6d779a1a51e687f83c6768091e8b4e6f3ca0f9974283fef236232c18f1d601efd6e4fdc43e234cf77e0031fc84199b9909 EBUILD marble-22.12.3.ebuild 2708 BLAKE2B 09960b9fa32df49177bbbc828dbe9efa5898efb9576cd8ba82c7c62de45998f1dca0bcb52c5d3049b34df977f86e0ec4b9a4a5fccc51f6ba0e9fc5307b304d4d SHA512 45ce22037f6d133b1b1883ce33927e99eec7b6d8f3046dc96c91525c3796e55ecb8be40a46ffa3604b920439fd75ed8668e02c2957dbf890af8a1d40957c0ae6 -EBUILD marble-23.04.1.ebuild 2711 BLAKE2B fd1c4b97c1bf7f40168cd9a1cb6bf93a89f6e5ee46bc452a5724788cee7ccc2b18b731611e9867905c051be6a16c7ed8c2c6341942471a7a052aecde7a06ff99 SHA512 2d0992eebcad5be8deb8059809dfd941f0b0a737b73d6a78d19261d5cd54089f44ead0aa7f1e51fe41e22c246d8f606824afea0dcdd0e0429ed53a9d6b21cacc +EBUILD marble-23.04.2.ebuild 2673 BLAKE2B 14fb9fbc5597755fe08470e8e3068279056d0009f9edd6e2b04a12a93898e1316337d824677928681dc886cc21a7f9d1c33450a1b73bd3f02c0fcd945e03ce4d SHA512 cc18469c61aed7aa9778474fa877aeb30c6ddefd5779f7d376c8c08901066fcab149c5c3d6e9c9820e24d25f066a8d0b3f9a28d4d627a9fe454fd07c252e1b7e MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f diff --git a/kde-apps/marble/marble-23.04.1.ebuild b/kde-apps/marble/marble-23.04.1.ebuild deleted file mode 100644 index c02a8f04ad70..000000000000 --- a/kde-apps/marble/marble-23.04.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2023 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.104.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -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 nls +pbf phonon shapefile +webengine" - -# FIXME (new package): libwlocate, WLAN-based geolocation -BDEPEND=" - aprs? ( dev-lang/perl ) - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -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/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - pbf? ( dev-libs/protobuf:= ) - phonon? ( >=media-libs/phonon-4.11.0 ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - ) -" -RDEPEND="${DEPEND}" - -# bug 588320 -RESTRICT="test" - -src_prepare() { - ecm_src_prepare - - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - - 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) - -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-23.04.2.ebuild b/kde-apps/marble/marble-23.04.2.ebuild new file mode 100644 index 000000000000..404fa371bde1 --- /dev/null +++ b/kde-apps/marble/marble-23.04.2.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 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.106.0 +QTMIN=5.15.9 +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/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + ) + pbf? ( dev-libs/protobuf:= ) + phonon? ( >=media-libs/phonon-4.11.0 ) + 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" + + 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) + -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 +} -- cgit v1.2.3