6 files changed, 84 insertions, 79 deletions
diff --git a/sets/kde-frameworks b/sets/kde-frameworks
index 315a19a0020..b255c8fae74 100644
--- a/sets/kde-frameworks
+++ b/sets/kde-frameworks
@@ -3,5 +3,5 @@
 @kde-frameworks-tier2
 @kde-frameworks-tier3
 # Tier 4: Provide extra features to other Frameworks to integrate with Plasma.
-kde-frameworks/frameworkintegration:5
+kde-frameworks/frameworkintegration
 @kde-frameworks-portingaids
diff --git a/sets/kde-frameworks-portingaids b/sets/kde-frameworks-portingaids
index be2867be213..a73c1bb3f66 100644
--- a/sets/kde-frameworks-portingaids
+++ b/sets/kde-frameworks-portingaids
@@ -1,6 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # PortingAids: Code and utilities for transition from kdelibs 4 to Frameworks 5.
-kde-frameworks/kdelibs4support:5
-kde-frameworks/khtml:5
-kde-frameworks/kjs:5
-kde-frameworks/kross:5
+kde-frameworks/kdelibs4support
+kde-frameworks/khtml
+kde-frameworks/kjs
+kde-frameworks/kross
diff --git a/sets/kde-frameworks-tier1 b/sets/kde-frameworks-tier1
index 2a3920dabe2..5f0f54dc987 100644
--- a/sets/kde-frameworks-tier1
+++ b/sets/kde-frameworks-tier1
@@ -1,36 +1,38 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Tier 1: Depend only on Qt and possibly a few third-party libraries.
-kde-frameworks/attica:5
-kde-frameworks/bluez-qt:5
-kde-frameworks/breeze-icons:5
-kde-frameworks/breeze-icons-rcc:5
-kde-frameworks/extra-cmake-modules:5
-kde-frameworks/kapidox:5
-kde-frameworks/karchive:5
-kde-frameworks/kcalendarcore:5
-kde-frameworks/kcodecs:5
-kde-frameworks/kconfig:5
-kde-frameworks/kcoreaddons:5
-kde-frameworks/kdbusaddons:5
-kde-frameworks/kdnssd:5
-kde-frameworks/kguiaddons:5
-kde-frameworks/kholidays:5
-kde-frameworks/ki18n:5
-kde-frameworks/kidletime:5
-kde-frameworks/kirigami:5
-kde-frameworks/kitemmodels:5
-kde-frameworks/kitemviews:5
-kde-frameworks/kplotting:5
-kde-frameworks/kquickcharts:5
-kde-frameworks/kwayland:5
-kde-frameworks/kwidgetsaddons:5
-kde-frameworks/kwindowsystem:5
-kde-frameworks/modemmanager-qt:5
-kde-frameworks/networkmanager-qt:5
-kde-frameworks/oxygen-icons:5
-kde-frameworks/prison:5
-kde-frameworks/qqc2-desktop-style:5
-kde-frameworks/solid:5
-kde-frameworks/sonnet:5
-kde-frameworks/syntax-highlighting:5
-kde-frameworks/threadweaver:5
+kde-frameworks/attica
+kde-frameworks/bluez-qt
+kde-frameworks/breeze-icons
+kde-frameworks/breeze-icons-rcc
+kde-frameworks/extra-cmake-modules
+kde-frameworks/kapidox
+kde-frameworks/karchive
+kde-frameworks/kcalendarcore
+# TODO: future: kcgroups (not packaged)
+kde-frameworks/kcodecs
+kde-frameworks/kconfig
+kde-frameworks/kcoreaddons
+kde-frameworks/kdbusaddons
+kde-frameworks/kdnssd
+kde-frameworks/kguiaddons
+kde-frameworks/kholidays
+kde-frameworks/ki18n
+kde-frameworks/kidletime
+kde-frameworks/kirigami
+kde-frameworks/kitemmodels
+kde-frameworks/kitemviews
+kde-frameworks/kplotting
+kde-frameworks/kquickcharts
+# TODO: future: dev-libs/kuserfeedback
+kde-frameworks/kwayland
+kde-frameworks/kwidgetsaddons
+kde-frameworks/kwindowsystem
+kde-frameworks/modemmanager-qt
+kde-frameworks/networkmanager-qt
+kde-frameworks/oxygen-icons
+kde-frameworks/prison
+kde-frameworks/qqc2-desktop-style
+kde-frameworks/solid
+kde-frameworks/sonnet
+kde-frameworks/syntax-highlighting
+kde-frameworks/threadweaver
diff --git a/sets/kde-frameworks-tier2 b/sets/kde-frameworks-tier2
index 4f2f48c2bb4..ded4d400744 100644
--- a/sets/kde-frameworks-tier2
+++ b/sets/kde-frameworks-tier2
@@ -1,17 +1,18 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Tier 2: Additionally depend on tier 1 frameworks.
-kde-frameworks/kactivities:5
-kde-frameworks/kauth:5
-kde-frameworks/kcompletion:5
-kde-frameworks/kcontacts:5
-kde-frameworks/kcrash:5
-kde-frameworks/kdoctools:5
-kde-frameworks/kfilemetadata:5
-kde-frameworks/kimageformats:5
-kde-frameworks/kjobwidgets:5
-kde-frameworks/knotifications:5
-kde-frameworks/kpackage:5
-kde-frameworks/kpeople:5
-kde-frameworks/kpty:5
-kde-frameworks/kunitconversion:5
-kde-frameworks/syndication:5
+kde-frameworks/kactivities
+kde-frameworks/kauth
+kde-frameworks/kcompletion
+kde-frameworks/kcontacts
+kde-frameworks/kcrash
+kde-frameworks/kdoctools
+kde-frameworks/kfilemetadata
+kde-frameworks/kimageformats
+kde-frameworks/kjobwidgets
+kde-frameworks/knotifications
+kde-frameworks/kpackage
+kde-frameworks/kpeople
+kde-frameworks/kpty
+# TODO: future: kquickimageeditor (not packaged)
+kde-frameworks/kunitconversion
+kde-frameworks/syndication
diff --git a/sets/kde-frameworks-tier3 b/sets/kde-frameworks-tier3
index 9d0b2ef2979..12e028baa29 100644
--- a/sets/kde-frameworks-tier3
+++ b/sets/kde-frameworks-tier3
@@ -1,27 +1,27 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Tier 3: More powerful, comprehensive packages, with complex dependencies.
-kde-frameworks/baloo:5
-kde-frameworks/kactivities-stats:5
-kde-frameworks/kbookmarks:5
-kde-frameworks/kcmutils:5
-kde-frameworks/kconfigwidgets:5
-kde-frameworks/kdav:5
-kde-frameworks/kdeclarative:5
-kde-frameworks/kded:5
-kde-frameworks/kdesu:5
-kde-frameworks/kemoticons:5
-kde-frameworks/kglobalaccel:5
-kde-frameworks/kiconthemes:5
-kde-frameworks/kinit:5
-kde-frameworks/kio:5
-kde-frameworks/knewstuff:5
-kde-frameworks/knotifyconfig:5
-kde-frameworks/kparts:5
-kde-frameworks/krunner:5
-kde-frameworks/kservice:5
-kde-frameworks/ktexteditor:5
-kde-frameworks/ktextwidgets:5
-kde-frameworks/kwallet:5
-kde-frameworks/kxmlgui:5
-kde-frameworks/plasma:5
-kde-frameworks/purpose:5
+kde-frameworks/baloo
+kde-frameworks/kactivities-stats
+kde-frameworks/kbookmarks
+kde-frameworks/kcmutils
+kde-frameworks/kconfigwidgets
+kde-frameworks/kdav
+kde-frameworks/kdeclarative
+kde-frameworks/kded
+kde-frameworks/kdesu
+kde-frameworks/kemoticons
+kde-frameworks/kglobalaccel
+kde-frameworks/kiconthemes
+kde-frameworks/kinit
+kde-frameworks/kio
+kde-frameworks/knewstuff
+kde-frameworks/knotifyconfig
+kde-frameworks/kparts
+kde-frameworks/krunner
+kde-frameworks/kservice
+kde-frameworks/ktexteditor
+kde-frameworks/ktextwidgets
+kde-frameworks/kwallet
+kde-frameworks/kxmlgui
+kde-frameworks/plasma
+kde-frameworks/purpose
diff --git a/sets/kde-plasma b/sets/kde-plasma
index f32197bb8e0..edb042c717d 100644
--- a/sets/kde-plasma
+++ b/sets/kde-plasma
@@ -32,11 +32,13 @@ kde-plasma/oxygen:5
 kde-plasma/plasma-browser-integration:5
 kde-plasma/plasma-desktop:5
 kde-plasma/plasma-disks:5
+kde-plasma/plasma-firewall:5
 kde-plasma/plasma-integration:5
 kde-plasma/plasma-meta:5
 kde-plasma/plasma-nm:5
 kde-plasma/plasma-pa:5
 kde-plasma/plasma-sdk:5
+kde-plasma/plasma-systemmonitor:5
 kde-plasma/plasma-thunderbolt:5
 kde-plasma/plasma-workspace:5
 kde-plasma/plasma-workspace-wallpapers:5