gentoo resync : 28.04.2021

4 files changed, 66 insertions, 9 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 21516c3f3c1d..a288c7bb6060 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,6 @@
-DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
+AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea613608160ada4854dc780b999e7b98204eea36b82f3e001097cb9c22d08056cd5765e43139daa9c02b7c74d79e745aac0d3021b5ce85b SHA512 d2257372821524a471ad75617df2f631a73f7b9a09e59adf1775d60fd0bcff393df16382a5fa9b109a7ffa8ca5684639ee565304a99b854272f8ab28570dbdaa
 DIST spectacle-20.12.3.tar.xz 1170540 BLAKE2B 865c4f7a2b8a3edf727f551c64ce35847a880023773b72531ea324addf5f0ac327261a87e35cdea6ec1f7eb4b75d2f8b86c3d1b7fc7719959623653ebe542a93 SHA512 4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc
-EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.3.ebuild 1978 BLAKE2B 362c37da9d8fc117e1fdcd73f8bdf3159a1473a1e6d4573db6b8faa96d26232c051f46ca9753217c259d028c71a7c1ee0935cff22ab5404298ab3b9d72a84fc6 SHA512 1fb00ab07fcc6bd531c7208efe0fc762aaa5865f494e61e13002bd634428a1e10a6c7f6ec5fb0cbef764a596a1f9fffe690b76813a67a29c0ec07ab07b447dc7
+DIST spectacle-21.04.0.tar.xz 1168056 BLAKE2B 02df7c3bcb3926028a78c1efdc22690ffff429e4b3fd6087127bbe7ce96211b192d88460a1336fe84591fda0f4995cc808e451fee1b36b207e3c4dafd2acbbd1 SHA512 40ccfe9f3f0373cfdb3a16fc215536520da4ce2a9bff8cf5e4924a24e6b5058a209a55261d77bb5d9d645245d139ffdb9f89dc2dd5d569f80be55fe4540caa62
+EBUILD spectacle-20.12.3.ebuild 1975 BLAKE2B 5933946b6efed08711611b9ce154bbd7c55d079f896cbc49fcbfb505b01a36aa5a71e30d76e1cf73b0ffded0ddd4bfae6522a2e72b6a3d3aa5492f10369088b2 SHA512 12f01c735fd0d47924f11cab6eef72c31895cce10e60314d8ddcd348cba7a9148b06fc5b2296e331896021e6b4030319197337fcce1bb6809fb8f572d21af38d
+EBUILD spectacle-21.04.0-r1.ebuild 2076 BLAKE2B 1e968153435344a7e183eaa43ec8a4342e6c09d0149cdc11d45cabb7849150d5169e127e5325c9c7aaaf5b77d4e6cc31d7bfbcb7e26bc77254a4d056e25e9e78 SHA512 e52e72286093fd75b0ce7376dbd01123c623fba0c1e36f8cf86ceb3deaa0ffd1717c6fcb3ae840b6d63eceba52b0f21df30784cf810fb4898e4bbca0df090485
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
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
new file mode 100644
index 000000000000..572cc501aeb8
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
@@ -0,0 +1,42 @@
+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-20.12.3.ebuild b/kde-apps/spectacle/spectacle-20.12.3.ebuild
index 7fb30afe4ae4..79c370708c65 100644
--- a/kde-apps/spectacle/spectacle-20.12.3.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-20.08.3.ebuild b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild
index 02307a838eca..5e0fd6932847 100644
--- a/kde-apps/spectacle/spectacle-20.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Screenshot capture utility"
@@ -15,13 +15,16 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="kipi share"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+annotate kipi share"
 
+# TODO: Qt5Svg leaking from media-libs/kimageannotator
 DEPEND="
 	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
@@ -43,6 +46,7 @@ DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
+	annotate? ( >=media-libs/kimageannotator-0.4.1 )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
@@ -50,8 +54,18 @@ RDEPEND="${DEPEND}
 	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785403
+
+src_prepare() {
+	ecm_src_prepare
+	# Unnecessary with >=media-libs/kimageannotator-0.4.0
+	sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \
+		-i CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package annotate kImageAnnotator)
 		$(cmake_use_find_package kipi KF5Kipi)
 		$(cmake_use_find_package share KF5Purpose)
 	)