gentoo auto-resync : 20:12:2023 - 01:53:29

3 files changed, 0 insertions, 131 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index fca52a6df9d9..52f7dcea86d5 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,8 +1,5 @@
-AUX marble-23.04.3-cxx17-for-protobuf-23.patch 1103 BLAKE2B b9b17dcea5d31835d1806d4121d9b62b2a314e8c61f0b692fcfc88a3598c2f03b52e8baabe29406a81e621dd71edc4b4384577ef027155c33a85d8b13b6087e0 SHA512 9a3604a66885b8b9c92b7acb18c0db7a24fd6b2b7b751a1c622f2405a0212cbeddb7e6482336321d42675b3091373a37e4b1447b0f84452f7b7c23318148afad
-DIST marble-23.04.3.tar.xz 53762636 BLAKE2B 2ed2061e91efc01ea627377783ed674ff938d5925dccf14d08ba49519460a8dd456654975e144d213274313015c8239fa9af6b99309626704ad4ae7ebf53fa9b SHA512 e92b4e42c78a4b9c7cdcce04d077fcdf1aaf54ce235ceb6fb4b74ddcc348b03f53f96d0666ebf681602cd95abed18697dda55f63b63f9f9cafe4568da625a06b
 DIST marble-23.08.3.tar.xz 53785784 BLAKE2B b08197a781b95d12db1377298034f62600b34e53caeaeee3738bb4b244648fdb2fcd683158a92e989421b50ee77c860080127c57c8649dc0ccc89551676fd5be SHA512 b59497bca28114397eb138d4d1b002e436dec9c4ec4845c103c1d13c256681febbe8914091dbebceee56716a4b54b8e5fba99813a85c6ef340b2ea828f740234
 DIST marble-23.08.4.tar.xz 53784524 BLAKE2B 1b02d5d8086f6be64483fb1d89f676fe26a6f2ad3aa3d25f48b4c812813d8952d65f02a0778e3d69b924d25b55e1dc3e59f6c58a3971c81ff4acf895cbccbb90 SHA512 a51c9ea45fdbddcda104000cc8781052737cbaa936097dcedef43e64be6072cf57658ed3167922ba80be8c27b53ba1eb5c6ef84d8f927ae7defed1db17968651
-EBUILD marble-23.04.3.ebuild 2763 BLAKE2B 342d67b8e2263e664519c48d99da27e5171f0d4a245f523f4ed6bbb7399f0787a016804721676d15d9e1a76521794c1c13b4a5f023dc7ab1ea58bff3687a8eff SHA512 a64fee610ac918167ec292da9ca86c77fc26be331dabe234fdde715d5c156847845eafde68091a9a04f29bc31874b1b54d895c242393c1c0f1e9ea545586b21f
 EBUILD marble-23.08.3.ebuild 2678 BLAKE2B 63c0e7526b0571a4a160ffb49b5d386bee19fc48b22767a05f748b127950c118b72df80d8cbdb65acf67310bd6259c791b8880049c460ed334e82e0fc35459e8 SHA512 7524f375eff6565103e3cf8f3a218fb14c79837399b9589aef64b4ecacc10a7af93ddd02563c932e9910c3c0db621c63033e9db66472f9995b4b49e04387a64b
 EBUILD marble-23.08.4.ebuild 2681 BLAKE2B c4bedfa35ec8a435e3bc8901151be322a3beddaaf41f33a9a68bb2462bb6e8f7a16c7582e8db829672315f6bb44bf219b86f430411fddd85eeeb2f163a590b57 SHA512 daef6e03a3721bbab8eabd60de4e8e3b05fc4aeb7a592e657775c076903c5331c225932ce0ca5b01dd2672469f1913d869afa9c4e96a03b45a23e26448956518
 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f
diff --git a/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
deleted file mode 100644
index b03f800bf19d..000000000000
--- a/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dea7bb66fb0b89990c2ca69606d51f02af6c4cf1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 11 Jul 2023 23:31:01 +0200
-Subject: [PATCH] Require C++17
-
-Newer protobuf will fail to compile without C++17
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6d0e47ac0..b779501047 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,9 +32,9 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
-     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -std=iso9899:1990")
- endif()
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
- endif()
- # Default to hidden visibility for symbols
- set(CMAKE_C_VISIBILITY_PRESET hidden)
--- 
-GitLab
-
diff --git a/kde-apps/marble/marble-23.04.3.ebuild b/kde-apps/marble/marble-23.04.3.ebuild
deleted file mode 100644
index b81c7bcc5f26..000000000000
--- a/kde-apps/marble/marble-23.04.3.ebuild
+++ /dev/null
@@ -1,99 +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[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 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-cxx17-for-protobuf-23.patch" ) # bug 909081, in 23.08.0
-
-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
-}