[gentoo-commits] proj/kde:master commit in: kde-frameworks/kirigami/, kde-frameworks/plasma/, kde-frameworks/kcalendarcore/, ...

[Andreas Sturmlechner]

commit:     28a840d3804a7a2842b74aba2df04f1365bb0839
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 13:50:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:51:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=28a840d3

*/*: RESTRICT+= -> RESTRICT= for EAPI-8 based ebuilds

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild                                | 2 +-
 app-office/calligraplan/calligraplan-9999.ebuild                        | 2 +-
 app-office/skrooge/skrooge-9999.ebuild                                  | 2 +-
 app-text/kbibtex/kbibtex-9999.ebuild                                    | 2 +-
 dev-libs/grantlee/grantlee-9999.ebuild                                  | 2 +-
 dev-libs/kproperty/kproperty-9999.ebuild                                | 2 +-
 dev-util/kdevelop-php/kdevelop-php-5.6.9999.ebuild                      | 2 +-
 dev-util/kdevelop-php/kdevelop-php-9999.ebuild                          | 2 +-
 dev-util/kdevelop-python/kdevelop-python-5.6.9999.ebuild                | 2 +-
 dev-util/kdevelop-python/kdevelop-python-9999.ebuild                    | 2 +-
 dev-util/kdevelop/kdevelop-5.6.9999.ebuild                              | 2 +-
 dev-util/kdevelop/kdevelop-9999.ebuild                                  | 2 +-
 kde-apps/akonadi-calendar/akonadi-calendar-21.08.49.9999.ebuild         | 2 +-
 kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild                  | 2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-21.08.49.9999.ebuild         | 2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild                  | 2 +-
 kde-apps/akonadi-mime/akonadi-mime-21.08.49.9999.ebuild                 | 2 +-
 kde-apps/akonadi-mime/akonadi-mime-9999.ebuild                          | 2 +-
 kde-apps/akonadi-search/akonadi-search-21.08.49.9999.ebuild             | 2 +-
 kde-apps/akonadi-search/akonadi-search-9999.ebuild                      | 2 +-
 kde-apps/akonadi/akonadi-21.08.49.9999.ebuild                           | 2 +-
 kde-apps/akonadi/akonadi-9999.ebuild                                    | 2 +-
 kde-apps/baloo-widgets/baloo-widgets-21.08.49.9999.ebuild               | 2 +-
 kde-apps/baloo-widgets/baloo-widgets-9999.ebuild                        | 2 +-
 kde-apps/cantor/cantor-21.08.49.9999.ebuild                             | 2 +-
 kde-apps/cantor/cantor-9999.ebuild                                      | 2 +-
 kde-apps/grantleetheme/grantleetheme-21.08.49.9999.ebuild               | 2 +-
 kde-apps/grantleetheme/grantleetheme-9999.ebuild                        | 2 +-
 kde-apps/gwenview/gwenview-21.08.49.9999.ebuild                         | 2 +-
 kde-apps/gwenview/gwenview-9999.ebuild                                  | 2 +-
 .../kaccounts-integration/kaccounts-integration-21.08.49.9999.ebuild    | 2 +-
 kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild        | 2 +-
 kde-apps/kamoso/kamoso-21.08.49.9999.ebuild                             | 2 +-
 kde-apps/kamoso/kamoso-9999.ebuild                                      | 2 +-
 kde-apps/kcalutils/kcalutils-21.08.49.9999.ebuild                       | 2 +-
 kde-apps/kcalutils/kcalutils-9999.ebuild                                | 2 +-
 kde-apps/kdebugsettings/kdebugsettings-21.08.49.9999.ebuild             | 2 +-
 kde-apps/kdebugsettings/kdebugsettings-9999.ebuild                      | 2 +-
 kde-apps/kdenlive/kdenlive-21.08.49.9999.ebuild                         | 2 +-
 kde-apps/kdenlive/kdenlive-9999.ebuild                                  | 2 +-
 kde-apps/kdepim-addons/kdepim-addons-21.08.49.9999.ebuild               | 2 +-
 kde-apps/kdepim-addons/kdepim-addons-9999.ebuild                        | 2 +-
 kde-apps/kdepim-runtime/kdepim-runtime-21.08.49.9999.ebuild             | 2 +-
 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild                      | 2 +-
 kde-apps/kidentitymanagement/kidentitymanagement-21.08.49.9999.ebuild   | 2 +-
 kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild            | 2 +-
 kde-apps/kio-extras/kio-extras-21.08.49.9999.ebuild                     | 2 +-
 kde-apps/kio-extras/kio-extras-9999.ebuild                              | 2 +-
 kde-apps/kleopatra/kleopatra-21.08.49.9999.ebuild                       | 2 +-
 kde-apps/kleopatra/kleopatra-9999.ebuild                                | 2 +-
 kde-apps/kmail/kmail-21.08.49.9999.ebuild                               | 2 +-
 kde-apps/kmail/kmail-9999.ebuild                                        | 2 +-
 kde-apps/kmailtransport/kmailtransport-21.08.49.9999.ebuild             | 2 +-
 kde-apps/kmailtransport/kmailtransport-9999.ebuild                      | 2 +-
 kde-apps/konqueror/konqueror-21.08.49.9999.ebuild                       | 2 +-
 kde-apps/konqueror/konqueror-9999.ebuild                                | 2 +-
 kde-apps/kopete/kopete-21.08.49.9999.ebuild                             | 2 +-
 kde-apps/kopete/kopete-9999.ebuild                                      | 2 +-
 kde-apps/korganizer/korganizer-21.08.49.9999.ebuild                     | 2 +-
 kde-apps/korganizer/korganizer-9999.ebuild                              | 2 +-
 kde-apps/kpimtextedit/kpimtextedit-21.08.49.9999.ebuild                 | 2 +-
 kde-apps/kpimtextedit/kpimtextedit-9999.ebuild                          | 2 +-
 kde-apps/ksmtp/ksmtp-21.08.49.9999.ebuild                               | 2 +-
 kde-apps/ksmtp/ksmtp-9999.ebuild                                        | 2 +-
 kde-apps/libkcddb/libkcddb-21.08.49.9999.ebuild                         | 2 +-
 kde-apps/libkcddb/libkcddb-9999.ebuild                                  | 2 +-
 kde-apps/libksieve/libksieve-21.08.49.9999.ebuild                       | 2 +-
 kde-apps/libksieve/libksieve-9999.ebuild                                | 2 +-
 kde-apps/lokalize/lokalize-21.08.49.9999.ebuild                         | 2 +-
 kde-apps/lokalize/lokalize-9999.ebuild                                  | 2 +-
 kde-apps/mailcommon/mailcommon-21.08.49.9999.ebuild                     | 2 +-
 kde-apps/mailcommon/mailcommon-9999.ebuild                              | 2 +-
 kde-apps/marble/marble-21.08.49.9999.ebuild                             | 2 +-
 kde-apps/marble/marble-9999.ebuild                                      | 2 +-
 kde-apps/messagelib/messagelib-21.08.49.9999.ebuild                     | 2 +-
 kde-apps/messagelib/messagelib-9999.ebuild                              | 2 +-
 kde-apps/pim-data-exporter/pim-data-exporter-21.08.49.9999.ebuild       | 2 +-
 kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild                | 2 +-
 kde-frameworks/baloo/baloo-9999.ebuild                                  | 2 +-
 kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild            | 2 +-
 kde-frameworks/breeze-icons/breeze-icons-9999.ebuild                    | 2 +-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild      | 2 +-
 kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild    | 2 +-
 kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild                  | 2 +-
 kde-frameworks/kconfig/kconfig-9999.ebuild                              | 2 +-
 kde-frameworks/kcrash/kcrash-9999.ebuild                                | 2 +-
 kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild              | 2 +-
 kde-frameworks/kemoticons/kemoticons-9999.ebuild                        | 2 +-
 kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild                  | 2 +-
 kde-frameworks/kiconthemes/kiconthemes-9999.ebuild                      | 2 +-
 kde-frameworks/kio/kio-9999.ebuild                                      | 2 +-
 kde-frameworks/kirigami/kirigami-9999.ebuild                            | 2 +-
 kde-frameworks/kservice/kservice-9999.ebuild                            | 2 +-
 kde-frameworks/ktexteditor/ktexteditor-9999.ebuild                      | 2 +-
 kde-frameworks/kwayland/kwayland-9999.ebuild                            | 2 +-
 kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild                  | 2 +-
 kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild              | 2 +-
 kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild                    | 2 +-
 kde-frameworks/plasma/plasma-9999.ebuild                                | 2 +-
 kde-frameworks/purpose/purpose-9999.ebuild                              | 2 +-
 kde-misc/kdeconnect/kdeconnect-21.08.49.9999.ebuild                     | 2 +-
 kde-misc/kdeconnect/kdeconnect-9999.ebuild                              | 2 +-
 kde-misc/kio-fuse/kio-fuse-9999.ebuild                                  | 2 +-
 kde-misc/kio-stash/kio-stash-9999.ebuild                                | 2 +-
 kde-misc/tellico/tellico-9999.ebuild                                    | 2 +-
 kde-plasma/kde-cli-tools/kde-cli-tools-5.22.49.9999.ebuild              | 2 +-
 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild                      | 2 +-
 kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.49.9999.ebuild        | 2 +-
 kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild                | 2 +-
 kde-plasma/kscreen/kscreen-5.22.49.9999.ebuild                          | 2 +-
 kde-plasma/kscreen/kscreen-9999.ebuild                                  | 2 +-
 .../kwayland-integration/kwayland-integration-5.22.49.9999.ebuild       | 2 +-
 kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild        | 2 +-
 kde-plasma/kwayland-server/kwayland-server-5.22.49.9999.ebuild          | 2 +-
 kde-plasma/kwayland-server/kwayland-server-9999.ebuild                  | 2 +-
 kde-plasma/kwin/kwin-5.22.49.9999.ebuild                                | 2 +-
 kde-plasma/kwin/kwin-9999.ebuild                                        | 2 +-
 kde-plasma/libkscreen/libkscreen-5.22.49.9999.ebuild                    | 2 +-
 kde-plasma/libkscreen/libkscreen-9999.ebuild                            | 2 +-
 kde-plasma/plasma-integration/plasma-integration-5.22.49.9999.ebuild    | 2 +-
 kde-plasma/plasma-integration/plasma-integration-9999.ebuild            | 2 +-
 kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.49.9999.ebuild    | 2 +-
 kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild            | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild        | 2 +-
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild                | 2 +-
 media-gfx/digikam/digikam-9999.ebuild                                   | 2 +-
 media-gfx/krita/krita-9999.ebuild                                       | 2 +-
 media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild  | 2 +-
 media-sound/elisa/elisa-21.08.49.9999.ebuild                            | 2 +-
 media-sound/elisa/elisa-9999.ebuild                                     | 2 +-
 media-sound/kid3/kid3-9999.ebuild                                       | 2 +-
 .../kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild   | 2 +-
 sys-libs/kpmcore/kpmcore-21.08.49.9999.ebuild                           | 2 +-
 sys-libs/kpmcore/kpmcore-9999.ebuild                                    | 2 +-
 134 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 992349a559..bb32e8f326 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
 	okular openexr +pdf phonon spacenav +truetype X
 	$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
 # Required for the matlab/octave formula tool

diff --git a/app-office/calligraplan/calligraplan-9999.ebuild b/app-office/calligraplan/calligraplan-9999.ebuild
index eae94cbae3..ff2a6c27fc 100644
--- a/app-office/calligraplan/calligraplan-9999.ebuild
+++ b/app-office/calligraplan/calligraplan-9999.ebuild
@@ -74,7 +74,7 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtsvg-${QTMIN}:5
 "
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index 8f448affa7..799745e8dd 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -23,7 +23,7 @@ SLOT="5"
 IUSE="activities kde ofx"
 
 # hangs + installs files (also requires KF5DesignerPlugin)
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=app-crypt/qca-2.3.0:2

diff --git a/app-text/kbibtex/kbibtex-9999.ebuild b/app-text/kbibtex/kbibtex-9999.ebuild
index e349d4eaeb..0c6a9edbf2 100644
--- a/app-text/kbibtex/kbibtex-9999.ebuild
+++ b/app-text/kbibtex/kbibtex-9999.ebuild
@@ -22,7 +22,7 @@ LICENSE="GPL-2"
 SLOT="5"
 IUSE="webengine"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	app-text/poppler[qt5]

diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index cf6a0097df..7d992f560d 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"

diff --git a/dev-libs/kproperty/kproperty-9999.ebuild b/dev-libs/kproperty/kproperty-9999.ebuild
index 54f31841df..dc0c70b584 100644
--- a/dev-libs/kproperty/kproperty-9999.ebuild
+++ b/dev-libs/kproperty/kproperty-9999.ebuild
@@ -31,4 +31,4 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # tests require installed headers, bug 636108
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.9999.ebuild
index 63cdd6a78f..f6e59344ef 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.6.9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.9999.ebuild
@@ -25,7 +25,7 @@ SLOT="5"
 IUSE=""
 
 # remaining tests fail for some, bug 668530
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	test? ( dev-util/kdevelop:5[test] )

diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 63cdd6a78f..f6e59344ef 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="5"
 IUSE=""
 
 # remaining tests fail for some, bug 668530
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	test? ( dev-util/kdevelop:5[test] )

diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.9999.ebuild
index 9cda47077e..b697e8e39b 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.9999.ebuild
@@ -23,7 +23,7 @@ SLOT="5"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
index 9cda47077e..b697e8e39b 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -23,7 +23,7 @@ SLOT="5"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/dev-util/kdevelop/kdevelop-5.6.9999.ebuild b/dev-util/kdevelop/kdevelop-5.6.9999.ebuild
index 47b0b410c9..ca4deafce6 100644
--- a/dev-util/kdevelop/kdevelop-5.6.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.6.9999.ebuild
@@ -24,7 +24,7 @@ SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
 
 # see bug 366471
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	dev-libs/grantlee:5

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 6062adf365..7d1452543b 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -24,7 +24,7 @@ SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
 
 # see bug 366471
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	dev-libs/grantlee:5

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.08.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.08.49.9999.ebuild
index 99fe28e575..b47342cf1c 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.08.49.9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-21.08.49.9999.ebuild
@@ -42,4 +42,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index 85b60c8686..f5444babef 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -42,4 +42,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-21.08.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-21.08.49.9999.ebuild
index 71b12f1424..f1b882adf6 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-21.08.49.9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-21.08.49.9999.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/grantlee-5.2.0:5

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
index dc4adfe98c..aee334d336 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/grantlee-5.2.0:5

diff --git a/kde-apps/akonadi-mime/akonadi-mime-21.08.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-21.08.49.9999.ebuild
index 7442c54e72..59e2aabb40 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-21.08.49.9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-21.08.49.9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	dev-libs/libxslt

diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
index 5c2bbc2a53..3acae11711 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	dev-libs/libxslt

diff --git a/kde-apps/akonadi-search/akonadi-search-21.08.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-21.08.49.9999.ebuild
index 980b6b24a7..ba07bc2437 100644
--- a/kde-apps/akonadi-search/akonadi-search-21.08.49.9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-21.08.49.9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # perpetually broken, bug 662378
+RESTRICT="test" # perpetually broken, bug 662378
 
 BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )

diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index 87424d97b2..608963643f 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # perpetually broken, bug 662378
+RESTRICT="test" # perpetually broken, bug 662378
 
 BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )

diff --git a/kde-apps/akonadi/akonadi-21.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-21.08.49.9999.ebuild
index fc30ded51a..c04e9222b1 100644
--- a/kde-apps/akonadi/akonadi-21.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-21.08.49.9999.ebuild
@@ -22,7 +22,7 @@ IUSE="+kaccounts +mysql postgres sqlite tools xml"
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	app-arch/xz-utils

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 9788221871..62404a1cb6 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="+kaccounts +mysql postgres sqlite tools xml"
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	app-arch/xz-utils

diff --git a/kde-apps/baloo-widgets/baloo-widgets-21.08.49.9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-21.08.49.9999.ebuild
index 6602c24f0c..b26d0f4326 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-21.08.49.9999.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-21.08.49.9999.ebuild
@@ -28,4 +28,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
index 4c47e6344c..57da1e44fc 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
@@ -28,4 +28,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/cantor/cantor-21.08.49.9999.ebuild b/kde-apps/cantor/cantor-21.08.49.9999.ebuild
index 26065fe040..1c301ac9bf 100644
--- a/kde-apps/cantor/cantor-21.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-21.08.49.9999.ebuild
@@ -22,7 +22,7 @@ KEYWORDS=""
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
 DEPEND="

diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 78e91d5a64..92c286c968 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -22,7 +22,7 @@ KEYWORDS=""
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
 DEPEND="

diff --git a/kde-apps/grantleetheme/grantleetheme-21.08.49.9999.ebuild b/kde-apps/grantleetheme/grantleetheme-21.08.49.9999.ebuild
index 81f5e19668..376b5d1092 100644
--- a/kde-apps/grantleetheme/grantleetheme-21.08.49.9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-21.08.49.9999.ebuild
@@ -33,4 +33,4 @@ DEPEND="${RDEPEND}
 "
 
 # fails if package not already installed
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
index 552862cfb8..0f9be2b5aa 100644
--- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
@@ -33,4 +33,4 @@ DEPEND="${RDEPEND}
 "
 
 # fails if package not already installed
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/gwenview/gwenview-21.08.49.9999.ebuild b/kde-apps/gwenview/gwenview-21.08.49.9999.ebuild
index 2a93b7c253..4c41c94e56 100644
--- a/kde-apps/gwenview/gwenview-21.08.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-21.08.49.9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 59d54cf877..0f6858f648 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-21.08.49.9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-21.08.49.9999.ebuild
index 30b89ac37c..d9a1a919ab 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-21.08.49.9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-21.08.49.9999.ebuild
@@ -47,4 +47,4 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 # bug #549444
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
index 50bdda95fa..7ef9901b1a 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
@@ -47,4 +47,4 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 # bug #549444
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/kamoso/kamoso-21.08.49.9999.ebuild b/kde-apps/kamoso/kamoso-21.08.49.9999.ebuild
index 2d0fd7e047..413fb4925a 100644
--- a/kde-apps/kamoso/kamoso-21.08.49.9999.ebuild
+++ b/kde-apps/kamoso/kamoso-21.08.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # bug 653674
+RESTRICT="test" # bug 653674
 
 DEPEND="
 	dev-libs/glib:2

diff --git a/kde-apps/kamoso/kamoso-9999.ebuild b/kde-apps/kamoso/kamoso-9999.ebuild
index d7f195e571..67bbb13210 100644
--- a/kde-apps/kamoso/kamoso-9999.ebuild
+++ b/kde-apps/kamoso/kamoso-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # bug 653674
+RESTRICT="test" # bug 653674
 
 DEPEND="
 	dev-libs/glib:2

diff --git a/kde-apps/kcalutils/kcalutils-21.08.49.9999.ebuild b/kde-apps/kcalutils/kcalutils-21.08.49.9999.ebuild
index 0f75534850..9faa17ce89 100644
--- a/kde-apps/kcalutils/kcalutils-21.08.49.9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-21.08.49.9999.ebuild
@@ -34,4 +34,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # bugs 653616, 711666
+RESTRICT="test" # bugs 653616, 711666

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
index 1a8b11b162..c749b05d9e 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
@@ -34,4 +34,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # bugs 653616, 711666
+RESTRICT="test" # bugs 653616, 711666

diff --git a/kde-apps/kdebugsettings/kdebugsettings-21.08.49.9999.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.08.49.9999.ebuild
index 3b7feccee5..7be3539c1b 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-21.08.49.9999.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-21.08.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild b/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
index 664450dc28..97d3d84c93 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-apps/kdenlive/kdenlive-21.08.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-21.08.49.9999.ebuild
index e80b8899f5..6191ef0a12 100644
--- a/kde-apps/kdenlive/kdenlive-21.08.49.9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-21.08.49.9999.ebuild
@@ -19,7 +19,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="gles2-only semantic-desktop share v4l"
 
-RESTRICT+=" test" # segfaults, bug 684132
+RESTRICT="test" # segfaults, bug 684132
 
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5

diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild
index 5228ea89d8..94004889ba 100644
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="gles2-only semantic-desktop share v4l"
 
-RESTRICT+=" test" # segfaults, bug 684132
+RESTRICT="test" # segfaults, bug 684132
 
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5

diff --git a/kde-apps/kdepim-addons/kdepim-addons-21.08.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-21.08.49.9999.ebuild
index 9fbbfbecb6..9dfd11a5dd 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-21.08.49.9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-21.08.49.9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index a29ee05725..cd5afc8b47 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.08.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.49.9999.ebuild
index e36306c66d..49d0f36b4d 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.08.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.49.9999.ebuild
@@ -19,7 +19,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO kolab
 RDEPEND="

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 217ec618cf..187a4775e2 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO kolab
 RDEPEND="

diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-21.08.49.9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-21.08.49.9999.ebuild
index 4458253eef..24eacd24fd 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-21.08.49.9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-21.08.49.9999.ebuild
@@ -34,4 +34,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
index 7eb8443440..52aa643539 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
@@ -34,4 +34,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/kio-extras/kio-extras-21.08.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-21.08.49.9999.ebuild
index f8c25f70d5..de41456f3b 100644
--- a/kde-apps/kio-extras/kio-extras-21.08.49.9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.08.49.9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
index b88d5da161..3c50e8f90f 100644
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-apps/kleopatra/kleopatra-21.08.49.9999.ebuild b/kde-apps/kleopatra/kleopatra-21.08.49.9999.ebuild
index 523860e59d..9c375a28ea 100644
--- a/kde-apps/kleopatra/kleopatra-21.08.49.9999.ebuild
+++ b/kde-apps/kleopatra/kleopatra-21.08.49.9999.ebuild
@@ -52,4 +52,4 @@ RDEPEND="${DEPEND}
 "
 
 # tests completely broken, bug #641720
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/kleopatra/kleopatra-9999.ebuild b/kde-apps/kleopatra/kleopatra-9999.ebuild
index 63d652eb01..5dab6bac40 100644
--- a/kde-apps/kleopatra/kleopatra-9999.ebuild
+++ b/kde-apps/kleopatra/kleopatra-9999.ebuild
@@ -52,4 +52,4 @@ RDEPEND="${DEPEND}
 "
 
 # tests completely broken, bug #641720
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/kmail/kmail-21.08.49.9999.ebuild b/kde-apps/kmail/kmail-21.08.49.9999.ebuild
index 10a8ba2fcf..59e7516042 100644
--- a/kde-apps/kmail/kmail-21.08.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-21.08.49.9999.ebuild
@@ -20,7 +20,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="pch telemetry"
 
-RESTRICT+=" test" # bug 616878
+RESTRICT="test" # bug 616878
 
 COMMON_DEPEND="
 	>=app-crypt/gpgme-1.11.1[cxx,qt5]

diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 811ed09e54..51d7a955ec 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -20,7 +20,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="pch telemetry"
 
-RESTRICT+=" test" # bug 616878
+RESTRICT="test" # bug 616878
 
 COMMON_DEPEND="
 	>=app-crypt/gpgme-1.11.1[cxx,qt5]

diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.49.9999.ebuild b/kde-apps/kmailtransport/kmailtransport-21.08.49.9999.ebuild
index 6aa58f3699..7029d5aaea 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.08.49.9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.08.49.9999.ebuild
@@ -16,7 +16,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/qtkeychain:=

diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
index 7b52a2454f..bac8f19ff6 100644
--- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/qtkeychain:=

diff --git a/kde-apps/konqueror/konqueror-21.08.49.9999.ebuild b/kde-apps/konqueror/konqueror-21.08.49.9999.ebuild
index 6a8c3fd023..9c987d0505 100644
--- a/kde-apps/konqueror/konqueror-21.08.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-21.08.49.9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index 039857df3f..7b6bc4b2f1 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-apps/kopete/kopete-21.08.49.9999.ebuild b/kde-apps/kopete/kopete-21.08.49.9999.ebuild
index ca1cbe85ea..e36900d064 100644
--- a/kde-apps/kopete/kopete-21.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-21.08.49.9999.ebuild
@@ -134,7 +134,7 @@ DEPEND="${COMMON_DEPEND}
 #	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local x x2

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 491129c999..a3fbc2bbad 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -134,7 +134,7 @@ DEPEND="${COMMON_DEPEND}
 #	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local x x2

diff --git a/kde-apps/korganizer/korganizer-21.08.49.9999.ebuild b/kde-apps/korganizer/korganizer-21.08.49.9999.ebuild
index 28261128f0..429ae447e7 100644
--- a/kde-apps/korganizer/korganizer-21.08.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-21.08.49.9999.ebuild
@@ -84,7 +84,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 # testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index 6e833a2ec0..fced4f379e 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -84,7 +84,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 # testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.08.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.08.49.9999.ebuild
index a7cef67ddf..19831d0501 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.08.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.08.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index 1007414b61..78b53cac8c 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-apps/ksmtp/ksmtp-21.08.49.9999.ebuild b/kde-apps/ksmtp/ksmtp-21.08.49.9999.ebuild
index 602659e1eb..7da4b82ce4 100644
--- a/kde-apps/ksmtp/ksmtp-21.08.49.9999.ebuild
+++ b/kde-apps/ksmtp/ksmtp-21.08.49.9999.ebuild
@@ -25,4 +25,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # bug 642410
+RESTRICT="test" # bug 642410

diff --git a/kde-apps/ksmtp/ksmtp-9999.ebuild b/kde-apps/ksmtp/ksmtp-9999.ebuild
index e8be2a6a16..169090c24d 100644
--- a/kde-apps/ksmtp/ksmtp-9999.ebuild
+++ b/kde-apps/ksmtp/ksmtp-9999.ebuild
@@ -25,4 +25,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # bug 642410
+RESTRICT="test" # bug 642410

diff --git a/kde-apps/libkcddb/libkcddb-21.08.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-21.08.49.9999.ebuild
index 6ec24e94c7..82f51cb4c9 100644
--- a/kde-apps/libkcddb/libkcddb-21.08.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-21.08.49.9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 # tests require network access and compare static data with online data
 # bug 280996
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 514852bc43..f8675bf3e4 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 # tests require network access and compare static data with online data
 # bug 280996
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-apps/libksieve/libksieve-21.08.49.9999.ebuild b/kde-apps/libksieve/libksieve-21.08.49.9999.ebuild
index 543049ed56..f708832ba8 100644
--- a/kde-apps/libksieve/libksieve-21.08.49.9999.ebuild
+++ b/kde-apps/libksieve/libksieve-21.08.49.9999.ebuild
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	>=kde-apps/kmailtransport-${PVCUT}:5
 "
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild
index 8338270e68..1fca459b37 100644
--- a/kde-apps/libksieve/libksieve-9999.ebuild
+++ b/kde-apps/libksieve/libksieve-9999.ebuild
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	>=kde-apps/kmailtransport-${PVCUT}:5
 "
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-apps/lokalize/lokalize-21.08.49.9999.ebuild b/kde-apps/lokalize/lokalize-21.08.49.9999.ebuild
index 7b6fb8ca03..40b409f7f3 100644
--- a/kde-apps/lokalize/lokalize-21.08.49.9999.ebuild
+++ b/kde-apps/lokalize/lokalize-21.08.49.9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RESTRICT+=" test" # tests are broken, bug 739734
+RESTRICT="test" # tests are broken, bug 739734
 
 DEPEND="${PYTHON_DEPS}
 	>=app-text/hunspell-1.2.8:=

diff --git a/kde-apps/lokalize/lokalize-9999.ebuild b/kde-apps/lokalize/lokalize-9999.ebuild
index 51dc8be320..0db447f69f 100644
--- a/kde-apps/lokalize/lokalize-9999.ebuild
+++ b/kde-apps/lokalize/lokalize-9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RESTRICT+=" test" # tests are broken, bug 739734
+RESTRICT="test" # tests are broken, bug 739734
 
 DEPEND="${PYTHON_DEPS}
 	>=app-text/hunspell-1.2.8:=

diff --git a/kde-apps/mailcommon/mailcommon-21.08.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-21.08.49.9999.ebuild
index 8ab53bf4da..abc0207687 100644
--- a/kde-apps/mailcommon/mailcommon-21.08.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-21.08.49.9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5

diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
index 8a1a936f21..7d2a9c00c2 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5

diff --git a/kde-apps/marble/marble-21.08.49.9999.ebuild b/kde-apps/marble/marble-21.08.49.9999.ebuild
index 8a04816055..7baf17c840 100644
--- a/kde-apps/marble/marble-21.08.49.9999.ebuild
+++ b/kde-apps/marble/marble-21.08.49.9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # bug 588320
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index d0d4ae45c2..bdf6db5fba 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # bug 588320
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-apps/messagelib/messagelib-21.08.49.9999.ebuild b/kde-apps/messagelib/messagelib-21.08.49.9999.ebuild
index 638f016050..17568d7bf2 100644
--- a/kde-apps/messagelib/messagelib-21.08.49.9999.ebuild
+++ b/kde-apps/messagelib/messagelib-21.08.49.9999.ebuild
@@ -69,4 +69,4 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # bug 579630
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
index 6da4bccd06..1dae8bb2e7 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -69,4 +69,4 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # bug 579630
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-21.08.49.9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-21.08.49.9999.ebuild
index 734e96aa52..3e191a7b06 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-21.08.49.9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-21.08.49.9999.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # 11 out of 21 tests fail...
+RESTRICT="test" # 11 out of 21 tests fail...
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
index 13851ae240..3c3a827f0a 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test" # 11 out of 21 tests fail...
+RESTRICT="test" # 11 out of 21 tests fail...
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild
index aa2c03be68..cba02192d7 100644
--- a/kde-frameworks/baloo/baloo-9999.ebuild
+++ b/kde-frameworks/baloo/baloo-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # bug 624250
+RESTRICT="test" # bug 624250
 
 DEPEND="
 	>=dev-db/lmdb-0.9.17

diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild
index 6e89f52c7d..3a8e782187 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE="test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')

diff --git a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
index 48a71c2b45..9a0939594b 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE="test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-qt/qttest:5 )"
 BDEPEND="${PYTHON_DEPS}

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
index a3a696a765..142667eb9f 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 KEYWORDS=""
 IUSE="doc test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? (

diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index 9194d00c79..19e4cca3b1 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild
index e9601ec891..bc848d0179 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ test? ( LGPL-3+ )"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
+RESTRICT="test" # multiple tests fail or hang indefinitely
 
 BDEPEND="
 	sys-devel/bison

diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild b/kde-frameworks/kconfig/kconfig-9999.ebuild
index 45d2b04511..b8423f64d6 100644
--- a/kde-frameworks/kconfig/kconfig-9999.ebuild
+++ b/kde-frameworks/kconfig/kconfig-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="dbus nls"
 
 # bug 560086
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )

diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild b/kde-frameworks/kcrash/kcrash-9999.ebuild
index 06b09713b7..40519d9525 100644
--- a/kde-frameworks/kcrash/kcrash-9999.ebuild
+++ b/kde-frameworks/kcrash/kcrash-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="nls"
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index fd21b968bc..9721a13775 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	dev-lang/perl

diff --git a/kde-frameworks/kemoticons/kemoticons-9999.ebuild b/kde-frameworks/kemoticons/kemoticons-9999.ebuild
index f962493534..9455f9e68a 100644
--- a/kde-frameworks/kemoticons/kemoticons-9999.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
index 9854e310d6..ece034bd3f 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	test? ( ${PYTHON_DEPS} )

diff --git a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
index 28d775053a..e5e151eafa 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # bug 574770
+RESTRICT="test" # bug 574770
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index fadc3c8bdb..3179ff78dd 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/libxml2

diff --git a/kde-frameworks/kirigami/kirigami-9999.ebuild b/kde-frameworks/kirigami/kirigami-9999.ebuild
index 64e9b26dd4..92b2426013 100644
--- a/kde-frameworks/kirigami/kirigami-9999.ebuild
+++ b/kde-frameworks/kirigami/kirigami-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires package to already be installed
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-${QTMIN}:5

diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild
index 3cd09effc2..b9a8567979 100644
--- a/kde-frameworks/kservice/kservice-9999.ebuild
+++ b/kde-frameworks/kservice/kservice-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="+man"
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	sys-devel/bison

diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
index 4376e76aa3..51a9741ca5 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="+editorconfig git"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )

diff --git a/kde-frameworks/kwayland/kwayland-9999.ebuild b/kde-frameworks/kwayland/kwayland-9999.ebuild
index f29ee6f07a..60fb028286 100644
--- a/kde-frameworks/kwayland/kwayland-9999.ebuild
+++ b/kde-frameworks/kwayland/kwayland-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
+RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
 RDEPEND="

diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
index 009db081b8..c5f169bd37 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
 KEYWORDS=""
 IUSE="nls X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
index 76ca7850c4..028abcfec5 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	virtual/pkgconfig

diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
index a113af5cb5..11fca15988 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE="test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5

diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild
index c4e0fe4331..cdc2612fe6 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="gles2-only wayland X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	>=kde-frameworks/kdoctools-${PVCUT}:5

diff --git a/kde-frameworks/purpose/purpose-9999.ebuild b/kde-frameworks/purpose/purpose-9999.ebuild
index 5e0fc70a25..48d1b60530 100644
--- a/kde-frameworks/purpose/purpose-9999.ebuild
+++ b/kde-frameworks/purpose/purpose-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="bluetooth +kaccounts"
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5

diff --git a/kde-misc/kdeconnect/kdeconnect-21.08.49.9999.ebuild b/kde-misc/kdeconnect/kdeconnect-21.08.49.9999.ebuild
index 9ecbae2148..7984539143 100644
--- a/kde-misc/kdeconnect/kdeconnect-21.08.49.9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-21.08.49.9999.ebuild
@@ -20,7 +20,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="bluetooth pulseaudio X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=app-crypt/qca-2.3.0:2[ssl]

diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index 358bec401b..d0efc0ea66 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -20,7 +20,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="bluetooth pulseaudio X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=app-crypt/qca-2.3.0:2[ssl]

diff --git a/kde-misc/kio-fuse/kio-fuse-9999.ebuild b/kde-misc/kio-fuse/kio-fuse-9999.ebuild
index 64a168a5e4..66bcf43b14 100644
--- a/kde-misc/kio-fuse/kio-fuse-9999.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-9999.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3+"
 SLOT="5"
 IUSE=""
 
-RESTRICT+=" test" # depend on fuse kernel module
+RESTRICT="test" # depend on fuse kernel module
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-misc/kio-stash/kio-stash-9999.ebuild b/kde-misc/kio-stash/kio-stash-9999.ebuild
index 3696e8ea2a..6d15b79c04 100644
--- a/kde-misc/kio-stash/kio-stash-9999.ebuild
+++ b/kde-misc/kio-stash/kio-stash-9999.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	dev-qt/qtdbus:5

diff --git a/kde-misc/tellico/tellico-9999.ebuild b/kde-misc/tellico/tellico-9999.ebuild
index e8b789960e..39dd61af95 100644
--- a/kde-misc/tellico/tellico-9999.ebuild
+++ b/kde-misc/tellico/tellico-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="5"
 IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
 # tests need network access
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	sys-devel/gettext

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.49.9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.49.9999.ebuild
index 957bab8a65..bb81a75926 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.49.9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.49.9999.ebuild
@@ -21,7 +21,7 @@ IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index 14d4f27225..27097e6173 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -21,7 +21,7 @@ IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.49.9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.49.9999.ebuild
index 46b1a2b8d2..039ce0ff8e 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.49.9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="comic share webengine"
 
-RESTRICT+=" test" # bug 727846
+RESTRICT="test" # bug 727846
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 902f3a8586..6e4d68ec87 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="comic share webengine"
 
-RESTRICT+=" test" # bug 727846
+RESTRICT="test" # bug 727846
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/kscreen/kscreen-5.22.49.9999.ebuild b/kde-plasma/kscreen/kscreen-5.22.49.9999.ebuild
index 3ebf9b9ad8..8edb307298 100644
--- a/kde-plasma/kscreen/kscreen-5.22.49.9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.22.49.9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 # bug #580440, last checked 5.6.3
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild
index bcda8ad577..bb3a1cc265 100644
--- a/kde-plasma/kscreen/kscreen-9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 # bug #580440, last checked 5.6.3
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.49.9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.22.49.9999.ebuild
index b4b557f7b0..877e2da8e1 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.22.49.9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.22.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # bug 668872
+RESTRICT="test" # bug 668872
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
index 5ef698eccf..ff6d64cce7 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT+=" test" # bug 668872
+RESTRICT="test" # bug 668872
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5

diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.49.9999.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.49.9999.ebuild
index 8ab02b6791..8054a1cf2c 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.49.9999.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.22.49.9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/wayland-1.19.0

diff --git a/kde-plasma/kwayland-server/kwayland-server-9999.ebuild b/kde-plasma/kwayland-server/kwayland-server-9999.ebuild
index 4f06e6fd9d..6f3c07b40d 100644
--- a/kde-plasma/kwayland-server/kwayland-server-9999.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/wayland-1.19.0

diff --git a/kde-plasma/kwin/kwin-5.22.49.9999.ebuild b/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
index 02d82fb0e7..3c083c2889 100644
--- a/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/libinput-1.14

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 8e102b7b55..9aa0cd7f82 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/libinput-1.14

diff --git a/kde-plasma/libkscreen/libkscreen-5.22.49.9999.ebuild b/kde-plasma/libkscreen/libkscreen-5.22.49.9999.ebuild
index 533873e069..8ff533bc57 100644
--- a/kde-plasma/libkscreen/libkscreen-5.22.49.9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.22.49.9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running session
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild
index a566335f94..f898f99604 100644
--- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running session
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.49.9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.22.49.9999.ebuild
index a1b4823ef8..e595d1a514 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.22.49.9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.22.49.9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
index 2547f7e63c..bfb2d3be7d 100644
--- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE=""
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.49.9999.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.49.9999.ebuild
index 38316cc471..69c1ea5c79 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.49.9999.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.49.9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 # tests require DBus
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5

diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild
index e12b6d4919..db3f574bd0 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 # tests require DBus
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild
index df29965cbf..2da93d7660 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild
@@ -20,7 +20,7 @@ IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/wayland-1.15

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 6fa8830685..856d9597af 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/wayland-1.15

diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 67d33b60b4..fc4314dddb 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="5"
 IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
 
 # bug 366505
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	dev-libs/expat

diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 89f86c4857..63f7b7ef53 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pd
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 630508
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	dev-cpp/eigen:3

diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild
index 945361ef4a..daf94bd5fe 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-9999.ebuild
@@ -30,4 +30,4 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # tests require DBus
-RESTRICT+=" test"
+RESTRICT="test"

diff --git a/media-sound/elisa/elisa-21.08.49.9999.ebuild b/media-sound/elisa/elisa-21.08.49.9999.ebuild
index 1131f2d657..ed64d8958f 100644
--- a/media-sound/elisa/elisa-21.08.49.9999.ebuild
+++ b/media-sound/elisa/elisa-21.08.49.9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="mpris semantic-desktop +vlc"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="sys-devel/gettext"
 DEPEND="

diff --git a/media-sound/elisa/elisa-9999.ebuild b/media-sound/elisa/elisa-9999.ebuild
index d9adcab775..c1793111b6 100644
--- a/media-sound/elisa/elisa-9999.ebuild
+++ b/media-sound/elisa/elisa-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS=""
 IUSE="mpris semantic-desktop +vlc"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="sys-devel/gettext"
 DEPEND="

diff --git a/media-sound/kid3/kid3-9999.ebuild b/media-sound/kid3/kid3-9999.ebuild
index 1ae30d110d..f910448ee0 100644
--- a/media-sound/kid3/kid3-9999.ebuild
+++ b/media-sound/kid3/kid3-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="5"
 IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5

diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild
index dad5424be0..a0241210a8 100644
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qtxml:5 )
 "
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch )
 

diff --git a/sys-libs/kpmcore/kpmcore-21.08.49.9999.ebuild b/sys-libs/kpmcore/kpmcore-21.08.49.9999.ebuild
index 831f381278..756ac4eccc 100644
--- a/sys-libs/kpmcore/kpmcore-21.08.49.9999.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.08.49.9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 # bug 689468, tests need polkit etc.
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="

diff --git a/sys-libs/kpmcore/kpmcore-9999.ebuild b/sys-libs/kpmcore/kpmcore-9999.ebuild
index 3dab758bb9..cb42e3380b 100644
--- a/sys-libs/kpmcore/kpmcore-9999.ebuild
+++ b/sys-libs/kpmcore/kpmcore-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE=""
 
 # bug 689468, tests need polkit etc.
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="