From f8d25f1f7d10afaaec07dfb2eacb477fdbc67810 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Sat, 28 May 2022 13:36:21 +0200
Subject: [PATCH] Remove += from append and override syntax

Note that this is a simple change that make the syntax more obvious,
even though mistakenly the previous syntax might implied a different
behavior.
---
 recipes-kf5/tier1/kconfig.inc             | 2 +-
 recipes-kf5/tier1/ki18n.inc               | 8 ++++----
 recipes-kf5/tier1/sonnet.inc              | 4 ++--
 recipes-kf5/tier1/syntax-highlighting.inc | 4 ++--
 recipes-kf5/tier2/kauth.inc               | 4 ++--
 recipes-kf5/tier2/kdoctools.inc           | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/recipes-kf5/tier1/kconfig.inc b/recipes-kf5/tier1/kconfig.inc
index bd18078..2d7aabb 100644
--- a/recipes-kf5/tier1/kconfig.inc
+++ b/recipes-kf5/tier1/kconfig.inc
@@ -14,7 +14,7 @@ DEPENDS = "qtbase kconfig-native"
 require kconfig_metainfo.inc
 inherit cmake_kf5
 inherit reuse_license_checksums
-EXTRA_OECMAKE:class-native += " -DKCONFIG_USE_GUI=OFF"
+EXTRA_OECMAKE:class-native = " -DKCONFIG_USE_GUI=OFF"
 
 FILES:${PN}-dev += " \
     ${libexecdir}/kf5/kconfig_compiler_kf5 \
diff --git a/recipes-kf5/tier1/ki18n.inc b/recipes-kf5/tier1/ki18n.inc
index d937f49..cd72987 100644
--- a/recipes-kf5/tier1/ki18n.inc
+++ b/recipes-kf5/tier1/ki18n.inc
@@ -8,12 +8,12 @@
 LICENSE = "LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL) & BSD-3-Clause"
 PR = "r0"
 
-DEPENDS:class-native += " \
+DEPENDS:class-native = " \
     qtbase \
     gettext-native \
     extra-cmake-modules-native \
 "
-DEPENDS:class-target += " \
+DEPENDS:class-target = " \
     qtdeclarative \
     gettext-native \
     extra-cmake-modules \
@@ -24,9 +24,9 @@ inherit cmake_kf5
 inherit python3native
 inherit reuse_license_checksums
 
-EXTRA_OECMAKE:class-native += " -DBUILD_WITH_QTSCRIPT=OFF -DLibIntl_SEARCH_PATH=/usr/include"
+EXTRA_OECMAKE:class-native = " -DBUILD_WITH_QTSCRIPT=OFF -DLibIntl_SEARCH_PATH=/usr/include"
 
-RDEPENDS:${PN}:class-target += "iso-codes"
+RDEPENDS:${PN}:class-target = " iso-codes"
 
 FILES:${PN}-dbg += " \
     ${libdir}/plugins/kf5/.debug/ktranscript.so \
diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc
index 3149196..61a5301 100644
--- a/recipes-kf5/tier1/sonnet.inc
+++ b/recipes-kf5/tier1/sonnet.inc
@@ -16,8 +16,8 @@ require sonnet_metainfo.inc
 inherit cmake_kf5
 inherit reuse_license_checksums
 
-EXTRA_OECMAKE:append:class-native += " -DSONNET_USE_WIDGETS=OFF -DSONNET_USE_QML=OFF"
-EXTRA_OECMAKE:append:class-target += " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/parsetrigrams"
+EXTRA_OECMAKE:append:class-native = " -DSONNET_USE_WIDGETS=OFF -DSONNET_USE_QML=OFF"
+EXTRA_OECMAKE:append:class-target = " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/parsetrigrams"
 
 FILES:${PN} += " \
     ${datadir}/kf5/sonnet/ \
diff --git a/recipes-kf5/tier1/syntax-highlighting.inc b/recipes-kf5/tier1/syntax-highlighting.inc
index 282785b..f6eeafd 100644
--- a/recipes-kf5/tier1/syntax-highlighting.inc
+++ b/recipes-kf5/tier1/syntax-highlighting.inc
@@ -19,8 +19,8 @@ inherit cmake_kf5
 inherit perlnative
 inherit reuse_license_checksums
 
-EXTRA_OECMAKE:class-native += " -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF"
-EXTRA_OECMAKE:class-target += " -DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/katehighlightingindexer"
+EXTRA_OECMAKE:class-native = " -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF"
+EXTRA_OECMAKE:class-target = " -DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/katehighlightingindexer"
 
 sysroot_stage_all:append:class-native () {
     mkdir -p ${SYSROOT_DESTDIR}/${bindir}
diff --git a/recipes-kf5/tier2/kauth.inc b/recipes-kf5/tier2/kauth.inc
index 0bc25e0..bb15422 100644
--- a/recipes-kf5/tier2/kauth.inc
+++ b/recipes-kf5/tier2/kauth.inc
@@ -14,11 +14,11 @@ require kauth_metainfo.inc
 inherit cmake_kf5
 inherit reuse_license_checksums
 
-EXTRA_OECMAKE:class-target += " \
+EXTRA_OECMAKE:class-target = " \
     -DKAUTH_BACKEND_NAME=POLKITQT5-1 \
 "
 
-EXTRA_OECMAKE:class-native += " \
+EXTRA_OECMAKE:class-native = " \
     -DKAUTH_BACKEND_NAME=POLKITQT5-1 \
     -DKAUTH_BUILD_CODEGENERATOR_ONLY=ON \
     -DKAUTH_POLICY_FILES_INSTALL_DIR=${datadir}/polkit-1/actions \
diff --git a/recipes-kf5/tier2/kdoctools.inc b/recipes-kf5/tier2/kdoctools.inc
index 8b9f4d6..2a8a691 100644
--- a/recipes-kf5/tier2/kdoctools.inc
+++ b/recipes-kf5/tier2/kdoctools.inc
@@ -25,9 +25,9 @@ inherit python3native
 inherit perlnative
 inherit reuse_license_checksums
 
-EXTRA_OECMAKE:class-native += " -DINSTALL_INTERNAL_TOOLS=ON"
+EXTRA_OECMAKE:class-native = " -DINSTALL_INTERNAL_TOOLS=ON"
 
-EXTRA_OECMAKE:class-target += " \
+EXTRA_OECMAKE:class-target = " \
     -DMEINPROC5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/meinproc5 \
     -DDOCBOOKL10NHELPER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/docbookl10nhelper \
     -DCHECKXML5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/checkXML5 \