gentoo resync : 12.05.2022

4 files changed, 44 insertions, 6 deletions

diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 80b8d4b7cd3a..779047ad2d72 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,6 @@
-DIST libkleo-21.08.3.tar.xz 437532 BLAKE2B f14f669e9d35e905a56e13023b211a627a649fed2053eccfdd103a7cf8f24ae8dfcaa74a824db79d2759fc3a151d2a6b284a60104606dd5a7560335c8f2eed9a SHA512 f417c5e4d98212879eaa60a45258ec6eb58193756aa2d0938b152f9afddb2a27ff4a47d18e53262dfc2a15161441c49c14d8c4ac8644949b7d3fa4162c329762
+AUX libkleo-21.12.3-gcc-12.patch 1003 BLAKE2B 95b4eb7785925f28496c8b0f08c8dd643942098b320b1a356c023c88d6fbcb83add4a3507d192e5337fd1606026f191d2ef8dd1d50248b56335ed0aa5b0ceabb SHA512 b8088ff5656cc9328d3150c901f87bd43482c0091f07e549c9f3e594663c88c6e8676058f27e1daa3e35485e4388a6059b5dfb7e6c8ed9cdb1b55b0515b341f2
 DIST libkleo-21.12.3.tar.xz 447268 BLAKE2B 6bdfe91a2fb2f8e91d41c090c8b9254b73ceaa548260c16ad5d5ccb5073d44ccebd727af496489265759640ba6f51265de2f046b75c61ee9246df23b28a26e5a SHA512 796fcde52e7be6d92c8e0ea5c5663b445b2e46350986ad8b74b79164481694577cfe8ba714d63df5d420c93ff8602b718839da0a19d4d4b3819beab326665089
-EBUILD libkleo-21.08.3-r1.ebuild 993 BLAKE2B d25717eb78a42546b88f9cb48cbeda59d3c3a09f07e746d8f53cd891b30d722994f56fe1592ce4d33d190ee9ef312f0944c30d9e39fc44d7664d7eed5878994d SHA512 b837723b857ac9f7cb929d0144fbe7ea825145c632bc5858f704f4910c3ebee34acf7dffbdfcd42db5d776ad4e094749e05603980dcd8d70354e5b1dce44969b
-EBUILD libkleo-21.12.3.ebuild 1012 BLAKE2B 50c5b666e4a7eefb8f8ca901657713035cfebd1cc4e843c91081ce898ce365c57a817b1d43f44176186ee603bd7e05ed3f6ad4886f829cf869aa7bbd6c1014cc SHA512 b722dcb31d937830daa9027cbeba6310dc1e4b9f50feb64e80d2ae7320d5e8732c8d99f503cd23701aaddeb5c9d67165d5c956b76954e5a6d2bc97964b889e18
+DIST libkleo-22.04.0.tar.xz 468732 BLAKE2B 0e3923da3a26f78622de18eab6e4f8465ea02bb10321f6eed88a59f3135fdcd00aa3fbf1a54ca088488340df7c495440c8c551ac6abaf52a432b87350df835be SHA512 09a7a7caee06440c25688624e6c8517c8ef663eb7fea85c56623f6f9d0f22ac800858164300aa3c023a3dc2ee9aacdbc69f5f5eccc763a4fa5b8f663b71049fc
+EBUILD libkleo-21.12.3.ebuild 1069 BLAKE2B f59049532b61cb1bec6a8fc27fdd7820aab13db238a2710f0a95271a71feec147317b8042f0e176f880245904573ba9ec96e888b4d8e097f7d2c0f4560d8c546 SHA512 8dbe2e46d2af1290d2276f675e072b699b0ff694ee4ef653523abf3b54c7686e04f005caf4733375ef74537467ffd3404d1b8c5f9a197516df62321ec9ad6a7d
+EBUILD libkleo-22.04.0.ebuild 1081 BLAKE2B aa200703b7afb4fc53b09164aa82c78fb3cbfd37e888ece192df64825a53beb8bd9c77e9343f9cae8fa2ea790718638e2b6fc0561b60461dcca4373d1be64592 SHA512 b8500567e2967bb21f6cf5dc9bf9d683ef494d940900815728e0188e75c9462c4c4cbd647c4ba22bef9be76e1bf2914d473a2606775bd2404dde0ef7f1f0c448
 MISC metadata.xml 437 BLAKE2B 57e3ea17650e5e927cd94e1750831dc60748f4bb46f00e4fae9a548a24a5d187636dffc4f095a60e28b7a1647000550ceb842af4c33ec7d1285a883deb1f194e SHA512 8d2c898901d0afd275acadf8c758d91a41bbd0692c7f311139f51cd6962c6ec95bd44e2d689f02fc59b8b9ce13fc28e78a7d0fafe7902f9816b09818e0b6b4c2
diff --git a/kde-apps/libkleo/files/libkleo-21.12.3-gcc-12.patch b/kde-apps/libkleo/files/libkleo-21.12.3-gcc-12.patch
new file mode 100644
index 000000000000..64a62e8bbd6c
--- /dev/null
+++ b/kde-apps/libkleo/files/libkleo-21.12.3-gcc-12.patch
@@ -0,0 +1,32 @@
+From f290218a6fd4e2b849875f6d465eaa861ec02aff Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Fri, 25 Mar 2022 14:40:37 +0100
+Subject: [PATCH] Include <iterator>.
+
+In order to fix:
+[   16s] /home/abuild/rpmbuild/BUILD/libkleo-21.12.3/src/kleo/keyserverconfig.cpp:73:44:   required from here
+[   16s] /home/abuild/rpmbuild/BUILD/libkleo-21.12.3/src/utils/algorithm.h:35:30: error: no matching function for call to 'begin(QStringList&)'
+[   16s]    35 |     std::transform(std::begin(c), std::end(c), std::begin(c), op);
+[   16s]       |                    ~~~~~~~~~~^~~
+
+The change is documented here:
+https://gcc.gnu.org/gcc-12/porting_to.html#header-dep-changes
+---
+ src/utils/algorithm.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/algorithm.h b/src/utils/algorithm.h
+index 6fb8669..1bcab2c 100644
+--- a/src/utils/algorithm.h
++++ b/src/utils/algorithm.h
+@@ -11,6 +11,7 @@
+ #pragma once
+ 
+ #include <algorithm>
++#include <iterator>
+ 
+ namespace Kleo
+ {
+-- 
+GitLab
+
diff --git a/kde-apps/libkleo/libkleo-21.12.3.ebuild b/kde-apps/libkleo/libkleo-21.12.3.ebuild
index 98950561d516..c7bbe591a38a 100644
--- a/kde-apps/libkleo/libkleo-21.12.3.ebuild
+++ b/kde-apps/libkleo/libkleo-21.12.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 "
 
+PATCHES=( "${FILESDIR}/${P}-gcc-12.patch" ) # bug 839921
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
diff --git a/kde-apps/libkleo/libkleo-21.08.3-r1.ebuild b/kde-apps/libkleo/libkleo-22.04.0.ebuild
index 7df3eca6ded6..392338639e98 100644
--- a/kde-apps/libkleo/libkleo-21.08.3-r1.ebuild
+++ b/kde-apps/libkleo/libkleo-22.04.0.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
+ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,7 +15,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
@@ -35,6 +36,8 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.12.3-gcc-12.patch" ) # bug 839921
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fancyviewer KF5PimTextEdit)