gentoo auto-resync : 02:08:2023 - 22:51:19

3 files changed, 2 insertions, 101 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index b95a179eb9f8..b92aa9eff858 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-23.04.2.tar.xz 53758928 BLAKE2B ea98a05e43761bb4708892112ad8e652091d28a09d681da588195681fb3ef971400882c2ff613db17feac32eb13af62af7b612e21d9ffa911e421bbd0030c7b5 SHA512 9b9449fc9af66d9cc024e9f00142cd6d779a1a51e687f83c6768091e8b4e6f3ca0f9974283fef236232c18f1d601efd6e4fdc43e234cf77e0031fc84199b9909
 DIST marble-23.04.3.tar.xz 53762636 BLAKE2B 2ed2061e91efc01ea627377783ed674ff938d5925dccf14d08ba49519460a8dd456654975e144d213274313015c8239fa9af6b99309626704ad4ae7ebf53fa9b SHA512 e92b4e42c78a4b9c7cdcce04d077fcdf1aaf54ce235ceb6fb4b74ddcc348b03f53f96d0666ebf681602cd95abed18697dda55f63b63f9f9cafe4568da625a06b
-EBUILD marble-23.04.2.ebuild 2670 BLAKE2B 19304d0f6905f7d7cb4aefdb5885c54b6378c5dc01ea2c4b4f3c9311d92bcc18940f0e568c89b2f14adbe64f51c530db00a3bf05f96fae561753d72fa02068c2 SHA512 cc2ae4238e6d8cde3975f63a15c894bf6eb8b74d230142bd2405734e32160e83326532e81ce5c9129de28f002bbbdf8feaa16f241410336b3b08ed41e3059165
-EBUILD marble-23.04.3.ebuild 2673 BLAKE2B 14fb9fbc5597755fe08470e8e3068279056d0009f9edd6e2b04a12a93898e1316337d824677928681dc886cc21a7f9d1c33450a1b73bd3f02c0fcd945e03ce4d SHA512 cc18469c61aed7aa9778474fa877aeb30c6ddefd5779f7d376c8c08901066fcab149c5c3d6e9c9820e24d25f066a8d0b3f9a28d4d627a9fe454fd07c252e1b7e
+EBUILD marble-23.04.3.ebuild 2670 BLAKE2B 19304d0f6905f7d7cb4aefdb5885c54b6378c5dc01ea2c4b4f3c9311d92bcc18940f0e568c89b2f14adbe64f51c530db00a3bf05f96fae561753d72fa02068c2 SHA512 cc2ae4238e6d8cde3975f63a15c894bf6eb8b74d230142bd2405734e32160e83326532e81ce5c9129de28f002bbbdf8feaa16f241410336b3b08ed41e3059165
 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f
diff --git a/kde-apps/marble/marble-23.04.2.ebuild b/kde-apps/marble/marble-23.04.2.ebuild
deleted file mode 100644
index a79dff3c4856..000000000000
--- a/kde-apps/marble/marble-23.04.2.ebuild
+++ /dev/null
@@ -1,97 +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.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
-}
diff --git a/kde-apps/marble/marble-23.04.3.ebuild b/kde-apps/marble/marble-23.04.3.ebuild
index 404fa371bde1..a79dff3c4856 100644
--- a/kde-apps/marble/marble-23.04.3.ebuild
+++ b/kde-apps/marble/marble-23.04.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