gentoo resync : 28.04.2021

4 files changed, 44 insertions, 10 deletions

diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index edd94370413d..28554c17a566 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,6 @@
-DIST juk-20.08.3.tar.xz 1997992 BLAKE2B 83a4df418e782067ac4b65ad89a7fe749870d8cab318ebe71a04d995b48be4bb442b03ead274de49c074cdc4320cf644ba7bed02c389d4788ca507403f236c6c SHA512 7e12689364b01c409f69547fd7a7b24149296c12dc8c9b8f4392932b15a24613ca6d92381bb37914c995610bfc618829646f0ca9d57883c8ad6e7957d29a2f3b
+AUX juk-21.04.0-missing-link.patch 821 BLAKE2B 2bc4ef72c25068a92bbc92c5c8dfa684e24c1eb83e4c6dfe574f8e968efa81ee9895759e64d1af4ae34eba7522c2fbee32800d02cc827a385db939c4837c30ab SHA512 d59aadb96449b3d531db5cf059d6c7d0dea6da73dfdaf6485e7d142039b3357f1efe7213356cd9035f34ccf26a221d28562633542cc56a79eb4b413c230152d5
 DIST juk-20.12.3.tar.xz 1997996 BLAKE2B 857defce1e5d089d711f7f70ca0077beec0267d576cb262536b79089622b32e53700d2c031430cdb63d7bf2a5c9eb8a67d5fc0aac64c0ccf2557835b15174f61 SHA512 3eca02446be784cc8d3dd68e7da146dfbe5ab7296d27ba78d0f15ce34b87183692d91ef01126aa97a9bc95a558e9af6b6bef47c0ba0a2f25fbeacda79285edc1
-EBUILD juk-20.08.3.ebuild 1276 BLAKE2B 5e773dc78f5a0dd21f0bcdc184534738ec80e901c21378cb262ac809a6688cc4f06d636f295242fb03527342bd12af5af87dca5ad533a24f90be227808fa9091 SHA512 409fcee3d8157988e58ca9fbab06202ba2d19a6b3f389910c52855da0ce2dfe7483d24fcddf3667af78a4e46bdbb0fc6510945366cc584e48ce010cb7505acd4
-EBUILD juk-20.12.3.ebuild 1279 BLAKE2B 34d18a519bf008fce7e25d13ea77cfeccbdd497eba009eef17e013cdaec843b6bd73e54858fe8d02bf1a832bc633ca09f3c9264028bd723038c01396e54f2acc SHA512 cf0731ee08efa8d35dd26fd7f1b6ebeb0697431d56b1ee642567b62e5a3d4c7d863192d709de17de0db3476955bed1c43f3141824661f8edfbfce6e171973bb6
+DIST juk-21.04.0.tar.xz 1993360 BLAKE2B 0c0a7e66791dbe378f08a0968e531709b932843a252ea8ba1fda85544ddb7e487deff92e82e03789d380a638ce88b15dbb3d35e17993be019ce75b89939803bc SHA512 9b5d009020f1749b2a0cc9ec97ba428dca8e244de2725ff826056b69db1bf6ad3b5cf1a10e0fb0925b73c3c019d1f2e57c3042b030053daa1f3dc5694aa75576
+EBUILD juk-20.12.3.ebuild 1276 BLAKE2B aa0093fac46bd9f94cdd89bdecaae34f61769d5ac4f934a85d95f658597b271b03d8e9f9ff1dd8e03710e66fafbfce289617c0c02e3b99e0b20ee7ea3fc6d89e SHA512 95add12b3bb0e2f622133d170100b4706c6f193ec93ec3345cb04fab9154786c20a887efe7edff2528f2bd418e462e9329964b068a2b1da659f2e9bfc90b8623
+EBUILD juk-21.04.0.ebuild 1379 BLAKE2B f8b19a492fa680b4820c5be9020ea3110bfe7bae3728a5c979a96d22f73d13b8ebf24a3f311fd4076450ac243c89d145d6afaad68778c2d6360ab70900d55737 SHA512 2637919faa288d7af2f0d2510f46643df445c05bccbdcd5fb4c39d8ce18e860172feb70e32f7606c0880d094aeb8a1d578dd03b3819f18fbc765eccb4351d369
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/files/juk-21.04.0-missing-link.patch b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
new file mode 100644
index 000000000000..cb59f81e83e4
--- /dev/null
+++ b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
@@ -0,0 +1,29 @@
+From c36b4aba0946b932f9da335e77295af2e31dff6d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:44:04 +0200
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
+
+This was working as long as it was implicitly provided by KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e30cfad6..f3413e6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,6 +162,7 @@ if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) )
+ endif()
+ 
+ target_link_libraries(juk ${LIBMATH}
++    Qt5::Concurrent
+     Qt5::Gui
+     Qt5::Svg
+     Qt5::Widgets
+-- 
+2.31.1
+
diff --git a/kde-apps/juk/juk-20.12.3.ebuild b/kde-apps/juk/juk-20.12.3.ebuild
index 11f7e929c8fe..d8c64bf2ba68 100644
--- a/kde-apps/juk/juk-20.12.3.ebuild
+++ b/kde-apps/juk/juk-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/juk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/juk/juk-20.08.3.ebuild b/kde-apps/juk/juk-21.04.0.ebuild
index 119da45e2d11..ade918bc4e55 100644
--- a/kde-apps/juk/juk-20.08.3.ebuild
+++ b/kde-apps/juk/juk-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="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Jukebox and music manager by KDE"
@@ -14,10 +14,10 @@ HOMEPAGE="https://apps.kde.org/en/juk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -43,4 +43,8 @@ DEPEND="
 	>=media-libs/phonon-4.11.0
 	>=media-libs/taglib-1.6
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-missing-link.patch" ) # bug 785418