gentoo auto-resync : 18:06:2024 - 00:10:02

3 files changed, 2 insertions, 101 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index c82727aa2f7d..ef3278cf9913 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-24.02.2.tar.xz 53830364 BLAKE2B fea466ca56003560b0e24be0cd16245d61be0e18461552122255e786e086f891e5636e6ef0dd0cd3d0c225c483f7ee33a5d614f94c2dacb41d7271d51e7db028 SHA512 3efee57d8270e4643e38c10565a73a32840d2284b9e773d115dcb826f7c95d62884a251b5eaaf5abbe5a494668d6cdde2c8bdafedce0e666035dfbe46399d5b0
 DIST marble-24.05.1.tar.xz 52452536 BLAKE2B a3d47e49f8554fbd93717e1c100d3f4e290090bd38db61c1c8d6aafddbd5c13f414a1f82f26a638ac1370a1f016bf85e0ebc72590782e37d3fa0e500316979e7 SHA512 1bf89508e8ad76a13c0f0d153f1678c8ac71ffe43ee321802b3bd836bdd9392c088ee130318ebcb1f21c9b93629a0cc638dd3673c88870c2f21816a312f3e379
-EBUILD marble-24.02.2.ebuild 2679 BLAKE2B 22183f30ef13e3397922f6889987b3a9b71c6e4264e8be803c32584f6a459d82f4f55dc094a914a4187a8e8513e58aaaf627384a09d876b3eb090e8c4a262e74 SHA512 bcaf9007c6607cd2a2208ea7e53c8da24af32bfbae5c0bad7e6ee42f6510457bebef833206d91af9aa81122791a313788c940f97673303b29ab461dc8632a428
-EBUILD marble-24.05.1.ebuild 2682 BLAKE2B 724684b319f0879f444efb9017cd54a2158d8aaa2a9ecc2c2fb8250b693755bb5bddcea36b398c18080a766d08514f35a49815400f8ca0562b8141a683d0b4d3 SHA512 563db6ed5b848c0d1b14198471065cf39b7651e231a19890c7592c3ba45ac46a838812bb19cbe1cce306fb85b73ea5d7f04afda148ec5918b8fa5f00b63d3f2f
+EBUILD marble-24.05.1.ebuild 2679 BLAKE2B 22183f30ef13e3397922f6889987b3a9b71c6e4264e8be803c32584f6a459d82f4f55dc094a914a4187a8e8513e58aaaf627384a09d876b3eb090e8c4a262e74 SHA512 bcaf9007c6607cd2a2208ea7e53c8da24af32bfbae5c0bad7e6ee42f6510457bebef833206d91af9aa81122791a313788c940f97673303b29ab461dc8632a428
 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f
diff --git a/kde-apps/marble/marble-24.02.2.ebuild b/kde-apps/marble/marble-24.02.2.ebuild
deleted file mode 100644
index 79a139f5a628..000000000000
--- a/kde-apps/marble/marble-24.02.2.ebuild
+++ /dev/null
@@ -1,97 +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/krunner-${KFMIN}:5
-		>=kde-frameworks/kservice-${KFMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	pbf? ( dev-libs/protobuf:= )
-	phonon? ( >=media-libs/phonon-4.11.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"
-
-	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-24.05.1.ebuild b/kde-apps/marble/marble-24.05.1.ebuild
index 95c45cf5d931..79a139f5a628 100644
--- a/kde-apps/marble/marble-24.05.1.ebuild
+++ b/kde-apps/marble/marble-24.05.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine"
 
 # bug 588320