Move to new override syntax

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

classes/cmake_extra_sanity.bbclass

@@ -1,15 +1,15 @@
 inherit cmake_sysroot
 
-# do_install_append_class-cross does not work so hack
-do_install_prepend_class-native() {
+# do_install:append:class-cross does not work so hack
+do_install:prepend:class-native() {
     no_staging_check=true
 }
 
-do_install_prepend_class-nativesdk() {
+do_install:prepend:class-nativesdk() {
     no_staging_check=true
 }
 
-do_install_append() {
+do_install:append() {
     # avoid strange prefixing seen often
     old_dir=`pwd`
     cd ${D}

classes/cmake_lib.bbclass

@@ -42,16 +42,16 @@
 #
 # Native overriding:
 #
-#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#   CMAKE_ALIGN_SYSROOT:class-native[<unique-id>] = "<dir>, <search>, <replace>"
 #
 # Native extended recipe -> no native alignement:
 #
-#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "ignore"
+#   CMAKE_ALIGN_SYSROOT:class-native[<unique-id>] = "ignore"
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "<dir>, <search>, <replace>"
 #
 # Native extended recipe -> no cross alignement:
 #
-#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#   CMAKE_ALIGN_SYSROOT:class-native[<unique-id>] = "<dir>, <search>, <replace>"
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #
 
@@ -63,7 +63,7 @@ SSTATE_SYSROOT = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
 def get_align_flags(d):
     ret = {}
     if bb.data.inherits_class('native', d):
-        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT_class-native") or {}
+        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT:class-native") or {}
     if ret == {}:
         ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
     return ret
@@ -95,7 +95,7 @@ python () {
 # 2. 3. in cmake_sysroot
 
 # 4. Handle CMAKE_ALIGN_SYSROOT
-python do_populate_sysroot_append() {
+python do_populate_sysroot:append() {
     pn = d.getVar('PN')
 
     # parse single parameter in CMAKE_ALIGN_SYSROOT[..] and return array of line strings extracted
@@ -201,10 +201,10 @@ python do_populate_sysroot_append() {
                     bb.warn("No cmake replacements performed in %s for CMAKE_ALIGN_SYSROOT[%s]" % (pn, flag))
 }
 
-do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"
+do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT:class-native"
 
 # change of CMAKE_ALIGN_SYSROOT causes configure rerun which currently seems
 # the only way to force a rebuild at change of CMAKE_ALIGN_SYSROOT for recipes
 # depending on this recipe
 
-sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"
+sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT:class-native"

classes/cmake_sysroot.bbclass

@@ -4,14 +4,14 @@
 CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
 
 # 1. remove tmp file from last build
-python do_populate_sysroot_prepend() {
+python do_populate_sysroot:prepend() {
     tmpfile = d.getVar('CMAKEINSTALLED')
     if os.path.isfile(tmpfile):
         os.remove(tmpfile)
 }
 
 # 2. keep cmake files staged to sysroot
-sysroot_stage_dir_append() {
+sysroot_stage_dir:append() {
     # avoid doubles causing double replacement
     for file in `find $dest -name '*.cmake'`; do
         if ! grep -q "$file" ${CMAKEINSTALLED} ; then

classes/kde-apps.bbclass

@@ -4,4 +4,4 @@ KDE_APP_VERSION = "21.04.3"
 
 SRC_URI = "${KDE_MIRROR}/stable/release-service/${PV}/src/${BPN}-${PV}.tar.xz"
 
-RRECOMMENDS_${PN} += "qtbase-plugins"
+RRECOMMENDS:${PN} += "qtbase-plugins"

classes/kde-base.bbclass

@@ -1,5 +1,5 @@
-DEPENDS_prepend_class-nativesdk = "nativesdk-qtbase "
-DEPENDS_prepend_class-target = "qtbase "
+DEPENDS:prepend:class-nativesdk = "nativesdk-qtbase "
+DEPENDS:prepend:class-target = "qtbase "
 # Do not pin hard for extra-cmake-modules itself
 DEPENDS+= "extra-cmake-modules-native "
 
@@ -24,11 +24,11 @@ inherit cmake_qt5_extra python3native
 
 DEPENDS += "libxml2-native"
 
-do_compile_prepend() {
+do_compile:prepend() {
     export XDG_DATA_HOME=${STAGING_DATADIR}
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kf5 \
     ${datadir}/qlogging-categories5 \
     ${libdir}/plugins/kf5 \
@@ -45,9 +45,9 @@ EXTRA_OECMAKE += " \
     -DKDE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/appdata \
     ${datadir}/metainfo \
 "
 
-FILES_${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"
+FILES:${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"

classes/qt5-translation.bbclass

@@ -5,7 +5,7 @@ DEPENDS += "qttools-native"
 # default location
 QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translations/*/*.qm ${datadir}/*/translations/*/*/*.qm"
 
-FILES_${PN}-locale = "${datadir}/*/translations"
+FILES:${PN}-locale = "${datadir}/*/translations"
 
 python qt_do_split_locales() {
     import glob
@@ -53,16 +53,16 @@ python qt_do_split_locales() {
         files = ''
         for transvar in d.getVar('QT_TRANSLATION_FILES').split():
             files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
-        d.setVar('FILES_' + pkg, files )
-        d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
-        d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
-        d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
-        d.setVar('DESCRIPTION_' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
+        d.setVar('FILES:' + pkg, files )
+        d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
+        d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
+        d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l))
+        d.setVar('DESCRIPTION:' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
         if locale_section:
-            d.setVar('SECTION_' + pkg, locale_section)
+            d.setVar('SECTION:' + pkg, locale_section)
 
     d.setVar('PACKAGES', ' '.join(list(packages)))
 }
 
-PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "
+PACKAGESPLITFUNCS:prepend = "qt_do_split_locales "
 

extends-meta-oe/poppler_%.bbappend

@@ -1,3 +1,3 @@
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"
 
 inherit cmake_qt5

extends-meta-qt5/qt5-creator_git.bbappend

@@ -1,5 +1,5 @@
 inherit cmake_extra_sanity
 
 # yeah I know yocto does not want us to change this
-PACKAGECONFIG_append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
+PACKAGECONFIG:append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
 

extends-meta-qt5/qtbase-native_git.bbappend

@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 # avoid that our sanity check complains about sysroot in created comments
 SRC_URI += "file://0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch"
 
-do_configure_append() {
+do_configure:append() {
      # strCmdLine.replace(QString("STRING_FULL_PATH"), QString("STRING_PATH"));
      sed -i 's:STRING_FULL_PATH:${TMPDIR}:g' ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
      sed -i 's:STRING_PATH:<oe-temp>:g' ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp

extends-meta-qt5/qtbase_git.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 PACKAGECONFIG_FONTS = "fontconfig"
 
@@ -14,7 +14,7 @@ PACKAGECONFIG_GL_use-mainline-bsp = "${QT5_EXTRA_QTBASE_IMX_MAINLINE_GL} gbm kms
 # override QT5_EXTRA_QTBASE_IMX_MAINLINE_GL with 'gles2'
 QT5_EXTRA_QTBASE_IMX_MAINLINE_GL ??= ""
 
-PACKAGECONFIG_DISTRO_append = " \
+PACKAGECONFIG_DISTRO:append = " \
     sm \
     accessibility \
     sql-sqlite \

extends-meta-qt5/qttools_git.bbappend

@@ -4,17 +4,17 @@ DEPENDS += "${BPN}-native"
 
 
 # It's really time for us to publish cmake_lib.bbclass
-SRC_URI_remove = " \
+SRC_URI:remove = " \
     file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
 
 # native ignore
-CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
-CMAKE_ALIGN_SYSROOT_class-nativesdk[1] = "ignore"
+CMAKE_ALIGN_SYSROOT:class-native[1] = "ignore"
+CMAKE_ALIGN_SYSROOT:class-nativesdk[1] = "ignore"
 
 # cross -> native binaries
 CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
 CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
 
 # yeah I know yocto does not want us to change this
-PACKAGECONFIG_append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"

extends-meta-qt5/qtwayland_git.bbappend

@@ -5,7 +5,7 @@
 # which triggers our make_extra_sanity.bbclass.
 # To be compatible with Qt5.14 (dunfell) and >= Qt5.15 (current master) we do
 # some sed instead of patching.
-do_patch_append_class-native() {
+do_patch:append:class-native() {
     bb.build.exec_func('do_fix_qtwaylandscanner_cpp', d)
 }
 

extends-oe-core/gpgme_%.bbappend

@@ -1,6 +1,6 @@
 inherit cmake_lib
 
-CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
+CMAKE_ALIGN_SYSROOT:class-native[1] = "ignore"
 
 CMAKE_ALIGN_SYSROOT[1] = "Gpgmepp, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"
 CMAKE_ALIGN_SYSROOT[2] = "Gpgmepp, -S${libdir}, -s${OE_QMAKE_PATH_HOST_LIBS}/"

extends-oe-core/gstreamer1.0-plugins-good_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"

recipes-gottcode/connectagram/connectagram.bb

@@ -15,11 +15,11 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "
 
 # WIP: qt5-translation expects *.qm to work properly so pack word data in PN for now
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/connectagram/data \
 "

recipes-gottcode/focuswriter/focuswriter.bb

@@ -21,7 +21,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/${BPN}/icons \
     ${datadir}/${BPN}/symbols1000.dat \

recipes-gottcode/gottet/gottet.bb

@@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/icons \
 "

recipes-gottcode/hexalate/hexalate.bb

@@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/icons \
 "

recipes-gottcode/kapow/kapow.bb

@@ -15,6 +15,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "

recipes-gottcode/packagegroups/gottcode-world.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     connectagram \
     focuswriter \
     gottet \

recipes-gottcode/peg-e/peg-e.bb

@@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/peg-e/icons \
 "

recipes-gottcode/simsu/simsu.bb

@@ -15,6 +15,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "

recipes-gottcode/tetzle/tetzle.bb

@@ -15,6 +15,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "

recipes-graphics/qpdfview/qpdfview_0.4.18.bb

@@ -20,4 +20,4 @@ EXTRA_QMAKEVARS_PRE += " \
     PLUGIN_INSTALL_PATH=${libdir}/${BPN} \
 "
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"

recipes-graphics/scribus/scribus_1.5.7.bb

@@ -18,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-devel/${PV}/${BPN}-${PV}.
 SRC_URI[sha256sum] = "318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce"
 
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/mime \
     ${datadir}/metainfo \

recipes-graphics/sddm/sddm_git.bb

@@ -34,7 +34,7 @@ EXTRA_OECMAKE += " \
     -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
 "
 
-do_configure_append() {
+do_configure:append() {
     # fix sysroot path
     sed -i 's:${STAGING_DIR_HOST}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h
 }
@@ -45,7 +45,7 @@ install_pam() {
     install -m 644 ${WORKDIR}/sddm-autologin.pam ${D}${sysconfdir}/pam.d/sddm-autologin
 }
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${sysconfdir}/sddm.conf.d
     install -m 644 ${WORKDIR}/sddm.conf ${D}/${sysconfdir}/sddm.conf.d/00-default.conf
 
@@ -56,14 +56,14 @@ do_install_append() {
     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'install_pam', '', d)}
 }
 
-FILES_${PN} += "${OE_QMAKE_PATH_QML}"
+FILES:${PN} += "${OE_QMAKE_PATH_QML}"
 
-SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm"
+USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     bash \
     packagegroup-core-x11-xserver \
     xinit \
@@ -76,7 +76,7 @@ RDEPENDS_${PN} += " \
     qtdeclarative-qmlplugins \
 "
 
-RRECOMMENDS_${PN += " \
+RRECOMMENDS:${PN += " \
     qtvirtualkeyboard-plugins \
     qtvirtualkeyboard-qmlplugins \
 "

recipes-kdab/hotspot/hotspot_git.bb

@@ -26,6 +26,6 @@ SRCREV = "35d1865babf40b9df454810ca8cc09e77b0c349a"
 S = "${WORKDIR}/git"
 PV = "1.2.0+git${SRCPV}"
 
-FILES_${PN} += "${datadir}/icons"
+FILES:${PN} += "${datadir}/icons"
 
-RDEPENDS_${PN} += "perf"
+RDEPENDS:${PN} += "perf"

recipes-kdab/kdcharts/kdcharts_git.bb

@@ -12,7 +12,7 @@ DEPENDS += " \
     qtsvg \
 "
 
-do_install_append() {
+do_install:append() {
     # these have gone wild / qmake was always pain
     rm -r ${D}/usr/mkspecs
 }
@@ -22,4 +22,4 @@ SRCREV = "95547e8a2f6c362db1dd071a2df00b0e75e05da0"
 S = "${WORKDIR}/git"
 PV = "2.7.2"
 
-FILES_${PN}-dev += "${datadir}/mkspecs"
+FILES:${PN}-dev += "${datadir}/mkspecs"

recipes-kdab/kdreports/kdreports_git.bb

@@ -17,7 +17,7 @@ SRCREV = "47728293e7842140d36a7861cf4316f2c1cbd795"
 S = "${WORKDIR}/git"
 PV = "1.9.0"
 
-do_install_append() {
+do_install:append() {
     # these have gone wild / qmake was always pain
     rm -r ${D}/usr/mkspecs
 }

recipes-kdab/kdsoap/kdsoap.bb

@@ -7,4 +7,4 @@ DEPENDS += " \
 
 SRC_URI += "file://0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch"
 
-FILES_${PN}-dev += "${datadir}/mkspecs"
+FILES:${PN}-dev += "${datadir}/mkspecs"

recipes-kde/apps/analitza/analitza.bb

@@ -17,7 +17,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "edfd64d5f11de28a9d37244e3d744b57d0436b7ae0e4bc5a4ea625aa28cab450"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/libanalitza \
     ${OE_QMAKE_PATH_QML} \
 "

recipes-kde/apps/ark/ark.bb

@@ -30,7 +30,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/mime \

recipes-kde/apps/artikulate/artikulate.bb

@@ -23,7 +23,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "c0f18f4c239881ec0cd8e7d5b4feeaa195224bcf558dc7ac65f4a92c4934d67a"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/knsrcfiles \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/baloo-widgets/baloo-widgets.bb

@@ -21,7 +21,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kservices5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/apps/bovo/bovo.bb

@@ -21,7 +21,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "aa9927af7f8f98f2e56eebe9eac73c06adc62e598a1300be210e962e878deae1"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/calligra/kdb_3.2.0.bb

@@ -21,4 +21,4 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
 
-FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
+FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}"

recipes-kde/apps/calligra/kexi_3.2.0.bb

@@ -45,16 +45,16 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
 
-do_install_append() {
+do_install:append() {
     install -d "${D}/${datadir}/pixmaps"
     install ${S}/src/pics/icons/breeze/apps/48/kexi.svg ${D}/${datadir}/pixmaps/
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RDEPENDS_${PN} += "breeze-icons-binres"
+RDEPENDS:${PN} += "breeze-icons-binres"
 
 # REVISIT
 #-- The following RECOMMENDED packages have not been found:

recipes-kde/apps/calligra/kproperty_3.2.0.bb

@@ -20,7 +20,7 @@ DEPENDS += " \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kproperty3 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/apps/calligra/kreport_3.2.0.bb

@@ -30,7 +30,7 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kservicetypes5 \
     ${datadir}/kreport3 \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb

@@ -20,7 +20,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kservices5 \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/dolphin/dolphin.bb

@@ -42,7 +42,7 @@ EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/k*5 \
     ${datadir}/kglobalaccel \

recipes-kde/apps/dragon/dragon.bb

@@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "c69bbfb477d23e83944099ff58e79866c754b548aeb873e66dace6f19a
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/solid \
     ${datadir}/icons \

recipes-kde/apps/filelight/filelight.bb

@@ -24,7 +24,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/granatier/granatier.bb

@@ -27,7 +27,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "a8a3fcc075cbae3047dfbf4e2b46e5b46f1dd0a4d37295d6246085ca37b8e49f"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/gwenview/gwenview.bb

@@ -32,7 +32,7 @@ EXTRA_OECMAKE += " \
     -DJPEGLIB_RUN_RESULT__TRYRUN_OUTPUT=0 \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${datadir}/solid \

recipes-kde/apps/kalgebra/kalgebra.bb

@@ -24,7 +24,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "60f450776d785c8c402806c28abce208e8a8f951b0da81875b3e29de4a13e1af"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/kalgebramobile \
 "

recipes-kde/apps/kalzium/kalzium.bb

@@ -39,7 +39,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "1549b5e08caa3ef7cab5375cfb8677dfc02a28a15136bef1edaf93c9fcadad15"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/knsrcfiles \

recipes-kde/apps/kapman/kapman.bb

@@ -28,7 +28,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "3d2c38d8ca6a3addb3f5059fa35a5cf09c4802ee78a45dc4ddbd9ccfdf9927ac"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kate/kate.bb

@@ -43,7 +43,7 @@ SRC_URI[sha256sum] = "b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kateproject \
     ${datadir}/k*5 \
     ${datadir}/plasma \

recipes-kde/apps/katomic/katomic.bb

@@ -29,10 +29,10 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "c1477c5a8c98c0fd5642316964e366616527ea97ffa475ddde36ce21c811d9b6"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/kconf_update \
     ${datadir}/knsrcfiles \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kblocks/kblocks.bb

@@ -24,7 +24,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "8cf49362c77985c655c20f492142cc0f8c8a7a8cdcf226dd5cbba37a85391df6"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/knsrcfiles \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kbounce/kbounce.bb

@@ -29,7 +29,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "3602903c8414a617461b308fb6c033a95facf14007d40b4105c601e4faba6046"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kbreakout/kbreakout.bb

@@ -25,7 +25,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "519bba779a8b5211b9aa33398787dc5203ba9a6fd5330096c40a0ca8ea1e03a0"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kcachegrind/kcachegrind.bb

@@ -27,9 +27,9 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
 "
 
-RRECOMMENDS_${PN} += "graphviz"
-RDEPENDS_${PN} += "perl"
+RRECOMMENDS:${PN} += "graphviz"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kcalc/kcalc.bb

@@ -27,7 +27,7 @@ SRC_URI[sha256sum] = "cf389a1c4db1c7da8b5b7ecec030e9c68df5d950c581d91f3931b7f6d2
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/kconf_update \

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -18,6 +18,6 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "12987b375ab326e5cf8e6cdd848a067d4d8c7df88e3efd0a67f5e8e5c112b191"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
 "

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -48,7 +48,7 @@ SRC_URI += " \
 
 EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/k*5 \
@@ -58,4 +58,4 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RRECOMMENDS_${PN} += "ffmpeg"
+RRECOMMENDS:${PN} += "ffmpeg"

recipes-kde/apps/kdevelop/kdevelop.bb

@@ -61,7 +61,7 @@ SRC_URI[sha256sum] = "0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-do_configure_append() {
+do_configure:append() {
     # although the name is missleading I still love cmake_extra_sanity.bbclass...
     sed -i \
         -e 's:${STAGING_DIR_NATIVE}::g' \
@@ -72,7 +72,7 @@ do_configure_append() {
 # Yeah nasty but...
 FILES_SOLIBSDEV = "${libdir}/libKDevC*so ${libdir}/libKDevPlatform*so"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kdev* \
     ${datadir}/k*5 \
     ${datadir}/knsrcfiles \
@@ -84,13 +84,13 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_QML} \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     bash \
     zsh \
 "
 
 # To give best user experience out of the box..
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
     packagegroup-qt5-toolchain-target \
     binutils \
     ccache \

recipes-kde/apps/kdf/kdf.bb

@@ -24,7 +24,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "1c5701339e2be1161a22e1ded046a096e24f84c4e59e36bc8b82f8508324a7ca"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/kdialog/kdialog.bb

@@ -23,4 +23,4 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6"
 
-FILES_${PN} += "${datadir}/dbus-1"
+FILES:${PN} += "${datadir}/dbus-1"

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -28,7 +28,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "0cdddfe7dbe4b1a25c0ef470b9cad469a7efe04a7b2c8076e24acf375d18267b"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/knsrcfiles \
 "

recipes-kde/apps/kfind/kfind.bb

@@ -22,6 +22,6 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
 "

recipes-kde/apps/kgeography/kgeography.bb

@@ -23,7 +23,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "f93ffaf4d5b340994b6025324fd972a2f211fbf9e0c83b6201dfb20db0fe539b"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
 "

recipes-kde/apps/kgoldrunner/kgoldrunner.bb

@@ -25,7 +25,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "1187b43789957fd2d6d826a589741231c60fb15fd2f8e29c29c107b86efc949b"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/knsrcfiles \
     ${datadir}/kxmlgui5 \
 "

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -33,7 +33,7 @@ SRC_URI[sha256sum] = "bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/k*5 \
     ${datadir}/dbus-1 \
@@ -41,4 +41,4 @@ FILES_${PN} += " \
     ${libdir}/libkdeinit5_khelpcenter.so \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kio-extras/kio-extras.bb

@@ -58,11 +58,11 @@ SRC_URI[sha256sum] = "4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-do_configure_append() {
+do_configure:append() {
     sed -i 's:${S}/smb/kdsoap-ws-discovery-client/src/kdwsdl2cpp:${STAGING_BINDIR_NATIVE}/kdwsdl2cpp:g' ${B}/build.ninja
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kio_bookmarks \
     ${datadir}/kio_info \ 
     ${datadir}/config.kcfg \
@@ -79,4 +79,4 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kmag/kmag.bb

@@ -21,7 +21,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kmahjongg/kmahjongg.bb

@@ -25,7 +25,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "414d0d3531a2479fb32400397defe1d3e821061590db607c4f8eecd8766d83c2"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kmines/kmines.bb

@@ -25,7 +25,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "f9703b5158633c63662b9c7892c049dd57a4fdf66c00f9378745a99ac71ab1a1"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/knotifications5 \
 "

recipes-kde/apps/kmix/kmix.bb

@@ -38,7 +38,7 @@ EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/config.kcfg \
     ${datadir}/plasma \

recipes-kde/apps/kmplot/kmplot.bb

@@ -25,7 +25,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "05b7bdc184e7c10b1b293812827bec44a3d773a3eefffd91eb782f08b45abf96"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/dbus-1 \

recipes-kde/apps/kolourpaint/kolourpaint.bb

@@ -32,7 +32,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/konsole/konsole.bb

@@ -45,7 +45,7 @@ SRC_URI[sha256sum] = "bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/khotkeys \
     ${datadir}/knsrcfiles \

recipes-kde/apps/kpat/kpat.bb

@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e04535457
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/mime \

recipes-kde/apps/kpmcore/kpmcore.bb

@@ -26,7 +26,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "cb9dd1002d489d6f2dcfdb44aa9581b0203d6386e874a34322de832014e58a03"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/dbus-1 \
     ${datadir}/polkit-1 \

recipes-kde/apps/kreversi/kreversi.bb

@@ -33,7 +33,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "24099d1a38f8ebd8d8df05463a5a763f18a20ef2183460dac1536060d42f798a"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
 "

recipes-kde/apps/krita/krita.bb

@@ -45,7 +45,7 @@ SRC_URI = " \
 SRC_URI[sha256sum] = "84c53686056d8f7485658004ca454eb275e35221307362e65daaac934a5c3b78"
 S = "${WORKDIR}/${BPN}-${PV}${PVEXT}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/color \
     ${datadir}/color-schemes \
     ${datadir}/icons \

recipes-kde/apps/ksudoku/ksudoku.bb

@@ -31,7 +31,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "88fe060ea9d9e6f14822c7231a026b34fe7daecf4fd8794cf239b5c1c097c88a"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/kxmlgui5 \
 "

recipes-kde/apps/ksystemlog/ksystemlog.bb

@@ -24,4 +24,4 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587"
 
-FILES_${PN} += "${datadir}/kxmlgui5"
+FILES:${PN} += "${datadir}/kxmlgui5"

recipes-kde/apps/ktorrent/ktorrent.bb

@@ -18,7 +18,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "c990e4c87dc2d61ae0ffcd6a0c93c5b84287e7a565eeba6abb96c282a649114a"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/knotifications5 \
     ${datadir}/kxmlgui5 \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/kwalletmanager/kwalletmanager.bb

@@ -29,7 +29,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/polkit-1 \
     ${datadir}/icons \

recipes-kde/apps/kwave/kwave.bb

@@ -46,7 +46,7 @@ PACKAGECONFIG[mp3] = "-DWITH_MP3=ON,-DWITH_MP3=OFF,id3lib libmad"
 PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio,pulseaudio-server"
 PACKAGECONFIG[qtmultimedia] = "-DWITH_QT_AUDIO=ON,-DWITH_QT_AUDIO=OFF,qtmultimedia"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kservicetypes5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/apps/libkdegames/libkdegames.bb

@@ -50,7 +50,7 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/carddecks \
     ${datadir}/kconf_update \
     ${OE_QMAKE_PATH_QML} \

recipes-kde/apps/libkmahjongg/libkmahjongg.bb

@@ -20,6 +20,6 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "8bdf07067fb165b8dbf7d9a652099e0562f65d0376967ea651bb44a4ae0b8552"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kmahjongglib \
 "

recipes-kde/apps/lokalize/lokalize.bb

@@ -28,10 +28,10 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "48603137bdedd40f4b473a6bbb32f07e1819603d67d34e3b24d994969b2ea470"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/k*5 \
     ${datadir}/icons \
 "
 
-RDEPENDS_${PN} += "translate-toolkit"
+RDEPENDS:${PN} += "translate-toolkit"

recipes-kde/apps/marble/marble.bb

@@ -45,10 +45,10 @@ PACKAGES =+ " \
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN}-dev += "${libdir}/libastro.so ${libdir}/libmarblewidget-qt5.so"
-FILES_${PN}-qt = "${bindir}/${BPN}-qt"
+FILES:${PN}-dev += "${libdir}/libastro.so ${libdir}/libmarblewidget-qt5.so"
+FILES:${PN}-qt = "${bindir}/${BPN}-qt"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/k* \
@@ -58,6 +58,6 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_QML} \
 "
 
-FILES_${PN}-designer-plugin += " \
+FILES:${PN}-designer-plugin += " \
     ${OE_QMAKE_PATH_PLUGINS}/designer \
 "

recipes-kde/apps/minuet/minuet.bb

@@ -23,10 +23,10 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "ccfef561ac234cf44d444950f079b4c2f2df0a8e3319cd609e9edae62882b46e"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RDEPENDS_${PN} += "timidity++ qtquickcontrols2"
+RDEPENDS:${PN} += "timidity++ qtquickcontrols2"

recipes-kde/apps/okteta/okteta.bb

@@ -43,7 +43,7 @@ PV = "0.26.6"
 SRC_URI = "https://download.kde.org/stable/okteta/${PV}/src/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/k*5 \
     ${datadir}/mime \

recipes-kde/apps/okular/okular.bb

@@ -44,7 +44,7 @@ SRC_URI[sha256sum] = "fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a42
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/kconf_update \
     ${datadir}/config.kcfg \

recipes-kde/apps/partitionmanager/partitionmanager.bb

@@ -33,7 +33,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "3c4cc3e766105798313bc13d45583dcbc7ab905f4fc3f596cac6b92d8d74b29f"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \

recipes-kde/apps/spectacle/spectacle.bb

@@ -36,7 +36,7 @@ DEPENDS += " \
 PV = "${KDE_APP_VERSION}"
 SRC_URI[sha256sum] = "5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/khotkeys \
     ${datadir}/knotifications5 \

recipes-kde/apps/umbrello/umbrello.bb

@@ -42,7 +42,7 @@ PACKAGECONFIG ?= " \
 
 PACKAGECONFIG[clang] = ",,clang,clang"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/umbrello5 \
 "

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb

@@ -36,20 +36,20 @@ DEPENDS += " \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
-do_compile_prepend() {
+do_compile:prepend() {
     # Error: Could not locate service type file kservicetypes5/ "kdedmodule.desktop" , tried ...
     export XDG_DATA_HOME=${STAGING_DATADIR}
 }
 
-do_configure_append() {
+do_configure:append() {
     # fix KCONFIG_COMPILER_LOCATION
     sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' ${B}/src/config-kstandarddirs.h
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/dbus-1 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

recipes-kde/kf5/porting-aids-tier3/kdesignerplugin/kdesignerplugin.bb

@@ -40,4 +40,4 @@ PACKAGECONFIG[kdewebkit] = "-DWITH_KDEWEBKIT=ON,,kdewebkit"
 # native binaries
 CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}"
 
-FILES_${PN} += "${libdir}/plugins/designer"
+FILES:${PN} += "${libdir}/plugins/designer"

recipes-kde/kf5/porting-aids-tier3/kdewebkit/kdewebkit.bb

@@ -22,4 +22,4 @@ DEPENDS += " \
 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266"
 
-FILES_${PN} += "${libdir}/plugins"
+FILES:${PN} += "${libdir}/plugins"

recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb

@@ -39,13 +39,13 @@ DEPENDS += " \
 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e"
 
-do_compile_append() {
+do_compile:append() {
     # gperf-native sets absolut debug comments/links in header
     sed -i 's:${STAGING_DIR_NATIVE}::' ${B}/src/kentities-gperf.h
     sed -i 's:${STAGING_DIR_NATIVE}::' ${B}/src/doctypes.h
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/kf5/porting-aids-tier3/kross/kross.bb

@@ -27,6 +27,6 @@ DEPENDS += "\
 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb

@@ -15,4 +15,4 @@ SRC_URI[sha256sum] = "909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-FILES_${PN} += "${OE_QMAKE_PATH_QML}"
+FILES:${PN} += "${OE_QMAKE_PATH_QML}"

recipes-kde/kf5/tier1/breeze-icons/breeze-icons.bb

@@ -8,10 +8,10 @@ DEPENDS += " \
 
 SRC_URI += "file://0003-Find-native-qrcAlias.patch"
 
-FILES_${PN} += "${datadir}/icons"
+FILES:${PN} += "${datadir}/icons"
 
 PACKAGES =+ "${PN}-binres"
-FILES_${PN}-binres = " \
+FILES:${PN}-binres = " \
     ${datadir}/icons/breeze/breeze-icons.rcc \
     ${datadir}/icons/breeze-dark/breeze-icons-dark.rcc \
 "

recipes-kde/kf5/tier1/kcodecs/kcodecs.bb

@@ -17,7 +17,7 @@ DEPENDS += "gperf-native"
 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a"
 
-do_compile_append() {
+do_compile:append() {
     # gperf-native sets absolut debug comments/links in header
     sed -i 's:${STAGING_DIR_NATIVE}::' ${B}/src/kentities.h
 }