From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D77B1584AD for ; Fri, 25 Apr 2025 18:32:53 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E3E3D3430AA for ; Fri, 25 Apr 2025 18:32:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E31511104BA; Fri, 25 Apr 2025 18:32:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D8FA41104B8 for ; Fri, 25 Apr 2025 18:32:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85C59342FF8 for ; Fri, 25 Apr 2025 18:32:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA02E2529 for ; Fri, 25 Apr 2025 18:32:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1745605941.0e113605eac8e176b722f2b835a517e0d068ab3e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/marble/marble-24.12.3-r1.ebuild kde-apps/marble/marble-25.04.0-r1.ebuild X-VCS-Directories: kde-apps/marble/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0e113605eac8e176b722f2b835a517e0d068ab3e X-VCS-Branch: master Date: Fri, 25 Apr 2025 18:32:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dca5eb07-c954-407b-b327-47701afcc5df X-Archives-Hash: d8bf5a3c296decf5f94f07f88c80a91f commit: 0e113605eac8e176b722f2b835a517e0d068ab3e Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 25 18:15:00 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 25 18:32:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e113605 kde-apps/marble: Add missing IUSE pbf dependency Upstream commit c363124030198f564215e7e6252f6c12cc26e987 Closes: https://bugs.gentoo.org/953977 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-24.12.3-r1.ebuild | 95 ++++++++++++++++++++++++++++++++ kde-apps/marble/marble-25.04.0-r1.ebuild | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/kde-apps/marble/marble-24.12.3-r1.ebuild b/kde-apps/marble/marble-24.12.3-r1.ebuild new file mode 100644 index 000000000000..fbe57026bb80 --- /dev/null +++ b/kde-apps/marble/marble-24.12.3-r1.ebuild @@ -0,0 +1,95 @@ +# 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-cpp/abseil-cpp:= + 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-25.04.0-r1.ebuild b/kde-apps/marble/marble-25.04.0-r1.ebuild new file mode 100644 index 000000000000..1917d4f63319 --- /dev/null +++ b/kde-apps/marble/marble-25.04.0-r1.ebuild @@ -0,0 +1,95 @@ +# 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.9.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org xdg + +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-cpp/abseil-cpp:= + 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 +}