gentoo resync : 28.04.2021

4 files changed, 39 insertions, 12 deletions

diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 00d49f1ad268..8aca35a6e18e 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,6 @@
-DIST palapeli-20.08.3.tar.xz 2078736 BLAKE2B a7e3c741c3f62803c289ae0e5b1558afef1ab7ea3de95120e6504da23a6a7d0850568c88e250942dec48a165ad71ff30324df82166387f37d710077c1c821520 SHA512 b9fc3113da2800fba3b65f2e593ed3b9b078b0defcbb0db7c8c11127f3f1d2c5776918aee96e4399a8c5436e6aff8a09de7bbc35b13e4910f7d4f612e5b42210
+AUX palapeli-21.04.0-bogus-dep.patch 650 BLAKE2B 6cf92efdaea5d69c0f5f10bf08160144cf2b9ff9af438f5e3e4b471c4f4a6cf09f850ff6e351c739120934ec9964e2f22b35b16563a95ba81e4626bf93240299 SHA512 ecd52dd3d8a93252d6f2418babad64a27fd2ae14c4f59759bf7c9a91a04dba3c6b7da8cb86158d915d3779ee65ebe324cd0fdfbd6fe5b918323fb7536121e9ff
 DIST palapeli-20.12.3.tar.xz 2078720 BLAKE2B 18952513649553814abf17d45580251057dfa528c7cf142382ad6c90eba5bab9227b1cdfe7c818bdc71b93cbee3b2cb28b74cb0241d74a893feafcf3ae6b7e44 SHA512 f26efc3e724afdaba0826495cb14f8aff913dc6a6922e6a4734bf4177f572ef286a5d5c2c0926e2804a3c7429b64b07ee8b48917272af0be018f023cd7ec6a02
-EBUILD palapeli-20.08.3.ebuild 1060 BLAKE2B c16b0760acb569bb0d1f36be0b9ee8774e602d0a70dbf8f106d64066591d06ca84ad8ce205090b8fd2ad0272cf5dae43b5458456274d3d49d074244970aee4a2 SHA512 1e0e44a0bb7810cc54e734c03cd8093063bc2e1dbc5b3c5b420bb8ed29768dac629a9af4b17cd07d829e2375ffd342c95b35e51fc01575da7ce3fa7e847c05a7
-EBUILD palapeli-20.12.3.ebuild 1063 BLAKE2B 743a1ec9a1f6bec8af8c0d194134c0f22e3a580fdc19d1c464f61396034c33eabb96e48f7c66c5067ba82c2cc0f9416ddfbefc6d553d8150a1d9da7437c877f4 SHA512 0952705e40faf98f172428481336b00c747ee98bb5f3bc32d4f8244c59a030d777002cc328e7d0ee5ca00c31b395fbdfdb4e6f233a6709b3a6ce7ff35b7545a3
+DIST palapeli-21.04.0.tar.xz 2076340 BLAKE2B b1989c7371ceb25e4fffaf5b1eceecd29e18482c65812f71de373a734df7a9760aaa68a179d614192e9b927febe34ace03d3a5b397eb1f81de33fffcfa6b8be2 SHA512 4792981b09d3e6b37e9231568a29197709dd90af459dd093df656571fab7b71647ec33e9b1355f6ee72a5fb41f89f6975bdc12860aa6915a711b41f8fbde9b44
+EBUILD palapeli-20.12.3.ebuild 1060 BLAKE2B 138c4bb85665cb5f3669d7c7ec29b67558a5fc65c071e67ec657ae3f4468156d4359c473d270660a93c55c24432ae3ada7c06afbb41d41461311da660386bae2 SHA512 61eef80bb44309f83613e157e1752ee08b581b883eaf86bacb5492bf5fca265bcace65e60e378ca8031f0e5a438fe979c97202e124b8fd4ff8842e692364b9fb
+EBUILD palapeli-21.04.0.ebuild 1099 BLAKE2B 606eae1b20bcda769b0e8a500a02570ad3215244328825a2108dcc49187b470f275a939be4924c9c5411a3b473e2378048742141bca7f6d699e930be2c752e66 SHA512 893d62ccdc72f6cf26505439fd7206280e24989bf311e9b3ee1e022b3c01db23a5273ce9ce251657dea29c5e6261569c91cebfb344fccd1c3534cface74f8d32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/files/palapeli-21.04.0-bogus-dep.patch b/kde-apps/palapeli/files/palapeli-21.04.0-bogus-dep.patch
new file mode 100644
index 000000000000..94b8a76f32f7
--- /dev/null
+++ b/kde-apps/palapeli/files/palapeli-21.04.0-bogus-dep.patch
@@ -0,0 +1,26 @@
+From 30ff07fd12c0767ed033e71d2226053115963401 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:34:37 +0200
+Subject: [PATCH] Drop bogus Qt5::Concurrent from target_link_libraries
+
+BUG: 436132
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 06607ea..349ac64 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,7 +63,6 @@ target_link_libraries(palapeli
+     KF5::WidgetsAddons
+     KF5::XmlGui
+     KF5KDEGames
+-    Qt5::Concurrent
+     Qt5::Svg
+ )
+ 
+-- 
+2.31.1
+
diff --git a/kde-apps/palapeli/palapeli-20.12.3.ebuild b/kde-apps/palapeli/palapeli-20.12.3.ebuild
index 70ae4859c9db..fce6ae814f22 100644
--- a/kde-apps/palapeli/palapeli-20.12.3.ebuild
+++ b/kde-apps/palapeli/palapeli-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/palapeli"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/palapeli/palapeli-20.08.3.ebuild b/kde-apps/palapeli/palapeli-21.04.0.ebuild
index d58ed88c51d4..4619490129b9 100644
--- a/kde-apps/palapeli/palapeli-20.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="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="Jigsaw puzzle game by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/palapeli"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -36,6 +36,6 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" ) # KDE-Bug #436132