gentoo resync : 05.12.2021

4 files changed, 8 insertions, 53 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index ecd81dfea059..d064216e02a0 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,6 +1,5 @@
-AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea613608160ada4854dc780b999e7b98204eea36b82f3e001097cb9c22d08056cd5765e43139daa9c02b7c74d79e745aac0d3021b5ce85b SHA512 d2257372821524a471ad75617df2f631a73f7b9a09e59adf1775d60fd0bcff393df16382a5fa9b109a7ffa8ca5684639ee565304a99b854272f8ab28570dbdaa
-DIST spectacle-21.04.3.tar.xz 1175024 BLAKE2B 00d5ca9bf905b889e1ebbd510efc7d86571533e53206c5c65130d8b018d9e1941e283b698baab497928c6e3255d067ae6b4fde279945c0d56ed7ab7e9f226e83 SHA512 86af85d322c8d1231c4c47edaf886077dcfd1b20a33d6022ef5a8a543261e3d9f8c7b33957140d32f346c3dbaa87e13c9bed25b391771185468b4994e7ca3841
 DIST spectacle-21.08.3.tar.xz 1242704 BLAKE2B 3d9d7b6fb54f6cab7ca86d97daafbc2f9b256029aeffcf30aa2b75c7592616e87a61ee586ca2d27d5af2a5caca2829d7a1fae9600c43503043477abeef91e5e9 SHA512 03568bc1865bbed143bd0177835cc0bcd49444d9c336ea06ba5a43bbdbb4da141a29c2b58d6e95de340126029066499a988546957e79f161e05401931d75a078
-EBUILD spectacle-21.04.3.ebuild 2080 BLAKE2B 29382327138d45a1106324b76115bd3fb1058444ae369ada587b648443693ad797a0d408dd4ffbc716c0905a94325b5992db52831256c7b28ed467f0e1275e2a SHA512 21d3511fd496855ba6320e0a66fea8de913a6f9c1305d510b5cb10e0e92c65a4f21d051cc33d822865ea0609fc514bc12a68077cf9eaa2a937aac54c24e9f247
-EBUILD spectacle-21.08.3.ebuild 2017 BLAKE2B 90ff3019564b46e9372c67f05b319d62fb5f9643f1773f6ec5894501683be24322b05478ae8bb8cf17c9912ff98fa814d1f3ce9912ccb56dcf4df40a7f7770e6 SHA512 51128618a7969a296bb27bc0b5f2d71612f3ac0233f7ec57cb5c7f0bb06a3de74814b549c76b7dc29e587ed99b4d514ba249027c89b9b4af999f51c18798ba5f
+DIST spectacle-21.11.90.tar.xz 1253580 BLAKE2B b725702eca37c886de05a494ce8b806cf212efb3c339b289927b6386ed5552d1462eef29f250b9417a4e83cf53f870cc28333b40a6aedc70070431d28e192ba0 SHA512 4549232cc6621f352419c14f4a5221b38e236d272b03ac52395943a410aa16be80651ab2165d4fb2201c33519cafe8fdfdd26fcea76dd683d8afd4fd990941db
+EBUILD spectacle-21.08.3.ebuild 2014 BLAKE2B de8245a60b40b74b72f58a7fad4eedc2204154ea154e50a41a29bf3c0d9b89dadd67c729451607fd306d5795b299e5117a587541c07f3135076d2a3f04632250 SHA512 6a7f9df24baca157cfd04b3f1bc810dcf7819a1ef7cb22ee8e9abccf0690e3d181814b635e4b3faa810483bd1d1435265a3e34c51aefa58c7d986de914ea19e9
+EBUILD spectacle-21.11.90.ebuild 2017 BLAKE2B b9e5322af6c6241674d82b0a95e5eeb997847704fc1f4ca47aa88c2cf60657619bb8e2b1073aebd59b5aa2fdb0a5b1e187c646a44db03ae2bc0a102dfeb6ea59 SHA512 8d31e615dad05b96b23d88da4f87a447310ffd42075bc9ae69fd6b7628b1895d1690b3c08b11e2bafa2282f4cedc62265f09b30833b41ed7b3b5e6aa9e11dda8
 MISC metadata.xml 627 BLAKE2B 55becdc1a13a5b029e58197cb5c919a8a0c34c04f23e24199252234b2c05fad6bcb7e5ef9a4537be892087ee739b091f1025361bfd5e8dee91262e90b14cb87e SHA512 c0db82c29fc878fec343896bbd1e61ad99098681f2d23a2b0bad6cab18f7e8f5fdba5a0b53c56be7de29c36b83ae822deb45816a41e6d8131bb9ca56d87792ac
diff --git a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
deleted file mode 100644
index 572cc501aeb8..000000000000
--- a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a4450b62365d5e7c511e9855d31a68808c9bcfba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Apr 2021 18:22:10 +0200
-Subject: [PATCH] Add missing Qt5Concurrent
-
-Implicit use via KIO.
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt     | 1 +
- src/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c63dca..7aac0d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,6 +40,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOR
- find_package(
-     Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-         Core
-+        Concurrent
-         Widgets
-         DBus
-         PrintSupport
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3cd737b..c715a29 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -69,6 +69,7 @@ ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/
- 
- target_link_libraries(
-     spectacle
-+        Qt::Concurrent
-         Qt::DBus
-         Qt::PrintSupport
-         KF5::CoreAddons
--- 
-2.31.1
-
diff --git a/kde-apps/spectacle/spectacle-21.08.3.ebuild b/kde-apps/spectacle/spectacle-21.08.3.ebuild
index 266f3b132d79..8c7049030a1f 100644
--- a/kde-apps/spectacle/spectacle-21.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-21.04.3.ebuild b/kde-apps/spectacle/spectacle-21.11.90.ebuild
index e7880e514aa5..c568e7d2078e 100644
--- a/kde-apps/spectacle/spectacle-21.04.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
@@ -46,7 +46,7 @@ DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
-	annotate? ( >=media-libs/kimageannotator-0.4.1 )
+	annotate? ( >=media-libs/kimageannotator-0.5.0 )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
@@ -54,8 +54,6 @@ RDEPEND="${DEPEND}
 	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-implicit-dep.patch" ) # bug 785403
-
 src_prepare() {
 	ecm_src_prepare
 	# Unnecessary with >=media-libs/kimageannotator-0.4.0