commit: a9ad996b5294415317748f825e303a6b9a973849
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 21:46:19 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 22:00:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ad996b
kde-frameworks: 5.85.0* EAPI-8 bump
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/attica/attica-5.85.0.ebuild | 2 +-
kde-frameworks/baloo/baloo-5.85.0.ebuild | 4 ++--
kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild | 2 +-
kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild | 4 ++--
kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild | 4 ++--
kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild | 4 ++--
.../frameworkintegration/frameworkintegration-5.85.0.ebuild | 4 ++--
kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild | 2 +-
kde-frameworks/kactivities/kactivities-5.85.0.ebuild | 2 +-
kde-frameworks/kapidox/kapidox-5.85.0.ebuild | 2 +-
kde-frameworks/karchive/karchive-5.85.0.ebuild | 2 +-
kde-frameworks/kauth/kauth-5.85.0.ebuild | 2 +-
kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild | 2 +-
kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild | 4 ++--
kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild | 2 +-
kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild | 2 +-
kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild | 2 +-
kde-frameworks/kconfig/kconfig-5.85.0.ebuild | 4 ++--
kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild | 2 +-
kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild | 2 +-
kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild | 2 +-
kde-frameworks/kcrash/kcrash-5.85.0.ebuild | 4 ++--
kde-frameworks/kdav/kdav-5.85.0.ebuild | 2 +-
kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild | 2 +-
kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild | 2 +-
kde-frameworks/kded/kded-5.85.0.ebuild | 2 +-
kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild | 4 ++--
kde-frameworks/kdesu/kdesu-5.85.0.ebuild | 2 +-
kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild | 2 +-
kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild | 2 +-
kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild | 4 ++--
kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild | 4 ++--
kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild | 2 +-
kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild | 2 +-
kde-frameworks/kholidays/kholidays-5.85.0.ebuild | 2 +-
kde-frameworks/khtml/khtml-5.85.0.ebuild | 2 +-
kde-frameworks/ki18n/ki18n-5.85.0.ebuild | 2 +-
kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild | 4 ++--
kde-frameworks/kidletime/kidletime-5.85.0.ebuild | 2 +-
kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild | 2 +-
kde-frameworks/kinit/kinit-5.85.0.ebuild | 2 +-
kde-frameworks/kio/kio-5.85.0-r1.ebuild | 4 ++--
kde-frameworks/kirigami/kirigami-5.85.0.ebuild | 4 ++--
kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild | 2 +-
kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild | 2 +-
kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild | 2 +-
kde-frameworks/kjs/kjs-5.85.0.ebuild | 2 +-
kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild | 2 +-
kde-frameworks/knotifications/knotifications-5.85.0.ebuild | 2 +-
kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild | 2 +-
kde-frameworks/kpackage/kpackage-5.85.0.ebuild | 2 +-
kde-frameworks/kparts/kparts-5.85.0.ebuild | 2 +-
kde-frameworks/kpeople/kpeople-5.85.0.ebuild | 2 +-
kde-frameworks/kplotting/kplotting-5.85.0.ebuild | 2 +-
kde-frameworks/kpty/kpty-5.85.0.ebuild | 2 +-
kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild | 2 +-
kde-frameworks/kross/kross-5.85.0.ebuild | 2 +-
kde-frameworks/krunner/krunner-5.85.0.ebuild | 2 +-
kde-frameworks/kservice/kservice-5.85.0.ebuild | 4 ++--
kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild | 4 ++--
kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild | 2 +-
kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild | 2 +-
kde-frameworks/kwallet/kwallet-5.85.0.ebuild | 2 +-
kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild | 4 ++--
kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild | 2 +-
kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild | 4 ++--
kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild | 2 +-
kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild | 4 ++--
kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild | 2 +-
kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild | 4 ++--
kde-frameworks/plasma/plasma-5.85.0-r3.ebuild | 4 ++--
kde-frameworks/prison/prison-5.85.0.ebuild | 2 +-
kde-frameworks/purpose/purpose-5.85.0.ebuild | 4 ++--
kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild | 2 +-
kde-frameworks/solid/solid-5.85.0.ebuild | 2 +-
kde-frameworks/sonnet/sonnet-5.85.0.ebuild | 2 +-
kde-frameworks/syndication/syndication-5.85.0.ebuild | 2 +-
.../syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild | 2 +-
kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild | 2 +-
79 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/kde-frameworks/attica/attica-5.85.0.ebuild
b/kde-frameworks/attica/attica-5.85.0.ebuild
index de36f44dcfe..b126db32d6a 100644
--- a/kde-frameworks/attica/attica-5.85.0.ebuild
+++ b/kde-frameworks/attica/attica-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-frameworks/baloo/baloo-5.85.0.ebuild
b/kde-frameworks/baloo/baloo-5.85.0.ebuild
index cd6f12baac1..5f0003ad737 100644
--- a/kde-frameworks/baloo/baloo-5.85.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
-RESTRICT+=" test" # bug 624250
+RESTRICT="test" # bug 624250
DEPEND="
>=dev-db/lmdb-0.9.17
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
b/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
index 6ff9eb8b8e9..036f8176f68 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
index cf56dfe7463..f18acabfef4 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
KDE_ORG_NAME="breeze-icons"
PVCUT=$(ver_cut 1-2)
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
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-5.85.0.ebuild
b/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild
index d997590aa7e..6d4a5b957a4 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
PYTHON_COMPAT=( python3_{8..10} )
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
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-5.85.0.ebuild
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
index 13b356518d9..fe872c28e04 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
QTMIN=5.15.2
@@ -14,7 +14,7 @@ LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
IUSE="doc test"
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
BDEPEND="
doc? (
diff --git
a/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
b/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
index 5d114dc75ee..d52fad50135 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
b/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
index 61c66f8fe89..02989e763ca 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
b/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
index 5c121a555e5..426ccf34ebb 100644
--- a/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
PLASMA_MINIMAL=5.16.5
diff --git a/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
b/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
index a404e2adda9..904180677a0 100644
--- a/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_SINGLE_IMPL="true"
DISTUTILS_USE_SETUPTOOLS="bdepend"
diff --git a/kde-frameworks/karchive/karchive-5.85.0.ebuild
b/kde-frameworks/karchive/karchive-5.85.0.ebuild
index 84d2658f6e7..37a163f3415 100644
--- a/kde-frameworks/karchive/karchive-5.85.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit ecm kde.org
diff --git a/kde-frameworks/kauth/kauth-5.85.0.ebuild
b/kde-frameworks/kauth/kauth-5.85.0.ebuild
index 0e9b5dd1cc1..1b89dd9ac25 100644
--- a/kde-frameworks/kauth/kauth-5.85.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
b/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
index a6ca5c1729b..01f3a9d2a95 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
b/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
index ab621edd1b5..fe9cfac4fcd 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
QTMIN=5.15.2
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ test? ( LGPL-3+ )"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
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/kcmutils/kcmutils-5.85.0.ebuild
b/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild
index 4f530d0bc8d..52061f0cd40 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
b/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
index d211409383f..a624d494406 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
b/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
index c688261967e..f0f1b4037ef 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
b/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
index 7696524b519..f2f24bbd72a 100644
--- a/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="dbus nls"
# bug 560086
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
index 6092dcf5a23..50e1c0fc6af 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
b/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
index 9c7352d00bb..45d6517f22d 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
b/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
index 1c4c1e7552e..fd23dd204b0 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
inherit ecm kde.org xdg-utils
diff --git a/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
b/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
index f775d983785..9662571cc32 100644
--- a/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="nls"
# requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
diff --git a/kde-frameworks/kdav/kdav-5.85.0.ebuild
b/kde-frameworks/kdav/kdav-5.85.0.ebuild
index 925ae2c1cb3..1b84f1a6e82 100644
--- a/kde-frameworks/kdav/kdav-5.85.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
b/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
index eca05fec762..fec82a5650a 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALDBUS_TEST="true"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
b/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
index 4c958bc2ac7..0f5f80cc769 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kded/kded-5.85.0.ebuild
b/kde-frameworks/kded/kded-5.85.0.ebuild
index 7c157b0dd38..d80bb022fe1 100644
--- a/kde-frameworks/kded/kded-5.85.0.ebuild
+++ b/kde-frameworks/kded/kded-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
ECM_TEST="false"
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
b/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
index 24709f1d218..267add834f6 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_HANDBOOK="true"
ECM_QTHELP="false"
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="X"
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
dev-lang/perl
diff --git a/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
b/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
index 2c4a9dceeb9..9f1f81824f2 100644
--- a/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
b/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
index 50999d662f7..286299b7a37 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
b/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
index c1ce4270ff6..70d5563f300 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
b/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
index 4ac8a8ee074..eee0296e94d 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
b/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
index 97ed97adfa4..b66b72669f8 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PVCUT=$(ver_cut 1-2)
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
test? ( ${PYTHON_DEPS} )
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
index 9dbbb618d88..f50a9bbc7b5 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
b/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
index 1b1567e95b7..cb7795440e8 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
b/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
index f2e49b17215..db511b412b8 100644
--- a/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
ECM_TEST="true"
diff --git a/kde-frameworks/khtml/khtml-5.85.0.ebuild
b/kde-frameworks/khtml/khtml-5.85.0.ebuild
index d16848cf134..e20decaca23 100644
--- a/kde-frameworks/khtml/khtml-5.85.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
b/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
index dba624ab650..c3e589fbadb 100644
--- a/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
QTMIN=5.15.2
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
b/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
index 65271100211..1898cad3ba0 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
PVCUT=$(ver_cut 1-2)
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
-RESTRICT+=" test" # bug 574770
+RESTRICT="test" # bug 574770
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
b/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
index d19acffec7c..a3ce5a27e93 100644
--- a/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="false"
QTMIN=5.15.2
diff --git a/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild
b/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild
index e5bf4997343..2a5327eeb89 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kinit/kinit-5.85.0.ebuild
b/kde-frameworks/kinit/kinit-5.85.0.ebuild
index 0bbb079a914..bf8dfd8761a 100644
--- a/kde-frameworks/kinit/kinit-5.85.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
ECM_TEST="false"
diff --git a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
index a3ae236a2ed..46ca739c2b5 100644
--- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
ECM_TEST="forceoptional"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="acl +handbook kerberos +kwallet X"
# tests hang
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
dev-libs/libxml2
diff --git a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
b/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
index a7b59d267cf..32d0b42c069 100644
--- a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_EXAMPLES="true"
ECM_QTHELP="false"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# requires package to already be installed
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
>=dev-qt/linguist-tools-${QTMIN}:5
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
b/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
index 8ba34ea421e..f0e41176ca8 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
b/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
index 17b8161cc0d..0285b52bae8 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
QTMIN=5.15.2
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
b/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
index c21077e703b..67c1618edbb 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kjs/kjs-5.85.0.ebuild
b/kde-frameworks/kjs/kjs-5.85.0.ebuild
index 64f6d6043f4..0fedac96ed3 100644
--- a/kde-frameworks/kjs/kjs-5.85.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_HANDBOOK="optional"
ECM_QTHELP="false"
diff --git a/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
b/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
index aab70c2c816..67d43e05a70 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
b/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
index d0a134ccdfb..3868de606f6 100644
--- a/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
b/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
index 1dae4bb5ab3..8dd2bf4f3b0 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
b/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
index a060d380052..f49451a2fa7 100644
--- a/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kparts/kparts-5.85.0.ebuild
b/kde-frameworks/kparts/kparts-5.85.0.ebuild
index cfdce61fe17..9d4cb3eb5ee 100644
--- a/kde-frameworks/kparts/kparts-5.85.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
b/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
index 10161807be1..8fb8ba0fc8f 100644
--- a/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
b/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
index 71388c7ee73..69d6a796651 100644
--- a/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kpty/kpty-5.85.0.ebuild
b/kde-frameworks/kpty/kpty-5.85.0.ebuild
index 4fe9f623278..124c8900dca 100644
--- a/kde-frameworks/kpty/kpty-5.85.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
inherit ecm kde.org
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
b/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
index f033619d7ec..d4f10a50a5b 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_EXAMPLES="true"
ECM_QTHELP="false"
diff --git a/kde-frameworks/kross/kross-5.85.0.ebuild
b/kde-frameworks/kross/kross-5.85.0.ebuild
index 38cb0316b6c..30bb4ec0d0a 100644
--- a/kde-frameworks/kross/kross-5.85.0.ebuild
+++ b/kde-frameworks/kross/kross-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_QTHELP="false"
diff --git a/kde-frameworks/krunner/krunner-5.85.0.ebuild
b/kde-frameworks/krunner/krunner-5.85.0.ebuild
index d8cf5184002..802ba9fe2c4 100644
--- a/kde-frameworks/krunner/krunner-5.85.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kservice/kservice-5.85.0.ebuild
b/kde-frameworks/kservice/kservice-5.85.0.ebuild
index d7ec5feee12..270d0821e79 100644
--- a/kde-frameworks/kservice/kservice-5.85.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+man"
# requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
sys-devel/bison
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
b/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
index 8fbe5e0ed38..8dd4b006a85 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+editorconfig git"
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
b/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
index f45f0bbec35..e920db3935f 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
b/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
index 1a8a5753d91..2447b770aa7 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
b/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
index 4a7733a6f9a..f985d0d7667 100644
--- a/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
diff --git a/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
b/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
index 99f2db579e4..257d3e7adf5 100644
--- a/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
PVCUT=$(ver_cut 1-2)
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
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/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
index d8f7cd81301..0745e43d968 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
QTMIN=5.15.2
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
b/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
index 27d95f86a26..18350d22806 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -12,7 +12,7 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="nls X"
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
b/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
index f1296267f3a..2fc6a255a9e 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
index a0128939e5b..5cec0e740d6 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
virtual/pkgconfig
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
index 644aa4f7afa..cb414e811d3 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
b/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
index 3012b2e566a..e71b5c0490b 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
KDE_ORG_NAME="oxygen-icons5"
PVCUT=$(ver_cut 1-2)
@@ -14,7 +14,7 @@ LICENSE="LGPL-3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="test"
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
BDEPEND="
>=dev-qt/qtcore-${QTMIN}:5
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
index 5fcce852061..b75fc07332f 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
KDE_ORG_NAME="${PN}-framework"
PVCUT=$(ver_cut 1-2)
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="gles2-only man wayland X"
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-frameworks/prison/prison-5.85.0.ebuild
b/kde-frameworks/prison/prison-5.85.0.ebuild
index 0ba45107737..ac5b2987ac9 100644
--- a/kde-frameworks/prison/prison-5.85.0.ebuild
+++ b/kde-frameworks/prison/prison-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-frameworks/purpose/purpose-5.85.0.ebuild
b/kde-frameworks/purpose/purpose-5.85.0.ebuild
index 1fe98857145..6993a98a788 100644
--- a/kde-frameworks/purpose/purpose-5.85.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
ECM_TEST="forceoptional"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="bluetooth +kaccounts"
# requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
index 8ba03b802ba..1bd33428d23 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/solid/solid-5.85.0.ebuild
b/kde-frameworks/solid/solid-5.85.0.ebuild
index ee0d8d0d979..522552e6a6e 100644
--- a/kde-frameworks/solid/solid-5.85.0.ebuild
+++ b/kde-frameworks/solid/solid-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
b/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
index 3f162b8847c..dfbc16b7039 100644
--- a/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_DESIGNERPLUGIN="true"
QTMIN=5.15.2
diff --git a/kde-frameworks/syndication/syndication-5.85.0.ebuild
b/kde-frameworks/syndication/syndication-5.85.0.ebuild
index f6df5d788fe..c36c2a59b68 100644
--- a/kde-frameworks/syndication/syndication-5.85.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
PVCUT=$(ver_cut 1-2)
diff --git
a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
index d96c9b50f24..0b22fba7fa4 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
QTMIN=5.15.2
diff --git a/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
b/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
index 39ccb217d1a..5b5690a5e3b 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit ecm kde.org
