gentoo resync : 22.05.2021

9 files changed, 58 insertions, 9 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 9e52a04310eb..51d27625382e 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 5419fc8fb7ab..aef73b4890e9 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
 DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52
 EBUILD bluedevil-5.20.5.ebuild 1186 BLAKE2B 7b169cb6e8a4599a2de5976e385acbedbdbd70e4cd21d1bf84cffa0cbfb89163fd5baaf8e41f1b418588c51ce04ed30eb601e63415c4b4ee443114510db49d21 SHA512 a42ed02515a3c4fccd8e61f8e4b652cefdad781b96f5b09ee669f42f49aa35340484c92be3a4c7d5f9b7396f54aa573c1c8503ae85bc11052d7ad53222cca9b4
-EBUILD bluedevil-5.21.5.ebuild 1189 BLAKE2B 3bc5ee2c362b2895e90db7393b2d57e34578c2ff7ddf1c27374fdc5f6d984caf379334e4c25039b751b0ab242203bc919610c7a321b3d14ccfb30a1bb9ee207b SHA512 87582cf0c98d60bdd72fb9dadb0d6d6f81736023a366e6902e0cb8d21f28db8376e06b1bca28454c5e97f829c9e05662026f8cf760f65ea7d56c09f5de0502a0
+EBUILD bluedevil-5.21.5-r1.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.21.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
index f8edeef6567c..abb2535daa5d 100644
--- a/kde-plasma/bluedevil/bluedevil-5.21.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
@@ -26,10 +26,8 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 26855f73744e..44972ba0e7fb 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,4 +1,5 @@
 AUX discover-5.20.5-CVE-2021-28117.patch 1434 BLAKE2B c31d0032cdfe3f8d96ad5e7f736c92c2dfcd6cc8e2b8c9b9e90a4a3d41159d961b80427d14ff6a22caa06e6dbdc17535be6243180d439e04879bbd957309859c SHA512 1059cce1be5f8f24a4345488c60decb2e4782fdc11f02ef625111164b6f8b32343528282ec4d03a015e36aa076cd6f9fcfa24e9b7d5c02fe25295cf03c7511a3
+AUX discover-5.21.4-missing-link.patch 2141 BLAKE2B 23b81f9f4e0daa05183ed3a31e98d8c1f3ac3ecfdb08511c3fb14bbf726a14086c5c834d3c7b7cc3f575500eb86f4cc85e141c48361597329a62c47c45807956 SHA512 f8201dad0e00e1a36338ab9dc956cd1baa7268ce4dd23c3d2b5a7ba9c9922da216697115396b7c32c3656faa60a107da62343af3b7a250d64e6d51c43768a9ae
 DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
 DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
 EBUILD discover-5.20.5-r1.ebuild 2217 BLAKE2B 41d5493274bf956d46e9719c4e174a145db849ea28650e1526935e3dd07ec7b8ef158c5d166712fedff439a4187f6e508ed34f1a5df615b9d827b9d7c03fbfdd SHA512 5b1e6e3721b21f2d927bb96c8f8cc89c5e87fec0f0271257f18be0fa72581710d4902c5163d3d7e9e5c29bc1d3a9154fd6927285fd54efa207ade598b786c757
diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
new file mode 100644
index 000000000000..c8c8b152ea7c
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
@@ -0,0 +1,49 @@
+From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 25 Apr 2021 00:26:12 +0200
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
+
+This was working as long as it was implicitly provided by KIO.
+Other backends are fine.
+
+Fixes:
+- DiscoverCommon w/ AppStreamQt
+- packagekit-backend
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ libdiscover/CMakeLists.txt                            | 2 +-
+ libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index 1097ea84..3e2a6c9c 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -48,7 +48,7 @@ if(TARGET AppStreamQt)
+         appstream/AppStreamIntegration.cpp
+         appstream/AppStreamUtils.cpp
+     )
+-    target_link_libraries(DiscoverCommon PRIVATE AppStreamQt)
++    target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt)
+ 
+     if(AppStreamQt_VERSION VERSION_GREATER 0.12.4)
+         target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1)
+diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+index cfeb38f1..466dbc49 100644
+--- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
++++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe
+ 
+ add_library(packagekit-backend MODULE ${packagekit-backend_SRCS})
+ 
+-target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
++target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
+ install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
+ 
+ if(TARGET PkgConfig::Markdown)
+-- 
+2.31.1
+
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index f899c7e2bdec..2bc23ce59433 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
 DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649
 EBUILD drkonqi-5.20.5.ebuild 1641 BLAKE2B 1c068c1e5fe42e91de3894219caffb74a2addd291be371aec836117c9fad9dcb12a15e850ad4412af13737ad1f7e2cb8dbc4f5a2676c340142e460401fe143f3 SHA512 490ea4d8560d4b7853345151ed17d3c9189a25cd34c08aa6d2df54556e477de12885b5c95ac04de928d5c059c066a7c0b01da8ab45d56fe51160e267caeb47ad
-EBUILD drkonqi-5.21.5.ebuild 1491 BLAKE2B 9804892270a7fd4078768c5ea3a20b10d304b07bc2593dc278d60e91cb7a8de347cf7ea93a79e24e96379a9287a20ae92ec370ab1f2f2551a7410d33845d8991 SHA512 bfcb65cadb75d8f1ec3eb66eac41b9280d21a62bdc1d0658453d14db0d952a83e127ad973cff3152e762d2927670fa9e58f6324933597a643d184a9a48e1567d
+EBUILD drkonqi-5.21.5-r1.ebuild 1517 BLAKE2B 673eb5d8b6e5155b1b21dd7432453a39ee555d23b8b6109702d56df08ed32a8426788eb5a544c6ecc74e51bc204bb96e2a50bceb626a818eb7ea5da0e3908985 SHA512 e977b5ee45fd2bf633e30e0c3d281c9b09201736858331412f0c56c1c423e6f0782383514b24193c914932e07ccfe84d0da1b44fca1d19484331330cbe1b1080
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.21.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
index 36714ea93ce8..f8b1658a7e54 100644
--- a/kde-plasma/drkonqi/drkonqi-5.21.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
@@ -42,7 +42,10 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	sys-devel/gdb
+	|| (
+		sys-devel/gdb
+		dev-util/lldb
+	)
 "
 
 src_configure() {
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index a4b59f086241..bd84e5c95771 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
 DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919
 EBUILD kmenuedit-5.20.5.ebuild 1096 BLAKE2B 32b74d2ce2e60b8629a3be5c0bc2c8371b230e3b9667210b77ba40740bb5cd2bd253ff15d6e984cb44c6ed3f13f0a420adf017bbc6ab5d381d2b206e5ee4c978 SHA512 2c4598f4ca19dd8a00b2ce25b7a9185464350ecdf882f98157a6efa98bdf9a6a790c0ca3eb75f374da614448fa1878ce4e088cfa0ea01a47e110f3b1f5cec5b8
-EBUILD kmenuedit-5.21.5.ebuild 1099 BLAKE2B 5dd56f9276a87666d0cdf90c999beb9a7e7ad6babe104e693d8f1e90579d39f0b742a1f9b714173537e44d04f8c232e923c673ed8985bcef647ce4dace0ddba3 SHA512 c394a3cda3bea28a0630a3119ac9f6d95487e66d18f36b7878ee1bfd7ce306dfeb83096550b072227a6e776d59aab67e0d57dd23ee61535c40d67d9153199d6b
+EBUILD kmenuedit-5.21.5.ebuild 1063 BLAKE2B 65fceb6567d6b45683853093c7d8c4cb61d8128bf40842126abeca938d6b57ab19c11c0f9281b680814190a63e0f77e0a90f3f4317c6201f4d7e0017ab10dd4d SHA512 6d21d92d3d0ff806b37326706d163b97eaf66b7f67813f9c082662e74bbbd67037cb3984b6afeee84ca80395a7bc4488e1dd478c3a5e6ee0b5d42c20538b1c39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
index 5a1b40c74930..b295b218730f 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
@@ -36,6 +36,4 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"