kde-kf5: upgrade 5.73.0 -> 5.76.0

License crusaders striked back. Am quite sure that licenses set are incorrect but: * asked this - no response [1] * this has been huge efford already and I am close to discontinue KDE in favour of wasting further time [1] https://mail.kde.org/pipermail/kde-core-devel/2020-September/090948.html Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-21 17:09:22 +01:00
parent 385f71cf54
commit 05574da7c5
86 changed files with 603 additions and 320 deletions
--- a/classes/kde-kf5.bbclass
+++ b/classes/kde-kf5.bbclass
@@ -1,6 +1,6 @@
 inherit kde-base

-KF5_VERSION = "5.73.0"
+KF5_VERSION = "5.76.0"

 def kde_verdir(v):
    return oe.utils.trim_version(v, 2)
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
+++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5-porting-aids perlnative

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5"
+SRC_URI[sha256sum] = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a"
 SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch"

 DEPENDS += " \
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch
@@ -11,15 +11,15 @@ Upstream-Status: Inappropriate [cross-specific]
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

 ---
- CMakeLists.txt                |  29 +-----
- src/CMakeLists.txt            | 200 +-----------------------------------------
- src/kdecore/kglobal.cpp       |  18 ----
+ CMakeLists.txt                |  30 +----
+ src/CMakeLists.txt            | 200 +---------------------------------
+ src/kdecore/kglobal.cpp       |  18 ---
 src/kdecore/klocale_kde.cpp   |   4 -
 src/kdecore/kstandarddirs.cpp |   1 -
- 5 files changed, 4 insertions(+), 248 deletions(-)
+ 5 files changed, 4 insertions(+), 249 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 74b8066..b8edca7 100644
+index 5dd56c6..7e4864b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -20,30 +20,11 @@ include(GenerateExportHeader)
@@ -64,7 +64,7 @@ index 74b8066..b8edca7 100644
 endif ()
 if (APPLE)
     cmake_find_frameworks(CoreFoundation)
-@@ -154,13 +133,8 @@ install(
+@@ -156,13 +135,8 @@ install(
 
 
 
@@ -79,7 +79,7 @@ index 74b8066..b8edca7 100644
 
 if (BUILD_TESTING)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ab0b246..0751644 100644
+index b249bd5..95fd86c 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
@@ -1,6 +1,4 @@
@@ -291,7 +291,7 @@ index ab0b246..0751644 100644
 check_function_exists(mmap HAVE_MMAP)
 check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE)
 configure_file(config-kdelibs4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdelibs4support.h )
-@@ -315,32 +160,12 @@ endif()
+@@ -318,32 +163,12 @@ endif()
 
 target_link_libraries(KF5KDELibs4Support
 PUBLIC
@@ -324,7 +324,7 @@ index ab0b246..0751644 100644
    ${platformLinkLibraries}
 )
 
-@@ -368,27 +193,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
+@@ -371,27 +196,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
 )
 
 
@@ -353,20 +353,19 @@ index ab0b246..0751644 100644
 
 install(TARGETS KF5KDELibs4Support
 diff --git a/src/kdecore/kglobal.cpp b/src/kdecore/kglobal.cpp
-index ac3daa6..2dcafe2 100644
+index 8403437..e65a99f 100644
 --- a/src/kdecore/kglobal.cpp
 +++ b/src/kdecore/kglobal.cpp
-@@ -42,7 +42,6 @@
+@@ -41,21 +41,18 @@
+ #include <k4aboutdata.h>
 #include <kconfig.h>
- #include <klocale.h>
 #include <klocalizedstring.h>
 -#include <kcharsets.h>
 #include "kstandarddirs.h"
 #include <kcomponentdata.h>
 #undef QT_NO_TRANSLATION
-@@ -50,14 +49,12 @@
+ #include <QCoreApplication>
 #define QT_NO_TRANSLATION
- #include <QDebug>
 #include <QTextCodec>
 -#include <unistd.h> // umask
 
@@ -379,7 +378,7 @@ index ac3daa6..2dcafe2 100644
 
 class KGlobalPrivate
 {
-@@ -66,10 +63,6 @@ public:
+@@ -64,10 +61,6 @@ public:
         : dirs(nullptr),
           stringDict(nullptr)
     {
@@ -390,7 +389,7 @@ index ac3daa6..2dcafe2 100644
     }
 
     inline ~KGlobalPrivate()
-@@ -126,17 +119,6 @@ bool KGlobal::hasLocale()
+@@ -124,17 +117,6 @@ bool KGlobal::hasLocale()
     return QCoreApplication::instance() != nullptr;
 }
 
@@ -409,7 +408,7 @@ index ac3daa6..2dcafe2 100644
 {
     return KComponentData::activeComponent();
 diff --git a/src/kdecore/klocale_kde.cpp b/src/kdecore/klocale_kde.cpp
-index dd58c73..c66bd48 100644
+index 5a46421..9479b75 100644
 --- a/src/kdecore/klocale_kde.cpp
 +++ b/src/kdecore/klocale_kde.cpp
@@ -42,7 +42,6 @@
@@ -431,7 +430,7 @@ index dd58c73..c66bd48 100644
     QString calendarType;
     readConfigEntry("CalendarSystem", "gregorian", calendarType);
 diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp
-index f366c9d..e5ded7f 100644
+index 23064a9..c5fdc4b 100644
 --- a/src/kdecore/kstandarddirs.cpp
 +++ b/src/kdecore/kstandarddirs.cpp
@@ -35,7 +35,6 @@
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5-porting-aids perlnative

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b"
+SRC_URI[sha256sum] = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d"

 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

--- a/recipes-kde/kf5/porting-aids-tier3/kdesignerplugin/kdesignerplugin.inc
+++ b/recipes-kde/kf5/porting-aids-tier3/kdesignerplugin/kdesignerplugin.inc
@@ -7,4 +7,4 @@ inherit kde-kf5-porting-aids
 DEPENDS += "qttools kcoreaddons kconfig kdoctools"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2"
+SRC_URI[sha256sum] = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71"
--- a/recipes-kde/kf5/porting-aids-tier3/kdewebkit/kdewebkit.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdewebkit/kdewebkit.bb
@@ -20,6 +20,6 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b"
+SRC_URI[sha256sum] = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba"

 FILES_${PN} += "${libdir}/plugins"
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -37,7 +37,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262"
+SRC_URI[sha256sum] = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4"

 do_compile_append() {
    # gperf-native sets absolut debug comments/links in header
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -16,4 +16,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3"
+SRC_URI[sha256sum] = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88"
--- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
@@ -25,7 +25,7 @@ DEPENDS += "\
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e"
+SRC_URI[sha256sum] = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291"

 FILES_${PN} += " \
    ${OE_QMAKE_PATH_PLUGINS} \
--- a/recipes-kde/kf5/porting-aids-tier3/kxmlrpcclient/kxmlrpcclient.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kxmlrpcclient/kxmlrpcclient.bb
@@ -1,7 +1,8 @@
 SUMMARY = "Interaction with XMLRPC services"
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.BSD;md5=5c262c13b60ebefe3060aed37d334ab6 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5-porting-aids gettext
@@ -9,4 +10,4 @@ inherit kde-kf5-porting-aids gettext
 DEPENDS += "ki18n kio kcoreaddons-native kconfig-native kauth-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047"
+SRC_URI[sha256sum] = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de"
--- a/recipes-kde/kf5/tier1/attica/attica.bb
+++ b/recipes-kde/kf5/tier1/attica/attica.bb
@@ -1,11 +1,13 @@
 SUMMARY = "Open Collaboration Services API"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=be254b9345b1c2ff33e1a6a96768f2fb \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5

-SRC_URI[sha256sum] = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a"
+SRC_URI[sha256sum] = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22"

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
+++ b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
@@ -1,13 +1,17 @@
 SUMMARY = "Qt wrapper for BlueZ 5 DBus AP"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "LGPLv2.1 & LGPLv2.1+ & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"

 inherit kde-kf5

 DEPENDS += "qtdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4"
+SRC_URI[sha256sum] = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835"

 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

--- a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc
+++ b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5 gtk-icon-cache

-SRC_URI[sha256sum] = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b"
+SRC_URI[sha256sum] = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b"
 SRC_URI += "file://0001-Force-build-of-Qt-binary-resource-files.patch"

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier1/karchive/karchive.inc
+++ b/recipes-kde/kf5/tier1/karchive/karchive.inc
@@ -1,8 +1,10 @@
 SUMMARY = "Qt 5 addon providing access to numerous types of archives"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "BSD-2-Clause & LGPLv2.0 & LGPLv2.0+ & LGPLv3+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -10,6 +12,6 @@ inherit kde-kf5
 DEPENDS += "bzip2 xz zlib"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f"
+SRC_URI[sha256sum] = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a"

 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
--- a/recipes-kde/kf5/tier1/kcalendarcore/kcalendarcore.bb
+++ b/recipes-kde/kf5/tier1/kcalendarcore/kcalendarcore.bb
@@ -1,7 +1,9 @@
 SUMMARY = "Library for Interfacing with Calendars"
-LICENSE = "LGPLv2"
+LICENSE = "BSD-3-Clause & LGPLv2.0+ & LGPLv3+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=c2d143c0ce3f53108f9725bcd58abf25 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -9,4 +11,4 @@ inherit kde-kf5
 DEPENDS += "libical"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713"
+SRC_URI[sha256sum] = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae"
--- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
+++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
@@ -1,8 +1,13 @@
 SUMMARY = "KDE Text encoding library"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "BSD-3-Clause & GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1+ & LGPLv3 & MIT & MPL-1.1"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+    file://LICENSES/MPL-1.1.txt;md5=bf952b9d390406a3cda9fb3fe9df72af \
 "

 inherit kde-kf5
@@ -10,7 +15,7 @@ inherit kde-kf5
 DEPENDS += "gperf-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67"
+SRC_URI[sha256sum] = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1"

 do_compile_append() {
    # gperf-native sets absolut debug comments/links in header
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc
@@ -1,13 +1,20 @@
 SUMMARY = "KDE configuration system"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3 & MIT"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5 cmake_lib

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e"
+SRC_URI[sha256sum] = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686"

 # REVISIT remove ugly hack for wayland-only environments
 SRC_URI += "file://0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch"
--- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
+++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
@@ -1,10 +1,22 @@
 SUMMARY = "Addons to QtCore"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & CC0-1.0 & GPLv2.0 & GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3 & MPL-1.1 & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MPL-1.1.txt;md5=bf952b9d390406a3cda9fb3fe9df72af \
+    file://LICENSES/Qt-LGPL-exception-1.1.txt;md5=38d22f987f077611a625f5729dd0fd39 \
 "

 inherit kde-kf5 mime

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51"
+SRC_URI[sha256sum] = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6"
--- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
+++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Addons to QtDBus"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -11,4 +14,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba"
+SRC_URI[sha256sum] = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a"
--- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
+++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Abstraction to system DNSSD features"
-LICENSE = "MIT & LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-	file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5
@@ -10,4 +10,4 @@ inherit kde-kf5
 DEPENDS += "avahi"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d"
+SRC_URI[sha256sum] = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753"
--- a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
+++ b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
@@ -1,8 +1,12 @@
 SUMMARY = "Addons to QtGui"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "GPLv2.0 & GPLv3.0 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -12,4 +16,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350"
+SRC_URI[sha256sum] = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125"
--- a/recipes-kde/kf5/tier1/kholidays/kholidays.bb
+++ b/recipes-kde/kf5/tier1/kholidays/kholidays.bb
@@ -1,12 +1,15 @@
 SUMMARY = "Library to assist determining when holidays occur"
-LICENSE = "LGPLv2.1"
+LICENSE = "Bison-exception-2.2 & BSD-2-Clause & GPLv3+ & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/Bison-exception-2.2.txt;md5=fe1adebe74bce848e36673c70d09e755 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5

-SRC_URI[sha256sum] = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab"
+SRC_URI[sha256sum] = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b"

 PV = "${KF5_VERSION}"

--- a/recipes-kde/kf5/tier1/ki18n/ki18n.inc
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.inc
@@ -1,11 +1,13 @@
 SUMMARY = "Advanced internationalization framework"
-LICENSE = "BSD & LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0+  & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689"
+SRC_URI[sha256sum] = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a"
--- a/recipes-kde/kf5/tier1/kidletime/kidletime.bb
+++ b/recipes-kde/kf5/tier1/kidletime/kidletime.bb
@@ -1,8 +1,9 @@
 SUMMARY = "Monitoring user activity"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0 & MIT"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5
@@ -10,6 +11,6 @@ inherit kde-kf5
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras libxscrnsaver", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2"
+SRC_URI[sha256sum] = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
--- a/recipes-kde/kf5/tier1/kirigami/kirigami2.bb
+++ b/recipes-kde/kf5/tier1/kirigami/kirigami2.bb
@@ -1,6 +1,8 @@
 SUMMARY = "QtQuick plugins to build user interfaces based on the KDE UX guidelines"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+"

 inherit kde-kf5

@@ -13,7 +15,7 @@ DEPENDS += " \

 PV = "${KF5_VERSION}"

-SRC_URI[sha256sum] = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb"
+SRC_URI[sha256sum] = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a"

 FILES_${PN} += " \
    ${datadir}/kdevappwizard \
--- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
+++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
@@ -1,7 +1,9 @@
 SUMMARY = "Models for Qt Model/View system"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "

 inherit kde-kf5
@@ -9,6 +11,6 @@ inherit kde-kf5
 DEPENDS += "qtdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371"
+SRC_URI[sha256sum] = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0"

 FILES_${PN} += "${OE_QMAKE_PATH_QML}"
--- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
+++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
@@ -1,8 +1,9 @@
 SUMMARY = "Widget addons for Qt Model/View"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0 & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5
@@ -10,6 +11,6 @@ inherit kde-kf5
 DEPENDS += "qttools"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727"
+SRC_URI[sha256sum] = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
--- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb
+++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
@@ -1,11 +1,14 @@
 SUMMARY = "Lightweight plotting framework"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "GPLv2.0+ & LGPLv2.0+"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+"

 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14"
+SRC_URI[sha256sum] = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e"

 DEPENDS += "qttools"

--- a/recipes-kde/kf5/tier1/kquickcharts/kquickcharts.bb
+++ b/recipes-kde/kf5/tier1/kquickcharts/kquickcharts.bb
@@ -1,12 +1,16 @@
 SUMMARY = "A QtQuick module providing high-performance charts"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12547d25b034355eba3018eb0d9be513"
+LICENSE = "LGPLv2.1 & LGPLv3 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+"

 inherit kde-kf5

 DEPENDS += "qtquickcontrols2"

-SRC_URI[sha256sum] = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe"
+SRC_URI[sha256sum] = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2"

 PV = "${KF5_VERSION}"

--- a/recipes-kde/kf5/tier1/kwayland/kwayland.bb
+++ b/recipes-kde/kf5/tier1/kwayland/kwayland.bb
@@ -1,6 +1,13 @@
 SUMMARY = "KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "BSD-3-Clause & LGPLv2.1 & LGPLv2.1+ & LGPLv3 & MIT & MIT-CMU"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+    file://LICENSES/MIT-CMU.txt;md5=b6936b5be2ab721140d9bf57c37b0b92 \
+"

 inherit kde-kf5

@@ -11,4 +18,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe"
+SRC_URI[sha256sum] = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7"
--- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
+++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
@@ -1,8 +1,14 @@
 SUMMARY = "Addons to QtWidgets"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "BSD-3-Clause & GPLv2.0 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3 & LGPLv3+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -10,6 +16,6 @@ inherit kde-kf5
 DEPENDS += "qttools"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6"
+SRC_URI[sha256sum] = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -1,13 +1,18 @@
 SUMMARY = "Access to the windowing system"
-LICENSE = "GPLv2 | LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "LGPLv2.1 & LGPLv2.1+ & LGPLv3 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+"

 inherit kde-kf5

 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxrender libxfixes libxfixes-native", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8"
+SRC_URI[sha256sum] = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7"

 do_configure_append() {
    # remove absolute paths from exported cmake files
--- a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
@@ -1,13 +1,19 @@
 SUMMARY = "Qt wrapper for ModemManager API"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "BSD-3-Clause & GPLv2.0 & GPLv3 & LGPLv2.1 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"

 inherit kde-kf5 pkgconfig

 DEPENDS += "modemmanager"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd"
+SRC_URI[sha256sum] = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1"

 do_configure_append() {
    # remove absolute paths from exported cmake files
--- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
@@ -1,13 +1,18 @@
 SUMMARY = "Qt wrapper for NetworkManager API"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "BSD-3-Clause & GPLv2.0 & LGPLv2.1 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"

 inherit kde-kf5 pkgconfig

 DEPENDS += "networkmanager"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f"
+SRC_URI[sha256sum] = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90"

 do_configure_append() {
    # remove absolute paths from exported cmake files
--- a/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb
+++ b/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5 gtk-icon-cache

-SRC_URI[sha256sum] = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc"
+SRC_URI[sha256sum] = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1"

 PV = "${KF5_VERSION}"

--- a/recipes-kde/kf5/tier1/prison/prison.bb
+++ b/recipes-kde/kf5/tier1/prison/prison.bb
@@ -1,7 +1,8 @@
 SUMMARY = "Barcode abstraction layer"
-LICENSE = "MIT"
+LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=02744127548d68b579a51bda5af08e2b \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5
@@ -11,6 +12,6 @@ DEPENDS += " \
    libdmtx \
 "

-SRC_URI[sha256sum] = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87"
+SRC_URI[sha256sum] = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78"

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier1/solid/solid.bb
+++ b/recipes-kde/kf5/tier1/solid/solid.bb
@@ -1,7 +1,11 @@
 SUMMARY = "Hardware integration and detection"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0 & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -9,7 +13,7 @@ inherit kde-kf5
 DEPENDS += "bison-native qtdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933"
+SRC_URI[sha256sum] = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d"

 FILES_${PN} += "${OE_QMAKE_PATH_QML}"

--- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc
@@ -1,8 +1,12 @@
 SUMMARY = "Support for spellchecking"
-LICENSE = "GPLv2 | LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "BSD-3-Clause & LGPLv2.0+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+"

 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c"
+SRC_URI[sha256sum] = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b"
--- a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc
+++ b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc
@@ -1,11 +1,15 @@
 SUMMARY = "Syntax highlighting Engine for Structured Text and Code"
-LICENSE = "MIT"
+LICENSE = "GPLv2.0 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1+ & MIT"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=61be4d272e55cc2609d58596cf084908 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5 perlnative

-SRC_URI[sha256sum] = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b"
+SRC_URI[sha256sum] = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3"

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
+++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38"
+SRC_URI[sha256sum] = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039"
--- a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb
+++ b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb
@@ -1,9 +1,13 @@
 SUMMARY = "A library for accessing the usage data collected by the activities system"
-LICENSE = "LGPLv2+"
+LICENSE = "GPLv2.0 & GPLv2.0+ & GPLv3 & LGPLv2.0+ & LGPLv2.1 & LGPLv3 & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-	file://COPYING.LGPL-2.1;md5=4fbd65380cdd255951079008b364516c \
-	file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/Qt-LGPL-exception-1.1.txt;md5=38d22f987f077611a625f5729dd0fd39 \
 "

 inherit kde-kf5
@@ -20,4 +24,4 @@ DEPENDS += " \
 CXXFLAGS += "-DBOOST_DISABLE_ASSERTS"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a"
+SRC_URI[sha256sum] = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14"
--- a/recipes-kde/kf5/tier2/kauth/files/0001-Force-build-of-kauth-policy-gen-for-native-build.patch
+++ b/recipes-kde/kf5/tier2/kauth/files/0001-Force-build-of-kauth-policy-gen-for-native-build.patch
@@ -40,8 +40,8 @@ diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
 index ee9ec0c..f4443f6 100644
 --- a/src/ConfigureChecks.cmake
 +++ b/src/ConfigureChecks.cmake
-@@ -131,16 +131,10 @@ set(KAUTH_POLICY_GEN_SRCS
-     policy-gen/policy-gen.cpp )
+@@ -127,16 +127,10 @@ set(KAUTH_POLICY_GEN_SRCS
+     policy-gen/policy-gen.cpp)
 set(KAUTH_POLICY_GEN_LIBRARIES)
 
 -if(KAUTH_BACKEND_NAME STREQUAL "OSX")
@@ -50,12 +50,12 @@ index ee9ec0c..f4443f6 100644
 -   set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} ${CORE_FOUNDATION_LIBRARY} ${SECURITY_LIBRARY} Qt5::Core)
 -elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1")
 -  set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
-      backends/polkit-1/kauth-policy-gen-polkit1.cpp )
+-      backends/polkit-1/kauth-policy-gen-polkit1.cpp)
 -  set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES}
 -      Qt5::Core)
 -endif()
 +set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
-+    backends/polkit-1/kauth-policy-gen-polkit1.cpp )
+    backends/polkit-1/kauth-policy-gen-polkit1.cpp)
 +set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES}
 +    Qt5::Core)
 
--- a/recipes-kde/kf5/tier2/kauth/kauth.inc
+++ b/recipes-kde/kf5/tier2/kauth/kauth.inc
@@ -1,12 +1,14 @@
 SUMMARY = "Abstraction to system policy and authentication features"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "

 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9"
+SRC_URI[sha256sum] = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89"

 EXTRA_OECMAKE += "-DAUTOTESTS=OFF"
--- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
+++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
@@ -1,7 +1,9 @@
 SUMMARY = "Text completion helpers and widgets"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "

 inherit kde-kf5
@@ -9,6 +11,6 @@ inherit kde-kf5
 DEPENDS += "kconfig kconfig-native kwidgetsaddons"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a"
+SRC_URI[sha256sum] = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
--- a/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb
+++ b/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb
@@ -1,6 +1,11 @@
-SUMMARY = "ibrary for working with contact information"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+SUMMARY = "Library for working with contact information"
+LICENSE = "BSD-3-Clause & LGPLv2.0+ & MIT & Unicode-DFS-2016"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+    file://LICENSES/Unicode-DFS-2016.txt;md5=3daac258519ec32945c80ae0f7ba88f4 \
+"

 inherit kde-kf5 gettext features_check

@@ -16,4 +21,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb"
+SRC_URI[sha256sum] = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5"
--- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb
+++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Support for application crash analysis and bug report from apps"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5 features_check
@@ -11,4 +11,4 @@ REQUIRED_DISTRO_FEATURES = "x11"
 DEPENDS += "kcoreaddons kcoreaddons-native kwindowsystem virtual/libx11"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583"
+SRC_URI[sha256sum] = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993"
--- a/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch
+++ b/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch
@@ -14,13 +14,13 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 5 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7e1a343..362c9b7 100644
+index 9a7440f..7d294be 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -96,12 +96,7 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DocTools")
 add_definitions(-DTRANSLATION_DOMAIN=\"kdoctools5\")
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
- add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054700)
+ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054B00)
 -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po" AND KF5I18n_FOUND)
 -    ki18n_install(po)
 -    kdoctools_install(po)
@@ -31,5 +31,5 @@ index 7e1a343..362c9b7 100644
 if (BUILD_TESTING)
     add_subdirectory(autotests)
 -- 
-2.21.3
+2.26.2

--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
@@ -1,8 +1,11 @@
 SUMMARY = "Documentation generation from docbook"
-LICENSE = "MIT | LGPLv2.1"
+LICENSE = "BSD-3-Clause & GPLv2+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-	file://LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 perlnative
@@ -11,7 +14,7 @@ inherit kde-kf5 perlnative
 DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets liburi-perl-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d"
+SRC_URI[sha256sum] = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4"

 # allarch packages do only install into machine sysroot
 # for xml4
--- a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
@@ -1,15 +1,16 @@
 SUMMARY = "A file metadata and text extraction library"
-LICENSE = "MIT & LGPLv2+"
+LICENSE = "BSD-3-Clause & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-	file://COPYING.LGPL-2.1;md5=4fbd65380cdd255951079008b364516c \
-	file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 pkgconfig gettext

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894"
+SRC_URI[sha256sum] = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68"

 # TODO: optionals PACKAGECONFIG (poppler-qt5 / exiv2 / ffmpeg / epub)
 DEPENDS += " \
--- a/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb
+++ b/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Image format plugins for Qt"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -12,7 +15,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b"
+SRC_URI[sha256sum] = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d"

 FILES_${PN} += " \
    ${OE_QMAKE_PATH_PLUGINS} \
--- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
+++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
@@ -1,7 +1,9 @@
 SUMMARY = "Widgets for tracking KJob instances"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0 & LGPLv2.0+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -10,6 +12,6 @@ DEPENDS += "kcoreaddons kcoreaddons-native kwidgetsaddons \
            ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf"
+SRC_URI[sha256sum] = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf"

 FILES_${PN} += "${datadir}/dbus-1"
--- a/recipes-kde/kf5/tier2/knotifications/knotifications.bb
+++ b/recipes-kde/kf5/tier2/knotifications/knotifications.bb
@@ -1,8 +1,11 @@
 SUMMARY = "Abstraction for system notifications"
-LICENSE = "MIT & LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-	file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -22,6 +25,6 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c"
+SRC_URI[sha256sum] = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2"

 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/kservicetypes5"
--- a/recipes-kde/kf5/tier2/kpackage/kpackage.inc
+++ b/recipes-kde/kf5/tier2/kpackage/kpackage.inc
@@ -1,13 +1,13 @@
 SUMMARY = "Library to load and install packages of non binary files as they were a plugin"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f"
+SRC_URI[sha256sum] = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772"

 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
--- a/recipes-kde/kf5/tier2/kpty/kpty.bb
+++ b/recipes-kde/kf5/tier2/kpty/kpty.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Pty abstraction"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "GPLv2.0 & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5 gettext
@@ -10,4 +10,4 @@ inherit kde-kf5 gettext
 DEPENDS += "kcoreaddons kcoreaddons-native ki18n"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c"
+SRC_URI[sha256sum] = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7"
--- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
+++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
@@ -1,10 +1,12 @@
 SUMMARY = "Support for unit conversion"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "LGPLv2.0+"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+"

 inherit kde-kf5 gettext

 DEPENDS += "ki18n"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935"
+SRC_URI[sha256sum] = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c"
--- a/recipes-kde/kf5/tier2/syndication/syndication.bb
+++ b/recipes-kde/kf5/tier2/syndication/syndication.bb
@@ -1,7 +1,9 @@
 SUMMARY = "Syndication Library"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-2-Clause & GPLv2.0+ & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5 features_check
@@ -11,5 +13,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 DEPENDS += " \
    kcodecs \
 "
+
 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954"
+SRC_URI[sha256sum] = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292"
--- a/recipes-kde/kf5/tier3/baloo/baloo.bb
+++ b/recipes-kde/kf5/tier3/baloo/baloo.bb
@@ -1,8 +1,15 @@
 SUMMARY = "Baloo provides searching and indexing infrastucture with an emphasis on files"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "BSD-3-Clause & bzip2-1.0.6 & GPLv2.0 & GPLv2.0+ & GPLv3 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/bzip2-1.0.6.txt;md5=f1d2fdc6b1d232981a8007aa1854d24d \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gtk-icon-cache
@@ -25,10 +32,9 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe"
+SRC_URI[sha256sum] = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9"

 SRC_URI += " \
-    file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \
    file://baloo_file.desktop \
 "

--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -1,19 +1,35 @@
 SUMMARY = "Runtime and library to organize the user work in separate activities"
-LICENSE = "GPLv2 & LGPLv2+"
+LICENSE = "GPLv2.0+ & LGPLv2.0+ & LGPLv2.1 & LGPLv3 & MIT"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5

-DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui \
-            kio kdbusaddons kdeclarative kcmutils kconfig-native kcoreaddons-native \
-            kauth-native"
+DEPENDS += " \
+    boost \
+    kconfig-native \
+    kcoreaddons-native \
+    kauth-native \
+    kconfig \
+    kcoreaddons \
+    ki18n \
+    kservice \
+    kwindowsystem \
+    kglobalaccel \
+    kxmlgui \
+    kio \
+    kdbusaddons \
+    kdeclarative \
+    kcmutils \
+"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a"
+SRC_URI[sha256sum] = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422"

 do_compile_prepend() {
    # Error: Could not locate service type file kservicetypes5/ "kfileitemactionplugin.desktop" , tried ...
--- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
+++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Support for bookmarks and the XBEL format"
-LICENSE = "LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -10,4 +13,4 @@ DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui kconfig-native kcoreaddon
            kauth-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51"
+SRC_URI[sha256sum] = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af"
--- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
+++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
@@ -1,15 +1,30 @@
 SUMMARY = "Utilities for working with KCModules"
-LICENSE = "LGPLv2.1"
+LICENSE = "GPLv2.0 & GPLv3 & LGPLv2.0 & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5 gettext

-DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui \
-            kdeclarative kcoreaddons-native kauth-native kconfig-native kpackage-native"
+DEPENDS += " \
+    kcoreaddons-native \
+    kauth-native \
+    kconfig-native \
+    kpackage-native \
+    kitemviews \
+    kconfigwidgets \
+    kcoreaddons \
+    ki18n \
+    kiconthemes \
+    kservice \
+    kxmlgui \
+    kdeclarative \
+"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9"
+SRC_URI[sha256sum] = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009"

 FILES_${PN} += "${datadir}/kservicetypes5"
--- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
+++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
@@ -1,7 +1,13 @@
 SUMMARY = "Widgets for configuration dialog"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-3-Clause & GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3 & MIT"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5
@@ -11,7 +17,7 @@ DEPENDS += "kauth kconfig kcodecs kguiaddons kwidgetsaddons kdoctools \
            gettext-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e"
+SRC_URI[sha256sum] = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"

--- a/recipes-kde/kf5/tier3/kdav/kdav.bb
+++ b/recipes-kde/kf5/tier3/kdav/kdav.bb
@@ -1,8 +1,8 @@
 SUMMARY = "DAV protocol implementation with KJobs"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=e673a95e6911049cc1cadf00eac1f759 \
-    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5 gettext
@@ -17,4 +17,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31"
+SRC_URI[sha256sum] = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72"
--- a/recipes-kde/kf5/tier3/kdeclarative/files/0001-kpackagelauncherqml-Add-include-of-QDebug.patch
+++ b/recipes-kde/kf5/tier3/kdeclarative/files/0001-kpackagelauncherqml-Add-include-of-QDebug.patch
@@ -20,11 +20,11 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 1 file changed, 1 insertion(+)

 diff --git a/src/kpackagelauncherqml/main.cpp b/src/kpackagelauncherqml/main.cpp
-index 79e3fa1..3adf2d1 100644
+index 2f2c0d9..2ffcf17 100644
 --- a/src/kpackagelauncherqml/main.cpp
 +++ b/src/kpackagelauncherqml/main.cpp
-@@ -18,6 +18,7 @@
-  */
+@@ -5,6 +5,7 @@
+ */
 
 #include <QApplication>
 +#include <QDebug>
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -1,7 +1,16 @@
 SUMMARY = "Provides integration of QML and KDE Frameworks"
-LICENSE = "LGPLv2.1+"
+LICENSE = "GPLv2.0 & GPLv2.0+ & GPLv3 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3 & MIT & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+    file://LICENSES/Qt-LGPL-exception-1.1.txt;md5=38d22f987f077611a625f5729dd0fd39 \
 "

 inherit kde-kf5
@@ -16,6 +25,6 @@ SRC_URI += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598"
+SRC_URI[sha256sum] = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3"

 FILES_${PN} += "${OE_QMAKE_PATH_QML}/org/kde"
--- a/recipes-kde/kf5/tier3/kded/kded.bb
+++ b/recipes-kde/kf5/tier3/kded/kded.bb
@@ -1,7 +1,8 @@
 SUMMARY = "Extensible deamon for providing system level services"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0 & LGPLv2.0+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "

 inherit kde-kf5
@@ -17,7 +18,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895"
+SRC_URI[sha256sum] = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516"
 SRC_URI += "file://0001-hardcode-path-to-kconf_update.patch"

 FILES_${PN} += " \
--- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb
+++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Integration with su for elevated privileges"
-LICENSE = "LGPLv2.1"
+LICENSE = "GPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gettext
@@ -16,4 +19,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d"
+SRC_URI[sha256sum] = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642"
--- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
+++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
@@ -1,8 +1,11 @@
 SUMMARY = "Support for emoticons and emoticons themes"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "CC-BY-SA-4.0 & GPLv2.0+ & LGPLv2.0 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/CC-BY-4.0.txt;md5=28bacf04b75cbad10cb7871e0b063188 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gettext
@@ -10,7 +13,7 @@ inherit kde-kf5 gettext
 DEPENDS += "karchive kconfig kconfig-native kservice kcoreaddons kcoreaddons-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778"
+SRC_URI[sha256sum] = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99"

 FILES_${PN} += " \
    ${datadir}/emoticons \
--- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
+++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Add support for global workspace shortcuts"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -16,10 +19,11 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f"
+SRC_URI[sha256sum] = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4"

 FILES_${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/kservices5 \
+    ${systemd_user_unitdir} \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
--- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
+++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
@@ -1,15 +1,30 @@
 SUMMARY = "Support for icon themes"
-LICENSE = "LGPLv2.1"
+LICENSE = "GPLv2.0 & GPLv3 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3.0"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5

-DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews gettext-native \
-            kcoreaddons-native kauth-native kconfig-native"
+DEPENDS += " \
+    gettext-native \
+    kcoreaddons-native \
+    kauth-native \
+    kconfig-native \
+    qtsvg \
+    ki18n \
+    kconfig \
+    kconfigwidgets \
+    kwidgetsaddons \
+    kitemviews \
+"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356"
+SRC_URI[sha256sum] = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
--- a/recipes-kde/kf5/tier3/kinit/kinit.bb
+++ b/recipes-kde/kf5/tier3/kinit/kinit.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Process launcher to speed up launching KDE applications"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0 & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gettext
@@ -23,7 +26,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770"
+SRC_URI[sha256sum] = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546"

 FILES_${PN} += "${datadir}/dbus-1 ${libdir}/libkdeinit5_klauncher.so"
 FILES_${PN}-dev = "${libdir}/cmake"
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -1,7 +1,17 @@
 SUMMARY = "Resource and network access abstraction"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & GPLv2.0 & GPLv2.0+ & GPLv3 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5 gettext mime-xdg
@@ -26,7 +36,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66"
+SRC_URI[sha256sum] = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b"

 SRC_URI += "file://0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch"

--- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
+++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
@@ -1,6 +1,13 @@
 SUMMARY = "Support for downloading application assets from the network"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "GPLv2.0 & GPLv3 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"

 inherit kde-kf5 gettext

@@ -26,7 +33,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e"
+SRC_URI[sha256sum] = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b"

 FILES_${PN} += " \
    ${OE_QMAKE_PATH_QML}/org/kde/newstuff \
--- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
+++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
@@ -1,6 +1,8 @@
 SUMMARY = "Configuration system for KNotify"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "LGPLv2.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+"

 inherit kde-kf5 gettext

@@ -21,4 +23,4 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4"
+SRC_URI[sha256sum] = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e"
--- a/recipes-kde/kf5/tier3/kparts/kparts.bb
+++ b/recipes-kde/kf5/tier3/kparts/kparts.bb
@@ -1,7 +1,11 @@
 SUMMARY = "Document centric plugin system"
-LICENSE = "LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gettext
@@ -25,7 +29,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2"
+SRC_URI[sha256sum] = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d"

 FILES_${PN} += " \
    ${datadir}/k*5 \
--- a/recipes-kde/kf5/tier3/kpeople/kpeople.bb
+++ b/recipes-kde/kf5/tier3/kpeople/kpeople.bb
@@ -1,20 +1,24 @@
 SUMMARY = "Provides access to all contacts"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+"

 inherit kde-kf5 gettext

-DEPENDS += "kcoreaddons \
-            kcoreaddons-native \
-            kconfig \
-            kconfig-native \
-            kservice \
-            kwidgetsaddons \
-            ki18n \
-            kitemviews"
+DEPENDS += " \
+    kcoreaddons \
+    kcoreaddons-native \
+    kconfig \
+    kconfig-native \
+    kservice \
+    kwidgetsaddons \
+    ki18n \
+    kitemviews \
+"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4"
+SRC_URI[sha256sum] = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545"

 FILES_${PN} += " \
    ${datadir}/k*5 \
--- a/recipes-kde/kf5/tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/tier3/krunner/krunner.bb
@@ -1,25 +1,30 @@
 SUMMARY = "Framework for providing different actions given a string query"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://src/abstractrunner.h;endline=18;md5=a6a49d7635ef149bcddf8c46f0eae999"
+LICENSE = "LGPLv2.0+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+"

 inherit kde-kf5 gettext

-DEPENDS += "qtdeclarative \
-            kauth-native \
-            kconfig \
-            kconfig-native \
-            kcoreaddons \
-            kcoreaddons-native \
-            kpackage-native \
-            ki18n \
-            kio \
-            kservice \
-            plasma-framework \
-            solid \
-            threadweaver"
+DEPENDS += " \
+    qtdeclarative \
+    kauth-native \
+    kconfig \
+    kconfig-native \
+    kcoreaddons \
+    kcoreaddons-native \
+    kpackage-native \
+    ki18n \
+    kio \
+    kservice \
+    plasma-framework \
+    solid \
+    threadweaver \
+"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09"
+SRC_URI[sha256sum] = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda"

 FILES_${PN} += " \
    ${datadir}/k*5 \
--- a/recipes-kde/kf5/tier3/kservice/kservice.bb
+++ b/recipes-kde/kf5/tier3/kservice/kservice.bb
@@ -1,9 +1,13 @@
 SUMMARY = "Advanced plugin and service introspection"
-LICENSE = "GPLv2 | GPLv3 | LGPLv2.1"
+LICENSE = "GPLv2.0 & GPLv2.0+ & GPLv3 & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gettext
@@ -21,6 +25,6 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b"
+SRC_URI[sha256sum] = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf"

 FILES_${PN} += "${datadir}/kservicetypes5"
--- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
+++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
@@ -1,28 +1,33 @@
 SUMMARY = "Advanced embeddable text editor"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-2-Clause & LGPLv2.0 & LGPLv2.0+ & MIT"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "

 inherit kde-kf5 gettext

-DEPENDS += "qtxmlpatterns \
-            syntax-highlighting \
-            karchive \
-            kconfig \
-            kconfig-native \
-            kcoreaddons-native \
-            kauth-native \
-            kguiaddons \
-            ki18n \
-            kio \
-            kparts \
-            sonnet \
-            sonnet-native \
-            libgit2"
+DEPENDS += " \
+    qtxmlpatterns \
+    syntax-highlighting \
+    karchive \
+    kconfig \
+    kconfig-native \
+    kcoreaddons-native \
+    kauth-native \
+    kguiaddons \
+    ki18n \
+    kio \
+    kparts \
+    sonnet \
+    sonnet-native \
+    libgit2 \
+"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18"
+SRC_URI[sha256sum] = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2"

 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

--- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
+++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
@@ -1,7 +1,10 @@
 SUMMARY = "Advanced text editing widgets"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPLv2.0 & LGPLv2.0+ & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -11,7 +14,7 @@ DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidge
            gettext-native sonnet-native"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5"
+SRC_URI[sha256sum] = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84"

 FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS}/designer \
--- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb
+++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb
@@ -1,7 +1,11 @@
 SUMMARY = "Secure and unified container for user passwords"
-LICENSE = "LGPLv2.1"
+LICENSE = "BSD-3-Clause & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1+ & LGPLv3+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -26,7 +30,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1"
+SRC_URI[sha256sum] = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc"
 SRC_URI += "file://0001-KF5WalletConfig.cmake.in-point-runtime-bindir-not-bu.patch"

 FILES_${PN} += "${datadir}"
--- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
+++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
@@ -1,8 +1,11 @@
 SUMMARY = "User configurable main windows"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0 & LGPLv2.0+ & LGPLv2.1+ & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5
@@ -26,7 +29,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb"
+SRC_URI[sha256sum] = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82"

 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -1,8 +1,16 @@
 SUMMARY = "Plugin based UI runtime used to write primary user interfaces"
-LICENSE = "GPLv2 | LGPLv2.1"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & GPLv2.0 & GPLv2.0+ & GPLv2 & LGPLv2.0+ & LGPLv2.1 & LGPLv2.1+ & LGPLv3 & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/Qt-LGPL-exception-1.1.txt;md5=38d22f987f077611a625f5729dd0fd39 \
 "

 inherit kde-kf5 gettext
@@ -40,7 +48,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93"
+SRC_URI[sha256sum] = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a"

 FILES_${PN} += " \
    ${datadir}/kdevappwizard \
--- a/recipes-kde/kf5/tier3/purpose/purpose.bb
+++ b/recipes-kde/kf5/tier3/purpose/purpose.bb
@@ -1,12 +1,14 @@
 SUMMARY = "Offers available actions for a specific purpose"
-LICENSE = "LGPLv2.1"
+LICENSE = "GPLv2.0+ & LGPLv2.0+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = " \
-	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "

 inherit kde-kf5 gettext gtk-icon-cache

-SRC_URI[sha256sum] = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32"
+SRC_URI[sha256sum] = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d"

 PV = "${KF5_VERSION}"

--- a/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb
+++ b/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb
@@ -1,8 +1,11 @@
 SUMMARY = "QtQuickControls 2 style that integrates with the desktop"
-LICENSE = "GPLv2 & LGPLv3"
+LICENSE = "GPLv2.0 & GPLv2.0+ & GPLv3 & LGPLv2.0 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-	file://LICENSE.GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://LICENSE.LGPL-3;md5=15d6edab0fdf34fa80484687e7319ce2 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "

 inherit kde-kf5 gettext
@@ -18,7 +21,7 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd"
+SRC_URI[sha256sum] = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3"

 FILES_${PN} += " \
    ${OE_QMAKE_PATH_PLUGINS} \
--- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
+++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
@@ -1,6 +1,10 @@
 SUMMARY = "Workspace and cross-framework integration plugins"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "LGPLv2.0 & LGPLv2.0+ & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"

 inherit kde-kf5 gettext

@@ -23,7 +27,7 @@ DEPENDS += " \
 RRECCOMENDS_${PN} += "oxygen-fonts"

 PV = "${KF5_VERSION}"
-SRC_URI[sha256sum] = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3"
+SRC_URI[sha256sum] = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb"

 FILES_${PN} += " \
    ${datadir}/knotifications5 \
--- a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb
+++ b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb
@@ -6,7 +6,7 @@ inherit kde-kf5

 DEPENDS = "qttools-native"

-SRC_URI[sha256sum] = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4"
+SRC_URI[sha256sum] = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32"
 SRC_URI += "file://0001-Temporary-workaround-gold-linker-errors.patch"

 PV = "${KF5_VERSION}"