gentoo resync : 12.05.2022

4 files changed, 11 insertions, 14 deletions

diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index ac325f16c4fc..2a98334f65e6 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
-DIST spectacle-21.08.3.tar.xz 1242704 BLAKE2B 3d9d7b6fb54f6cab7ca86d97daafbc2f9b256029aeffcf30aa2b75c7592616e87a61ee586ca2d27d5af2a5caca2829d7a1fae9600c43503043477abeef91e5e9 SHA512 03568bc1865bbed143bd0177835cc0bcd49444d9c336ea06ba5a43bbdbb4da141a29c2b58d6e95de340126029066499a988546957e79f161e05401931d75a078
 DIST spectacle-21.12.3.tar.xz 1259792 BLAKE2B 273a92ba763c96708b138d47eaf0ab6a995d585156b358c220b435d2372cefba02738c18e2a9e499027f849be7c844ca225617854a0e6de42f358b273dba0f56 SHA512 f4104549a621d370509ee240a568250d137c3a9f6617e3ee788c95ba05218007fd9208b5b90cab8b1541691c8a49e0e8307eb0b38dce30892005a61d4e5ee2a2
-EBUILD spectacle-21.08.3-r1.ebuild 2014 BLAKE2B 9a611fb7a0dbd54c68d2acdcfab5ce835000c037f73e65b55b741a5112c4d2ee631b69e2bcfd154deecc6dbc4dd5da69057f734136f3bbfdc6393843019c32a3 SHA512 01a3517c89d172bd4dafca3d019dfcfa54aedbb8bc3479b2f65c4c6c5cc21867e75aa083dc604010a8a3b93e6df77e808fd35ec3337b54799441424b15a557d2
-EBUILD spectacle-21.12.3-r1.ebuild 1906 BLAKE2B 82c5b3f2021a0788084917b455e91acee5ada52c423681e726fc02ed5b789700bf3c87c93ed33f0a2e9eea360c0b38131349840285f68478491a93fe79d16a0a SHA512 0a59ccd8ae2e3be166157f0dd04394f39744c8db45b19d472c22033ae367c2fc6e8abf0c8adbe10d0e749f1e8a618403ae777b0ef6c11ab7a6fefb419d2b612e
-MISC metadata.xml 627 BLAKE2B 55becdc1a13a5b029e58197cb5c919a8a0c34c04f23e24199252234b2c05fad6bcb7e5ef9a4537be892087ee739b091f1025361bfd5e8dee91262e90b14cb87e SHA512 c0db82c29fc878fec343896bbd1e61ad99098681f2d23a2b0bad6cab18f7e8f5fdba5a0b53c56be7de29c36b83ae822deb45816a41e6d8131bb9ca56d87792ac
+DIST spectacle-22.04.0.tar.xz 1260416 BLAKE2B 469395d8b50e7dc43e9e94cecf2978352217575ddd7a3e771b14b0f3aec3b7ff194a4b8e4f6c70466c6d361270935c65a1e3d24cdcf163cfd95965b2c187b355 SHA512 d3680d1b57fd5379e0ca44bd445e198ad6452f82052f744cec32a9191bd5c4059feadbe58796d3a9a0cc9bea5d55c3cab86753288fe2daf90376cd8db90650b6
+EBUILD spectacle-21.12.3-r1.ebuild 1905 BLAKE2B 4090069dbbf8f2be6ba8f88ac0991ddd86b26fb39ce0ca9867a877c6e865654e80ca3b9e153b508212a68ebcacb1dad2be0d6b5f21ff5c1c9812e0826fbc9109 SHA512 c31725052932d83e1f96420a956c5d494df71739b868ee0b9dfb0afb4c201a24d7facdafb760937a5ab3294f93860049975f819ae370e572bbadd6ffb49bad45
+EBUILD spectacle-22.04.0.ebuild 1901 BLAKE2B 6bed88dcccabe6dafd5236f56117cfa56c55a4506380c0d0a22cdff0d451ec5f0ad5a141fb8345e8fcd9543cfd56a87bbd799e75e02fd40a728537e2b0f57b06 SHA512 f31be0cc7f8e5e37f2135d6a11925e8a9c4030f6d1bc1290ff090ca2e7fd362b293919ca452b75bd8c188fb7b6ee7f8d125cabcc65b8221760919f67b313e157
+MISC metadata.xml 550 BLAKE2B 1d5e1f9bfe982f9f84acc9e00f303d0f58a4d5c97f3f84aba2c2ad21466c08e1008d97015aaf96dc8c400c30c7ca0203a0675e987b26e9917271adf06a7d0382 SHA512 9384d04b6113018ef01ded4840069047a0e8b134689f1c4bc060048d0d87cf4dd8c90a0d1b513265705d7f47c6527608239740860381e2c72bb9cabff056c817
diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml
index a9da67c766e2..e20b58af0ac3 100644
--- a/kde-apps/spectacle/metadata.xml
+++ b/kde-apps/spectacle/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag>
-		<flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/spectacle/spectacle-21.12.3-r1.ebuild b/kde-apps/spectacle/spectacle-21.12.3-r1.ebuild
index b7637945e18b..79df367b452c 100644
--- a/kde-apps/spectacle/spectacle-21.12.3-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-21.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+annotate share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-21.08.3-r1.ebuild b/kde-apps/spectacle/spectacle-22.04.0.ebuild
index 599921ebbee7..d31b6bf9f58f 100644
--- a/kde-apps/spectacle/spectacle-21.08.3-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-22.04.0.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Screenshot capture utility"
 HOMEPAGE="https://apps.kde.org/spectacle/"
 
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="+annotate kipi share"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+annotate share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
 DEPEND="
@@ -32,6 +32,7 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -46,12 +47,10 @@ DEPEND="
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
 	annotate? ( >=media-libs/kimageannotator-0.5.0 )
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qdbus-${QTMIN}:*
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
 src_prepare() {
@@ -64,7 +63,6 @@ src_prepare() {
 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