gentoo auto-resync : 05:12:2024 - 02:07:17

3 files changed, 2 insertions, 103 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 2de5ecd7a2f0..9fbe71a6b5b5 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-24.08.1.tar.xz 52448796 BLAKE2B 3a021b2ed965a61cf8b6ac599a3a810bde5963eaf385c66e330bb19e9acf610106c0ce71bbb611801b74c2be2c57840e96641f1094796be92e7f023087d3232b SHA512 96210fb2c1e0c1af977dcbc7be71dd9adab16fbb4bc6e2ccc5ff8804cedf975022d57c7bdf5ae41ba72ca3f2c5740f80f1818f35cee6105c12b590cf0d603251
 DIST marble-24.08.3.tar.xz 52449740 BLAKE2B 8d2712b0aad3dd092245d6e3a6a5df5cb883fa0fbfb928e172bb6c43fe6ad5021a663b6f4e08e83666bc10d5dafd8a4e932d60b2b0381e3ae067a7410cde3f4c SHA512 8b39bfe6622c0a8377fdc0dc83b73453f877289717d0b8bada637001da7bf4ead26532c6bc2754647ff680a72b89ed217afdd80d3efb17aa5dda9be786a9d763
-EBUILD marble-24.08.1-r1.ebuild 2792 BLAKE2B 84c9eea800ef9f2376820d2a113b9671e037b1081b0961901eb5762703859f03584c6eb75aab2ba2d1b8dd61da6bcaadc2aeec3a7257667413cc0d81994900d9 SHA512 f61ebb0c97f1086cd2a34530dde22804dc9c7f2c74230ae09b91373b6f033cc42b9be2302c070bcec4102c3cf37af72045350859772969d3059ae3b31deeb7d4
-EBUILD marble-24.08.3.ebuild 2794 BLAKE2B 3b194fdb75e298769324ebbdfead29d55470a816be2341507d22afc35b090dd869d57c83cab31f2d562acac7a42fea4ecd7a254217753deb5d60f3af124e97d5 SHA512 af6f3c3557d672015a79945f946b40079f057d40f4dbfb9a5a7901ec977cdee09212e8aeac0af652a8b6a54fecac88abb8f1d8784b41712ce4ac14d24a4504ae
+EBUILD marble-24.08.3.ebuild 2792 BLAKE2B 84c9eea800ef9f2376820d2a113b9671e037b1081b0961901eb5762703859f03584c6eb75aab2ba2d1b8dd61da6bcaadc2aeec3a7257667413cc0d81994900d9 SHA512 f61ebb0c97f1086cd2a34530dde22804dc9c7f2c74230ae09b91373b6f033cc42b9be2302c070bcec4102c3cf37af72045350859772969d3059ae3b31deeb7d4
 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f
diff --git a/kde-apps/marble/marble-24.08.1-r1.ebuild b/kde-apps/marble/marble-24.08.1-r1.ebuild
deleted file mode 100644
index 14c52634272a..000000000000
--- a/kde-apps/marble/marble-24.08.1-r1.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.08.3.ebuild b/kde-apps/marble/marble-24.08.3.ebuild
index 952e3eea95cb..14c52634272a 100644
--- a/kde-apps/marble/marble-24.08.3.ebuild
+++ b/kde-apps/marble/marble-24.08.3.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