7 files changed, 77 insertions, 33 deletions
diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications
index 7b5551eb3..db2d4201f 100644
--- a/source/kde/kde/modules/all-packaged-applications
+++ b/source/kde/kde/modules/all-packaged-applications
@@ -17,23 +17,23 @@ akonadi-mime
 akonadi-contacts
 akonadi-notes
 akonadi-search
-kalarmcal
 kmailtransport
-akonadi-calendar
 libkdepim
 pimcommon
 libgravatar
+messagelib
+akonadi-calendar
+calendarsupport
 libksieve
 mailimporter
-calendarsupport
 eventviews
 incidenceeditor
-messagelib
 mailcommon
 kleopatra
 kpkpass
 kopeninghours
 kitinerary
+kaddressbook
 kdepim-addons
 kdepim-runtime
 akonadi-calendar-tools
@@ -41,7 +41,6 @@ akonadiconsole
 akonadi-import-wizard
 akregator
 grantlee-editor
-kaddressbook
 kalarm
 kmail
 kmail-account-wizard
@@ -55,6 +54,8 @@ libkipi
 kipi-plugins
 libkexiv2
 libkdcraw
+colord-kde
+ksanecore
 libksane
 gwenview
 kio-extras
@@ -71,7 +72,7 @@ filelight
 kcalc
 kcharselect
 kdf
-kfloppy
+#kfloppy
 kgpg
 print-manager
 kbackup
@@ -87,14 +88,13 @@ dolphin-plugins
 kcachegrind
 kde-dev-scripts
 kde-dev-utils
-kdesdk-kioslaves
+kdesdk-kio
 kdesdk-thumbnailers
 kross-interpreters
 libkomparediff2
 kompare
 lokalize
 poxml
-umbrello
 kdegraphics-mobipocket
 okular
 kdegraphics-thumbnailers
@@ -120,7 +120,7 @@ k3b
 kamoso
 elisa
 kdenetwork-filesharing
-zeroconf-ioslave
+kio-zeroconf
 kget
 kopete
 krdc
@@ -141,6 +141,7 @@ kblocks
 lskat
 kreversi
 bovo
+#kajongg
 granatier
 kmines
 kiriki
@@ -207,3 +208,19 @@ ktorrent
 kpmcore
 partitionmanager
 skanlite
+kdevelop
+kdev-php
+kdev-python
+umbrello
+zanshin
+falkon
+merkuro
+skanpage
+alligator
+ghostwriter
+#kalk
+kde-inotify-survey
+keysmith
+kio-admin
+# Sorry, the mpv/libass deps are getting this one yeeted
+#tokodon
diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications
index f4d81d4d9..99e1900e1 100644
--- a/source/kde/kde/modules/applications
+++ b/source/kde/kde/modules/applications
@@ -5,6 +5,8 @@ libkipi
 kipi-plugins
 libkexiv2
 libkdcraw
+colord-kde
+ksanecore
 libksane
 gwenview
 
@@ -30,7 +32,7 @@ filelight
 kcalc
 kcharselect
 kdf
-kfloppy
+#kfloppy
 kgpg
 print-manager
 kbackup
@@ -50,14 +52,13 @@ dolphin-plugins
 kcachegrind
 kde-dev-scripts
 kde-dev-utils
-kdesdk-kioslaves
+kdesdk-kio
 kdesdk-thumbnailers
 kross-interpreters
 libkomparediff2
 kompare
 lokalize
 poxml
-umbrello
 
 # Rest of kdegraphics:
 kdegraphics-mobipocket
@@ -91,7 +92,7 @@ elisa
 
 # kdenetwork:
 kdenetwork-filesharing
-zeroconf-ioslave
+kio-zeroconf
 kget
 kopete
 krdc
@@ -194,6 +195,7 @@ kdeconnect-kde
 # New in 20.12.0:
 markdownpart
 kpublictransport
+kopeninghours
 kosmindoormap
 itinerary
 kontrast
@@ -205,3 +207,24 @@ partitionmanager
 
 # New in 21.08.0:
 skanlite
+
+# kdevelop added to 21.12.0:
+kdevelop
+kdev-php
+kdev-python
+umbrello
+
+# New in 22.04.0:
+falkon
+#kalendar
+skanpage
+
+# New in 23.04.0:
+alligator
+ghostwriter
+#kalk
+kde-inotify-survey
+keysmith
+kio-admin
+# Sorry, the mpv/libass deps are getting this one yeeted
+#tokodon
diff --git a/source/kde/kde/modules/applications-extra b/source/kde/kde/modules/applications-extra
index a8e06a4d7..aaaab9f1b 100644
--- a/source/kde/kde/modules/applications-extra
+++ b/source/kde/kde/modules/applications-extra
@@ -3,10 +3,6 @@ calligra
 calligraplan
 digikam
 krita
-falkon
-kdevelop-pg-qt
-kdevelop
-kdev-php
 kdiagram
 kjots
 kstars
@@ -16,7 +12,6 @@ kile
 kaudiocreator
 kwebkitpart
 oxygen-gtk2
-kdev-python
 alkimia
 kmymoney
 okteta
@@ -24,3 +19,4 @@ krename
 ktimetracker
 labplot
 kid3
+kdevelop-pg-qt
diff --git a/source/kde/kde/modules/frameworks b/source/kde/kde/modules/frameworks
index e2abbc3ea..6aa7fe3c2 100644
--- a/source/kde/kde/modules/frameworks
+++ b/source/kde/kde/modules/frameworks
@@ -35,7 +35,8 @@ kcontacts
 breeze-icons
 kapidox
 kdnssd
-oxygen-icons5
+#oxygen-icons5
+oxygen-icons
 kauth
 kcrash
 kjobwidgets
diff --git a/source/kde/kde/modules/kdepim b/source/kde/kde/modules/kdepim
index b36ce2582..831d75c8d 100644
--- a/source/kde/kde/modules/kdepim
+++ b/source/kde/kde/modules/kdepim
@@ -18,25 +18,23 @@ akonadi-mime
 akonadi-contacts
 akonadi-notes
 akonadi-search
-kalarmcal
 kmailtransport
-akonadi-calendar
-libkleo
-grantleetheme
 libkdepim
 pimcommon
 libgravatar
+messagelib
+akonadi-calendar
+libkleo
+grantleetheme
 libksieve
 mailimporter
 #kdepim-apps-libs
 calendarsupport
 eventviews
 incidenceeditor
-messagelib
 mailcommon
 kleopatra
 kpkpass
-kopeninghours
 kitinerary
 kdepim-addons
 kdepim-runtime
@@ -55,3 +53,5 @@ korganizer
 mbox-importer
 pim-data-exporter
 pim-sieve-editor
+zanshin
+merkuro
diff --git a/source/kde/kde/modules/plasma b/source/kde/kde/modules/plasma
index 8129d6289..ac873a3fd 100644
--- a/source/kde/kde/modules/plasma
+++ b/source/kde/kde/modules/plasma
@@ -1,4 +1,5 @@
 # plasma
+kpipewire
 kgamma5
 kdecoration
 breeze
@@ -6,21 +7,23 @@ breeze-gtk
 breeze-grub
 #breeze-plymouth
 kwayland-integration
-kwayland-server
+# obsolete, removed:
+#kwayland-server
 plasma-integration
 kinfocenter
 libksysguard
-ksysguard
+#ksysguard
 layer-shell-qt
+libkscreen
 kscreenlocker
 kwin
 kwrited
-libkscreen
 milou
 oxygen
+oxygen-sounds
 plasma-workspace
 kde-cli-tools
-# Circular dependency between plasma-workspace and kde-cli-tools
+# Circular dependency between plasma-workspace and kde-cli-tools:
 plasma-workspace
 systemsettings
 plasma-desktop
@@ -40,7 +43,6 @@ plasma-sdk
 plasma-pa
 #plasma-tests
 kactivitymanagerd
-user-manager
 xdg-desktop-portal-kde
 drkonqi
 plasma-vault
@@ -51,8 +53,13 @@ plasma-disks
 #discover
 #plasma-thunderbolt
 #plasma-nano
-#plasma-phone-components
+#plasma-mobile
 plasma-firewall
 plasma-systemmonitor
 qqc2-breeze-style
 ksystemstats
+# These need a few deps added first:
+#aura-browser
+#plank-player
+#plasma-bigscreen
+#plasma-remotecontrollers
diff --git a/source/kde/kde/modules/plasma-extra b/source/kde/kde/modules/plasma-extra
index e15d1a40b..bf207557b 100644
--- a/source/kde/kde/modules/plasma-extra
+++ b/source/kde/kde/modules/plasma-extra
@@ -1,8 +1,8 @@
-sddm
 kpeoplevcard
 pulseaudio-qt
 latte-dock
 oxygen-fonts
 plasma-wayland-protocols
 wacomtablet
-
+ktextaddons
+kirigami-addons