gentoo resync : 11.05.2021

3 files changed, 117 insertions, 0 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index a288c7bb6060..94d9a00292e6 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,6 +1,8 @@
+AUX spectacle-20.12.3-implicit-dep.patch 1182 BLAKE2B 960532ea3a502c685904ec408c14be0b3dfe9c0a46662bcff0e2477f48965a96db66b0abfe5800adbab47fede2842eda0265a1997761abc4345abc6d4b4cc90a SHA512 b2de818b84a7cd98ad24a6fb4cd1b5712b9f0f0ca92b28cd2cfbf40f03a49e8761b81a821f13a55a8d240b9aa34fa98b13eb42a9325e350c1d8810b63ae3e122
 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
 DIST spectacle-21.04.0.tar.xz 1168056 BLAKE2B 02df7c3bcb3926028a78c1efdc22690ffff429e4b3fd6087127bbe7ce96211b192d88460a1336fe84591fda0f4995cc808e451fee1b36b207e3c4dafd2acbbd1 SHA512 40ccfe9f3f0373cfdb3a16fc215536520da4ce2a9bff8cf5e4924a24e6b5058a209a55261d77bb5d9d645245d139ffdb9f89dc2dd5d569f80be55fe4540caa62
+EBUILD spectacle-20.12.3-r1.ebuild 2076 BLAKE2B 735a485cf400326c4d0aa2196e5124e5062ab02b3b931d53ad876d8372dd0fed9fec783a1d037ec1bce4244948ef5c435daa5d39f2e42ed8da9b6eaa5290a65f SHA512 3d2084a33c7c6a71ea3d9147ffae875b2944092509d2cfbeefca415f2f4be6deaed503a43525ee2e922e82e756e9f9475ef02f16f45922acf46bd3dd0466ae51
 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-20.12.3-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-20.12.3-implicit-dep.patch
new file mode 100644
index 000000000000..48ad7752b80f
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-20.12.3-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
++        Qt5::Concurrent
+         Qt5::DBus
+         Qt5::PrintSupport
+         KF5::CoreAddons
+-- 
+2.31.1
+
diff --git a/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
new file mode 100644
index 000000000000..cf416d9e8263
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.75.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Screenshot capture utility"
+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="+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
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	x11-libs/libxcb
+	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 )
+"
+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)
+	)
+	ecm_src_configure
+}