All recipes: Auto change licenses to SPDX

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-03-10 23:27:16 +01:00
parent eff8cc7b5e
commit ddba018d05
215 changed files with 215 additions and 215 deletions
--- a/extends-meta-qt5/quazip.bb
+++ b/extends-meta-qt5/quazip.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package"
 HOMEPAGE = "https://github.com/stachenov/quazip"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c01c380a79ed7138aa9049e29df9c6a"

 DEPENDS = "qtbase zlib"
--- a/recipes-gottcode/connectagram/connectagram.bb
+++ b/recipes-gottcode/connectagram/connectagram.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Connectagram is a word unscrambling game"
 HOMEPAGE = "https://gottcode.org/connectagram/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
--- a/recipes-gottcode/focuswriter/focuswriter.bb
+++ b/recipes-gottcode/focuswriter/focuswriter.bb
@@ -1,6 +1,6 @@
 SUMMARY = "FocusWriter is a simple, distraction-free writing environment"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache mime-xdg
--- a/recipes-gottcode/gottet/gottet.bb
+++ b/recipes-gottcode/gottet/gottet.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A tetris clone using the Qt GUI toolkit"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
--- a/recipes-gottcode/hexalate/hexalate.bb
+++ b/recipes-gottcode/hexalate/hexalate.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A color matching game"
 HOMEPAGE = "http://gottcode.org/hexalate/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
--- a/recipes-gottcode/kapow/kapow.bb
+++ b/recipes-gottcode/kapow/kapow.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Kapow is a punch clock program to easily keep track of your hours"
 HOMEPAGE = "https://gottcode.org/kapow/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
--- a/recipes-gottcode/peg-e/peg-e.bb
+++ b/recipes-gottcode/peg-e/peg-e.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Peg-E is a peg solitaire game"
 HOMEPAGE = "http://gottcode.org/peg-e/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
--- a/recipes-gottcode/simsu/simsu.bb
+++ b/recipes-gottcode/simsu/simsu.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Simsu is a basic Sudoku game"
 HOMEPAGE = "http://gottcode.org/simsu/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
--- a/recipes-gottcode/tetzle/tetzle.bb
+++ b/recipes-gottcode/tetzle/tetzle.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE = "https://gottcode.org/tetzle/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit qmake5 pkgconfig qt5-translation gtk-icon-cache mime-xdg
--- a/recipes-graphics/qpdfview/qpdfview_0.4.18.bb
+++ b/recipes-graphics/qpdfview/qpdfview_0.4.18.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Light-weight tabbed PDF, DJVU and PostScript viewer"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

 DEPENDS += "cups poppler qtsvg"
--- a/recipes-graphics/sddm/sddm_git.bb
+++ b/recipes-graphics/sddm/sddm_git.bb
@@ -1,5 +1,5 @@
 SUMMARY = "SDDM is a modern display manager for X11"
-LICENSE = "GPLv2 & CC-BY-3.0"
+LICENSE = "GPL-2.0-only & CC-BY-3.0"
 LIC_FILES_CHKSUM = " \
    file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b \
    file://LICENSE.CC-BY-3.0;md5=36b7342d5619a3a0d3b581e89803ec25 \
--- a/recipes-kdab/hotspot/hotspot_git.bb
+++ b/recipes-kdab/hotspot/hotspot_git.bb
@@ -1,5 +1,5 @@
 SUMMARY = "The Linux perf GUI for performance analysis"
-LICENSE = "GPLv2+ | KDAB-Commercial | KDAB-Commercial-US"
+LICENSE = "GPL-2.0-or-later | KDAB-Commercial | KDAB-Commercial-US"
 LIC_FILES_CHKSUM = " \
    file://LICENSE.txt;md5=50a9af6464b390664488e7af1cc5c148 \
    file://LICENSE.GPL.txt;md5=8b7a65584aeb92995bcb6066ed0f58f7 \
--- a/recipes-kdab/kdcharts/kdcharts_git.bb
+++ b/recipes-kdab/kdcharts/kdcharts_git.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A Qt tool for creating business and scientific charts"
-LICENSE = "GPLv2+ | KDAB-Commercial"
+LICENSE = "GPL-2.0-or-later | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
    file://LICENSE.txt;md5=d5e1956ab398a4ae39e2470a9abd4889 \
    file://LICENSE.GPL.txt;md5=6af452a21ffa624c438c2cde4423a893 \
--- a/recipes-kdab/kdreports/kdreports_git.bb
+++ b/recipes-kdab/kdreports/kdreports_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Qt library for generating printable and exportable reports"
 DESCRIPTION = "Qt library for generating printable and exportable reports from code and from XML descriptions"
-LICENSE = "(LGPL-2.1 | LGPL-3.0) & (GPL-2.0 | GPL-3.0 ) | KDAB-Commercial"
+LICENSE = "(LGPL-2.1-only | LGPL-3.0-only) & (GPL-2.0-only | GPL-3.0-only ) | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
    file://LICENSE.txt;md5=d988404a6396edf41e7f8cbb2db3c185 \
 "
--- a/recipes-kdab/kdsoap/kdsoap.inc
+++ b/recipes-kdab/kdsoap/kdsoap.inc
@@ -1,5 +1,5 @@
 SUMMARY = "A Qt-based client-side and server-side SOAP component"
-LICENSE = "(GPLv2 & LGPL-2.1 & AGPL-3.0) | KDAB-Commercial"
+LICENSE = "(GPL-2.0-only & LGPL-2.1-only & AGPL-3.0-only) | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
    file://LICENSE.GPL.txt;md5=63e3028b49eac8f84ab29661f079f159 \
    file://LICENSE.LGPL.txt;md5=ce198ec102c2f0b1d13f26967a934670 \
--- a/recipes-kde/apps/analitza/analitza.bb
+++ b/recipes-kde/apps/analitza/analitza.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Add mathematical features to your program"
-LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
--- a/recipes-kde/apps/artikulate/artikulate.bb
+++ b/recipes-kde/apps/artikulate/artikulate.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Artikulate is a pronunciation trainer"
-LICENSE = "GPL-2.0 & CC-BY-SA-4.0"
+LICENSE = "GPL-2.0-only & CC-BY-SA-4.0"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=93e64b4a83c7e441e48bbdeeea05c977 \
    file://COPYING.DOC;md5=4b39cb11ffa11c92d3f7a3431390e0d9 \
--- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
+++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Widgets for Baloo"
-LICENSE = "LGPL-2.0"
+LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING.README;md5=f5d7c5af660f94231a1d4e19501bce8f \
    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
--- a/recipes-kde/apps/bovo/bovo.bb
+++ b/recipes-kde/apps/bovo/bovo.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Bovo is a Gomoku like game for two players"
 DESCRIPTION = "Bovo is a Gomoku (from Japanese 五目並べ - lit. 'five points') like game for two players, where the opponents alternate in placing their respective pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses)"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=3c8ea28d12b8a786603a5394fc50096d \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/calligra/kdb_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kdb_3.2.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Database Connectivity and Creation Framework"
 HOMEPAGE = "https://community.kde.org/KDb"
-LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/calligra/kexi_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kexi_3.2.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Kexi is a visual database applications creator"
 HOMEPAGE = "https://www.calligra.org/kexi/"
-LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
    file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
--- a/recipes-kde/apps/calligra/kproperty_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kproperty_3.2.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Property editing framework with editor widget"
 HOMEPAGE = "https://community.kde.org/KProperty"
-LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
--- a/recipes-kde/apps/calligra/kreport_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kreport_3.2.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Framework for creation and generation of reports"
 HOMEPAGE = "https://community.kde.org/KReport"
-LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/dolphin/dolphin.bb
+++ b/recipes-kde/apps/dolphin/dolphin.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE File Manager"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/gwenview/gwenview.bb
+++ b/recipes-kde/apps/gwenview/gwenview.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"

 inherit kde-apps gettext mime-xdg
--- a/recipes-kde/apps/kalgebra/kalgebra.bb
+++ b/recipes-kde/apps/kalgebra/kalgebra.bb
@@ -1,5 +1,5 @@
 SUMMARY = "2D and 3D Graph Calculator"
-LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
--- a/recipes-kde/apps/kate/kate.bb
+++ b/recipes-kde/apps/kate/kate.bb
@@ -1,5 +1,5 @@
 SUMMARY = "An advanced editor component which is used in numerous KDE applications requiring a text editing component"
-LICENSE = "GPL-2.0+ & GPL-3.0 & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT & The-Qt-Company-GPL-Exception-1.0"
+LICENSE = "GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only & MIT & The-Qt-Company-GPL-Exception-1.0"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
--- a/recipes-kde/apps/kblocks/kblocks.bb
+++ b/recipes-kde/apps/kblocks/kblocks.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KBlocks - Falling Blocks Game"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/kcharselect/kcharselect.bb
+++ b/recipes-kde/apps/kcharselect/kcharselect.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Tool to copy and paste characters from all installed fonts"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
 "
--- a/recipes-kde/apps/kdevelop/kdevelop-pg-qt.bb
+++ b/recipes-kde/apps/kdevelop/kdevelop-pg-qt.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDevelop-PG-Qt is a parser generator"
-LICENSE = "LGPL-2.0"
+LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=15ce55ef03e0531acfa5ca508b9f85b2"

 inherit kde-base
--- a/recipes-kde/apps/kdevelop/libkomparediff2.bb
+++ b/recipes-kde/apps/kdevelop/libkomparediff2.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library to compare files and strings, used in Kompare and KDevelop"
-LICENSE = "GPL-2.0 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8d8cc811a0870dd8391a69e61a77967a"

 inherit kde-apps gettext
--- a/recipes-kde/apps/kgeography/kgeography.bb
+++ b/recipes-kde/apps/kgeography/kgeography.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KGeography is a geography learning tool"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
--- a/recipes-kde/apps/kio-extras/kio-extras.bb
+++ b/recipes-kde/apps/kio-extras/kio-extras.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Additional components to increase the functionality of KIO"
-LICENSE = "BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & GPL-3.0+ & LGPL-2.0+ & MIT"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-or-later & MIT"

 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
--- a/recipes-kde/apps/kmag/kmag.bb
+++ b/recipes-kde/apps/kmag/kmag.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KMag is a screen magnifier"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
--- a/recipes-kde/apps/kmix/kmix.bb
+++ b/recipes-kde/apps/kmix/kmix.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE's audio mixer"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
--- a/recipes-kde/apps/kolourpaint/kolourpaint.bb
+++ b/recipes-kde/apps/kolourpaint/kolourpaint.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KolourPaint - Paint Program"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0 & MIT"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only & MIT"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=7549f6da638b0246572ed9cf4275b860 \
    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
--- a/recipes-kde/apps/konsole/konsole.bb
+++ b/recipes-kde/apps/konsole/konsole.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE's terminal emulator"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
    file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
--- a/recipes-kde/apps/kpat/kpat.bb
+++ b/recipes-kde/apps/kpat/kpat.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KPat offers a selection of solitaire card games"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=dcd3ae65d2d4ac9f347f0614d3fd4794 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/kpmcore/kpmcore.bb
+++ b/recipes-kde/apps/kpmcore/kpmcore.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library for managing partitions"
-LICENSE = "CC0-1.0 & CC-BY-SA-4.0 & GPL-3.0+ & MIT"
+LICENSE = "CC0-1.0 & CC-BY-SA-4.0 & GPL-3.0-or-later & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
    file://LICENSES/CC-BY-4.0.txt;md5=28bacf04b75cbad10cb7871e0b063188 \
--- a/recipes-kde/apps/krita/krita.bb
+++ b/recipes-kde/apps/krita/krita.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Krita is a free digital painting application"
-LICENSE = "GPL-3.0 & BSD-3-Clause"
+LICENSE = "GPL-3.0-only & BSD-3-Clause"
 HOMEPAGE = "https://krita.org/"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
--- a/recipes-kde/apps/ksudoku/ksudoku.bb
+++ b/recipes-kde/apps/ksudoku/ksudoku.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KSudoku is a logic-based symbol placement puzzle"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
--- a/recipes-kde/apps/kwave/kwave.bb
+++ b/recipes-kde/apps/kwave/kwave.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Kwave is a sound editor for KDE"
-LICENSE = "GPL-2.0 & LGPL-2.0 & CC-BY-SA-3.0 & CC-BY-SA-4.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & CC-BY-SA-3.0 & CC-BY-SA-4.0 & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES;md5=6e2b675654cdfe1069f93fcdb9ddec34 \
    file://GNU-LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
--- a/recipes-kde/apps/minuet/minuet.bb
+++ b/recipes-kde/apps/minuet/minuet.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A KDE Software for Music Education"
-LICENSE = "GPL-2.0 & GFDL-1.3"
+LICENSE = "GPL-2.0-only & GFDL-1.3"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://COPYING.DOC;md5=10ce6fc3438e5c4c933bfb5db3b097ec \
--- a/recipes-kde/apps/partitionmanager/partitionmanager.bb
+++ b/recipes-kde/apps/partitionmanager/partitionmanager.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE Partition Manage"
-LICENSE = "CC0-1.0 & CC-BY-SA-4.0 & GFDL-1.2+ & GPL-3.0+ & LGPL-3.0+ & MIT"
+LICENSE = "CC0-1.0 & CC-BY-SA-4.0 & GFDL-1.2+ & GPL-3.0-or-later & LGPL-3.0-or-later & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
    file://LICENSES/CC-BY-4.0.txt;md5=28bacf04b75cbad10cb7871e0b063188 \
--- a/recipes-kde/apps/umbrello/umbrello.bb
+++ b/recipes-kde/apps/umbrello/umbrello.bb
@@ -1,5 +1,5 @@
 SUMMARY = "GUI for diagramming Unified Modelling Language (UML)"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
+++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Support for JS scripting in applications"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"

 inherit kde-kf5-porting-aids perlnative
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Porting aid from KDELibs4"
-LICENSE = "GPL-2.0 | LGPL-2.1"
+LICENSE = "GPL-2.0-only | LGPL-2.1-only"
 LIC_FILES_CHKSUM = " \
 	file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
--- a/recipes-kde/kf5/porting-aids-tier3/kdesignerplugin/kdesignerplugin.inc
+++ b/recipes-kde/kf5/porting-aids-tier3/kdesignerplugin/kdesignerplugin.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Integration of Frameworks widgets in Qt Designer/Creator"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"

 inherit kde-kf5-porting-aids
--- a/recipes-kde/kf5/porting-aids-tier3/kdewebkit/kdewebkit.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdewebkit/kdewebkit.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE Integration for QtWebKit"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"

 inherit kde-kf5-porting-aids gettext
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KHTML"
-LICENSE = "GPL-3.0 & LGPL-2.1"
+LICENSE = "GPL-3.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Embedded JS"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
--- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Multi-language application scripting"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
--- a/recipes-kde/kf5/porting-aids-tier3/kxmlrpcclient/kxmlrpcclient.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kxmlrpcclient/kxmlrpcclient.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Interaction with XMLRPC services"
-LICENSE = "BSD-2-Clause & LGPL-2.0+"
+LICENSE = "BSD-2-Clause & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/attica/attica.bb
+++ b/recipes-kde/kf5/tier1/attica/attica.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Open Collaboration Services API"
-LICENSE = "LGPL-2.0+ & LGPL-2.1 & LGPL-3.0"
+LICENSE = "LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
--- a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
+++ b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Qt wrapper for BlueZ 5 DBus AP"
-LICENSE = "LGPL-2.1 & LGPL-2.1+ & LGPL-3.0"
+LICENSE = "LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
--- a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc
+++ b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Breeze icon theme"
-LICENSE = "LGPL-2.1 & LGPL-3.0"
+LICENSE = "LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
--- a/recipes-kde/kf5/tier1/kcalendarcore/kcalendarcore.bb
+++ b/recipes-kde/kf5/tier1/kcalendarcore/kcalendarcore.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library for Interfacing with Calendars"
-LICENSE = "BSD-3-Clause & LGPL-2.0+ & LGPL-3.0+"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-3.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
+++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE Text encoding library"
-LICENSE = "BSD-3-Clause & GPL-2.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1+ & LGPL-3.0 & MIT & MPL-1.1"
+LICENSE = "BSD-3-Clause & GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later & LGPL-3.0-only & MIT & MPL-1.1"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc
@@ -1,5 +1,5 @@
 SUMMARY = "KDE configuration system"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
--- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
+++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Addons to QtCore"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & CC0-1.0 & GPL-2.0 & GPL-2.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0 & MPL-1.1 & Qt-LGPL-exception-1.1"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & CC0-1.0 & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MPL-1.1 & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
--- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
+++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Addons to QtDBus"
-LICENSE = "LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0"
+LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
--- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
+++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Abstraction to system DNSSD features"
-LICENSE = "BSD-3-Clause & LGPL-2.0+"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/kholidays/kholidays.bb
+++ b/recipes-kde/kf5/tier1/kholidays/kholidays.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library to assist determining when holidays occur"
-LICENSE = "Bison-exception-2.2 & BSD-2-Clause & GPL-3.0+ & LGPL-2.0+"
+LICENSE = "Bison-exception-2.2 & BSD-2-Clause & GPL-3.0-or-later & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/Bison-exception-2.2.txt;md5=fe1adebe74bce848e36673c70d09e755 \
    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.inc
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Advanced internationalization framework"
-LICENSE = "BSD-3-Clause & LGPL-2.0+  & LGPL-2.1 & LGPL-3.0"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later  & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/kirigami/kirigami2.bb
+++ b/recipes-kde/kf5/tier1/kirigami/kirigami2.bb
@@ -1,5 +1,5 @@
 SUMMARY = "QtQuick plugins to build user interfaces based on the KDE UX guidelines"
-LICENSE = "LGPL-2.0+"
+LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "
--- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
+++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Models for Qt Model/View system"
-LICENSE = "LGPL-2.0+ & LGPL-2.1 & LGPL-2.1+"
+LICENSE = "LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
--- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
+++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Widget addons for Qt Model/View"
-LICENSE = "GPL-2.0+ & LGPL-2.0 & LGPL-2.0+"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb
+++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Lightweight plotting framework"
-LICENSE = "GPL-2.0+ & LGPL-2.0+"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/kquickcharts/kquickcharts.bb
+++ b/recipes-kde/kf5/tier1/kquickcharts/kquickcharts.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A QtQuick module providing high-performance charts"
-LICENSE = "LGPL-2.1 & LGPL-3.0 & MIT"
+LICENSE = "LGPL-2.1-only & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
--- a/recipes-kde/kf5/tier1/kwayland/kwayland.bb
+++ b/recipes-kde/kf5/tier1/kwayland/kwayland.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries"
-LICENSE = "BSD-3-Clause & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0 & MIT & MIT-CMU"
+LICENSE = "BSD-3-Clause & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT & MIT-CMU"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
--- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
+++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Addons to QtWidgets"
-LICENSE = "BSD-3-Clause & GPL-2.0 & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0 & LGPL-3.0+"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & LGPL-3.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Access to the windowing system"
-LICENSE = "LGPL-2.1 & LGPL-2.1+ & LGPL-3.0 & MIT"
+LICENSE = "LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
--- a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Qt wrapper for ModemManager API"
-LICENSE = "BSD-3-Clause & GPL-2.0 & GPL-3.0 & LGPL-2.1 & LGPL-3.0"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-3.0-only & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
--- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Qt wrapper for NetworkManager API"
-LICENSE = "BSD-3-Clause & GPL-2.0 & LGPL-2.1 & LGPL-3.0"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
--- a/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb
+++ b/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb
@@ -1,5 +1,5 @@
 SUMMARY = "KDE oxygen icons"
-LICENSE = "LGPL-3.0"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=6e01bfa20e899e8ad569d5488923cbd2 \
 "
--- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Support for spellchecking"
-LICENSE = "BSD-3-Clause & LGPL-2.0+ & LGPL-2.1+"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc
+++ b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Syntax highlighting Engine for Structured Text and Code"
-LICENSE = "GPL-2.0 & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1+ & MIT"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
+++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
@@ -1,5 +1,5 @@
 SUMMARY = "High-level multithreading framework"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"

 inherit kde-kf5
--- a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb
+++ b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A library for accessing the usage data collected by the activities system"
-LICENSE = "GPL-2.0 & GPL-2.0+ & GPL-3.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & Qt-LGPL-exception-1.1"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier2/kauth/kauth.inc
+++ b/recipes-kde/kf5/tier2/kauth/kauth.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Abstraction to system policy and authentication features"
-LICENSE = "BSD-3-Clause & LGPL-2.0+ & LGPL-2.1+"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
+++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Text completion helpers and widgets"
-LICENSE = "BSD-3-Clause & LGPL-2.0+ & LGPL-2.1+"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb
+++ b/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library for working with contact information"
-LICENSE = "BSD-3-Clause & LGPL-2.0+ & MIT & Unicode-DFS-2016"
+LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & 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 \
--- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb
+++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Support for application crash analysis and bug report from apps"
-LICENSE = "LGPL-2.0+"
+LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Documentation generation from docbook"
-LICENSE = "BSD-3-Clause & GPL-2.0+ & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0"
+LICENSE = "BSD-3-Clause & GPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A file metadata and text extraction library"
-LICENSE = "BSD-3-Clause & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0"
+LICENSE = "BSD-3-Clause & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
--- a/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb
+++ b/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Image format plugins for Qt"
-LICENSE = "LGPL-2.0+ & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0"
+LICENSE = "LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
--- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
+++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Widgets for tracking KJob instances"
-LICENSE = "LGPL-2.0 & LGPL-2.0+ & LGPL-3.0"
+LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier2/knotifications/knotifications.bb
+++ b/recipes-kde/kf5/tier2/knotifications/knotifications.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Abstraction for system notifications"
-LICENSE = "BSD-3-Clause & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0"
+LICENSE = "BSD-3-Clause & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier2/kpackage/kpackage.inc
+++ b/recipes-kde/kf5/tier2/kpackage/kpackage.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Library to load and install packages of non binary files as they were a plugin"
-LICENSE = "GPL-2.0+ & LGPL-2.0+"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier2/kpty/kpty.bb
+++ b/recipes-kde/kf5/tier2/kpty/kpty.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Pty abstraction"
-LICENSE = "GPL-2.0 & LGPL-2.0+"
+LICENSE = "GPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
+++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Support for unit conversion"
-LICENSE = "LGPL-2.0+"
+LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
 "
--- a/recipes-kde/kf5/tier2/syndication/syndication.bb
+++ b/recipes-kde/kf5/tier2/syndication/syndication.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Syndication Library"
-LICENSE = "BSD-2-Clause & GPL-2.0+ & LGPL-2.0+"
+LICENSE = "BSD-2-Clause & GPL-2.0-or-later & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier3/baloo/baloo.bb
+++ b/recipes-kde/kf5/tier3/baloo/baloo.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Baloo provides searching and indexing infrastucture with an emphasis on files"
-LICENSE = "BSD-3-Clause & bzip2-1.0.6 & GPL-2.0 & GPL-2.0+ & GPL-3.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0"
+LICENSE = "BSD-3-Clause & bzip2-1.0.6 & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/bzip2-1.0.6.txt;md5=f1d2fdc6b1d232981a8007aa1854d24d \
--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Runtime and library to organize the user work in separate activities"
-LICENSE = "GPL-2.0+ & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
+++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Support for bookmarks and the XBEL format"
-LICENSE = "GPL-2.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.0+"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
+++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Utilities for working with KCModules"
-LICENSE = "GPL-2.0 & GPL-3.0 & LGPL-2.0 & LGPL-2.0+"
+LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
--- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
+++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Widgets for configuration dialog"
-LICENSE = "BSD-3-Clause & GPL-2.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT"
+LICENSE = "BSD-3-Clause & GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier3/kdav/kdav.bb
+++ b/recipes-kde/kf5/tier3/kdav/kdav.bb
@@ -1,5 +1,5 @@
 SUMMARY = "DAV protocol implementation with KJobs"
-LICENSE = "GPL-2.0+ & LGPL-2.0+"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Provides integration of QML and KDE Frameworks"
-LICENSE = "GPL-2.0 & GPL-2.0+ & GPL-3.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-2.1+ & LGPL-3.0 & MIT & Qt-LGPL-exception-1.1"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
--- a/recipes-kde/kf5/tier3/kded/kded.bb
+++ b/recipes-kde/kf5/tier3/kded/kded.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Extensible deamon for providing system level services"
-LICENSE = "LGPL-2.0 & LGPL-2.0+"
+LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
--- a/Show More
+++ b/Show More