- kwrk: kde5 --> kde6

conf.d/kworkstation.mk

@@ -161,7 +161,7 @@ mixin/kworkstation-install-opts:
 	@$(call add,LIVE_LISTS,kworkstation/live-rescue)
 	@$(call add,LIVE_LISTS,kworkstation/printing)
 	@$(call add,LIVE_LISTS,kworkstation/scanning)
-	@$(call add,THE_LISTS,kworkstation/kde5-base)
+	@$(call add,THE_LISTS,kworkstation/kde-base)
 	@$(call add,SERVICES_ENABLE,sshd)
 
 mixin/kworkstation-live-deps: \
@@ -178,8 +178,8 @@ mixin/kworkstation-live-opts:
 	@$(call set,GRUB_DEFAULT,session)
 	@$(call add,SYSLINUX_CFG,live_rw)
 	@$(call set,SYSLINUX_DEFAULT,session)
-	@$(call add,LIVE_LISTS,kworkstation/kde5-base)
-	@$(call add,LIVE_LISTS,kworkstation/kde5)
+	@$(call add,LIVE_LISTS,kworkstation/kde-base)
+	@$(call add,LIVE_LISTS,kworkstation/kde)
 	@$(call add,LIVE_LISTS,kworkstation/graphics-editing)
 	@$(call add,LIVE_LISTS,kworkstation/printing)
 	@$(call add,LIVE_LISTS,kworkstation/scanning)
@@ -194,7 +194,7 @@ mixin/kworkstation-live-opts:
 
 distro/kworkstation-install: \
 	kworkstation_groups = $(addprefix kworkstation/,\
-	kde5 games emulators printing scanning \
+	kde games emulators printing scanning \
 	z00-add-3dparty 3dparty-flatpak 3dparty-snap \
 	z01-add-clients clients-ad clients-ipa clients-backup clients-cloud clients-monitor \
 	z02-add-additional add-adm add-oem add-tablet add-webterminal add-no4k-screen)
@@ -216,7 +216,7 @@ mixin/kworkstation-fsin-opts:
 	@$(call add,THE_PACKAGES,task-auth-freeipa task-auth-ldap-sssd)
 	@$(call add,THE_PACKAGES,task-samba-dc bind-utils tdb-utils installer-feature-sambaDC-stage3)
 	@$(call add,THE_PACKAGES,task-auth-ldap-sssd)
-	@$(call add,THE_PACKAGES,kde5-autofs-shares krb5-ticket-watcher kde5-file-actions-gost)
+	@$(call add,THE_PACKAGES,kde-autofs-shares krb5-ticket-watcher kde-file-actions-gost)
 	@$(call add,THE_PACKAGES,openssl-gost-engine)
 	@$(call add,THE_PACKAGES,openvpn-gostcrypto openvpn-plugins-gostcrypto alterator-openvpn-server)
 	@$(call add,THE_PACKAGES,alt-customize-branding)

pkg.in/groups/kworkstation/kde5.directory → pkg.in/groups/kworkstation/kde.directory

@@ -2,7 +2,7 @@
 Type=Directory
 Name=Plasma (recommended)
 Comment=Vital KDE Plasma workspace components and applications, without which it may be difficult to work with the system.
-X-Alterator-PackageList=kworkstation/kde5;kworkstation/publishing;kworkstation/remote-desktop;kworkstation/graphics-editing;kworkstation/sound-editing;kworkstation/video-editing;
+X-Alterator-PackageList=kworkstation/kde;kworkstation/publishing;kworkstation/remote-desktop;kworkstation/graphics-editing;kworkstation/sound-editing;kworkstation/video-editing;
 X-Alterator-Required=yes
 Categories=KDE;
 

pkg.in/lists/kworkstation/3dparty-flatpak

-plasma5-discover-flatpak
+plasma-discover-flatpak
 flatpak-repo-flathub

pkg.in/lists/kworkstation/3dparty-snap

-plasma5-discover-snap
+plasma-discover-snap

pkg.in/lists/kworkstation/add-tablet

 maliit-keyboard
 maliit-inputcontext-gtk2
 maliit-inputcontext-gtk3
-kde5-plasma-settings-virtualkeyboard
+plasma-settings-virtualkeyboard

pkg.in/lists/kworkstation/clients-ad

 libwbclient
 task-auth-ad-sssd
 task-auth-ad-winbind
-kde5-autofs-shares
+kde-autofs-shares
 krb5-ticket-watcher
 task-auth-ldap-sssd
 alterator-gpupdate

pkg.in/lists/kworkstation/clients-ipa

 systemd-sysvinit
 task-auth-freeipa
-kde5-autofs-shares
+kde-autofs-shares
 krb5-ticket-watcher
 task-auth-ldap-sssd

pkg.in/lists/kworkstation/edu

-kde5-edu@META
+kde-edu@META
 kumir
 stellarium
 gcompris-qt

pkg.in/lists/kworkstation/games

-#kde5-games@META
+#kde-games@META
 kde5-kmines
 kde5-lskat
 kde5-kpat

pkg.in/lists/kworkstation/graphics-editing

@@ -4,7 +4,7 @@ inkscape
 #hugin
 zint
 
-kde5-digikam
+digikam
 
 # 3D
 blender

pkg.in/lists/kworkstation/kde5 → pkg.in/lists/kworkstation/kde

@@ -8,7 +8,7 @@ gdb
 systemd-coredump
 fuse-cryfs
 libnss-mdns
-plasma5-libkscreen-utils
+plasma6-libkscreen-utils
 
 nvidia-settings
 nvidia-modprobe
@@ -35,12 +35,12 @@ kde5-kcm-grub2
 #
 #appinstall@X86
 synaptic-kde@META
-plasma5-discover-fwupd
-plasma5-discover-kns
+plasma-discover-fwupd
+plasma-discover-kns
 openssl-gost-engine
 gostsum
-kde5-kreslimit
-kde5-file-actions-gost
+kreslimit
+kde-file-actions-gost
 
 #altlinux-freedesktop-menu-nested-menu
 alt-desktop-wallpapers
@@ -52,20 +52,20 @@ samba
 samba-usershares
 # system-config-samba
 
-#kde5-akonadi-database-mysql
-kde5-messenger-client-mix
+#kde-akonadi-database-mysql
+kde-messenger-client-mix
 
 isomaster
-kde5-k3b
+k3b
 #fbreader
-#kde5-basket
+#basket
 #kmymoney
 #kmymoney-i18n
-#kde5-plasma-yawp
-# kde5-konsole to override xterm as /usr/bin/xvt
-kde5-konsole
+#kde-plasma-yawp
+# konsole to override xterm as /usr/bin/xvt
+konsole
 alt-app-starter
-kde5-plasma-addon-alt-weather
+plasma-addon-alt-weather
 
 qstardict
 stardict-mueller7
@@ -90,12 +90,11 @@ LibreOffice-plugin-altcsp
 document-templates-odf
 
 kamoso
-kde5-kcm-wacomtablet
+plasma-wacomtablet
 
 #eiskaltdcpp-qt
-#kde5-kio-gdrive
+#kde-kio-gdrive
 
-plasma5-desktop-maxi
-plasma5-kinfocenter-maxi
-kde5@META
-kde5-big@META
+kinfocenter-maxi
+kde@META
+kde-big@META

pkg.in/lists/kworkstation/kde5-base → pkg.in/lists/kworkstation/kde-base

@@ -9,7 +9,7 @@ pinentry-qt5
 gst-plugins-good1.0-qt5
 pwvucontrol
 
-plasma5-discover-packagekit@META
+plasma-discover-packagekit@META
 
 alt-kworkstation-addon
 alterator-audit
@@ -134,19 +134,19 @@ orca at-spi2-core
 ca-certificates-digital.gov.ru
 yandex-browser-stable
 
-kde5-display-manager-lightdm
+kde-display-manager-lightdm
 #openvpn-gostcrypto ### removed from repo
-kde5-network-manager-etcnet
+kde-network-manager-etcnet
 openssh-clients openssh-askpass-common openssh-server openssh-common openssh-server-control
 systemd-ssh-agent
 NetworkManager-ssh
-kde5-network-manager-nm
-kde5-video-player-haruna
-kde5-audio-player-qmmp
-kde5-runtime@META
-kde5-mini@META
-kde5-small@META
-plasma5-kscreen
+kde-network-manager-nm
+kde-video-player-haruna
+kde-audio-player-qmmp
+kde-runtime@META
+kde-mini@META
+kde-small@META
+kscreen
 
 # GTK2/GTK3 theme
 gtk-theme-breeze

pkg.in/lists/kworkstation/live-rescue

 
-kde5-plasma-applet-places-widget
+plasma-applet-places-widget
 
 altmediawriter
 kamoso
-plasma5-kinfocenter-maxi
-plasma5-bluedevil
-plasma5-disks
-kde5-khelpcenter
-kde5-filelight
-kde5-spectacle
+kinfocenter-maxi
+bluedevil
+plasma-disks
+khelpcenter
+filelight
+spectacle
 inxi
 glmark2
 glmark2-wayland

pkg.in/lists/kworkstation/printing

-kde5-printing@META
+kde-printing@META
 
 cups-ppd
 gutenprint-cups-ppds

pkg.in/lists/kworkstation/remote-desktop

-kde5-krfb
-kde5-krdc
+krfb
+krdc
 
 rdesktop

pkg.in/lists/kworkstation/scanning

-kde5-scanning@META
-kde5-skanpage
+kde-scanning@META
+skanpage
 
 xsane-doc-ru
 tesseract-langpack-en

pkg.in/lists/kworkstation/sound-editing

 #kde5-soundkonverter
 kde5-kid3
 flacon
-kde5-krecorder
+krecorder
 
-kde5-kwave
+kwave

pkg.in/profiles/kworkstation/10-workstation.directory

@@ -2,4 +2,4 @@
 Type=Directory
 Name=Workstation
 Name[ru_RU]=Рабочая станция
-X-Alterator-Groups=kworkstation/kde5 kworkstation/emulators kworkstation/printing kworkstation/scanning kworkstation/video-editing kworkstation/sound-editing kworkstation/graphics-editing
+X-Alterator-Groups=kworkstation/kde kworkstation/emulators kworkstation/printing kworkstation/scanning kworkstation/video-editing kworkstation/sound-editing kworkstation/graphics-editing