Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision 5bfcd23e850e12b60520f1cbb40c21f6658c3145)
+++ kde/plasma5/plasma-all.xml	(revision 6d8eeb96623a591afaf98af90c4f51199ef8e368)
@@ -5,25 +5,25 @@
  %general-entities;
 
-  <!ENTITY plasma5-download-http "https://download.kde.org/stable/plasma/&plasma5-version;">
-  <!ENTITY plasma5-download-ftp  " ">
-  <!ENTITY plasma5-md5sum        "See Below">
-  <!ENTITY plasma5-size          "243 MB">
-  <!ENTITY plasma5-buildsize     "1.7 GB (419 MB installed)">
-  <!ENTITY plasma5-time          "7.6 SBU (using parallelism=4)">
+  <!ENTITY plasma-download-http "https://download.kde.org/stable/plasma/&plasma-version;">
+  <!ENTITY plasma-download-ftp  " ">
+  <!ENTITY plasma-md5sum        "See Below">
+  <!ENTITY plasma-size          "243 MB">
+  <!ENTITY plasma-buildsize     "1.7 GB (419 MB installed)">
+  <!ENTITY plasma-time          "7.6 SBU (using parallelism=4)">
 ]>
 
-<sect1 id="plasma5-build" xreflabel="Plasma-&plasma5-version;">
+<sect1 id="plasma-build" xreflabel="Plasma-&plasma-version;">
   <?dbhtml filename="plasma-all.html"?>
 
 
-  <title>Building Plasma 5</title>
-
-  <indexterm zone="plasma5-build">
-     <primary sortas="a-kde-plasma">KDE Plasma 5</primary>
+  <title>Building Plasma</title>
+
+  <indexterm zone="plasma-build">
+     <primary sortas="a-kde-plasma">KDE Plasma</primary>
   </indexterm>
 
   <para>
-    KDE Plasma 5 is a collection of packages based on top of KDE Frameworks
-    5 and QML. They implement the KDE Display Environment (Plasma 5).
+    KDE Plasma is a collection of packages based on top of KDE Frameworks
+    and QML. They implement the KDE Display Environment (Plasma).
   </para>
 
@@ -31,5 +31,5 @@
 
   <para>
-    The instructions below build all of the Plasma 5 packages in one
+    The instructions below build all of the Plasma packages in one
     step by using a bash script.
   </para>
@@ -39,35 +39,35 @@
     <listitem>
       <para>
-        Download (HTTP): <ulink url="&plasma5-download-http;"/>
+        Download (HTTP): <ulink url="&plasma-download-http;"/>
       </para>
     </listitem>
     <listitem>
       <para>
-        Download (FTP): <ulink url="&plasma5-download-ftp;"/>
+        Download (FTP): <ulink url="&plasma-download-ftp;"/>
       </para>
     </listitem>
     <listitem>
       <para>
-        Download MD5 sum: &plasma5-md5sum;
+        Download MD5 sum: &plasma-md5sum;
       </para>
     </listitem>
     <listitem>
       <para>
-        Download size: &plasma5-size;
+        Download size: &plasma-size;
       </para>
     </listitem>
     <listitem>
       <para>
-        Estimated disk space required: &plasma5-buildsize;
+        Estimated disk space required: &plasma-buildsize;
       </para>
     </listitem>
     <listitem>
       <para>
-        Estimated build time: &plasma5-time;
+        Estimated build time: &plasma-time;
       </para>
     </listitem>
   </itemizedlist>
 
-  <bridgehead renderas="sect3">Plasma 5 Dependencies</bridgehead>
+  <bridgehead renderas="sect3">Plasma Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Required</bridgehead>
@@ -76,5 +76,4 @@
     <xref linkend="gtk3"/>,
     <xref linkend="kf6-frameworks"/>,
-    <xref linkend="kuserfeedback"/>,
     <xref linkend="libpwquality"/>,
     <xref linkend="libqalculate"/>,
@@ -95,5 +94,4 @@
     <xref linkend="fftw"/>,
     <xref linkend="gsettings-desktop-schemas"/>,
-    <xref linkend="libdbusmenu-qt"/>,
     <xref linkend="libcanberra"/>,
     <xref linkend="libinput"/>,
@@ -150,5 +148,5 @@
     </para>
 
-<screen><userinput>url=https://download.kde.org/stable/plasma/&plasma5-version;/
+<screen><userinput>url=https://download.kde.org/stable/plasma/&plasma-version;/
 wget -r -nH -nd -A '*.xz' -np $url</userinput>
 <literal>
@@ -170,65 +168,67 @@
     </para>
 
-<screen><userinput>cat &gt; plasma-&plasma5-version;.md5 &lt;&lt; "EOF"
-<literal>a1361a811dc93389d0ce771d1ff82c3a  kdecoration-5.27.10.tar.xz
-1f491e823bc83df650d04d5d9948da45  libkscreen-5.27.10.tar.xz
-571aa0c18a14ee74f3081f96f73a7f9d  libksysguard-5.27.10.tar.xz
-541d1b06db3b707a7a73df1526f37b44  breeze-5.27.10.tar.xz
-9acdc232ea675b761e7386837f25f420  breeze-gtk-5.27.10.tar.xz
-54562594af547614648cded522c3e747  layer-shell-qt-5.27.10.tar.xz
-c44cfe3ba7fb03fc30b2ae305f16ed79  kscreenlocker-5.27.10.tar.xz
-171949dd2dfc3b2325c959389694860a  oxygen-5.27.10.tar.xz
-0ef8d9f18707712fc4bcccf59138f2c7  kinfocenter-5.27.10.tar.xz
-e4e4409af71c4f5a67aa35c04f6b2bc7  kwin-5.27.10.tar.xz
-5c2ff5158503e983207e700ce513e929  plasma-workspace-5.27.10.tar.xz
-46001c7671f7ff2f08ca0dd9c3cdbf3f  plasma-disks-5.27.10.tar.xz
-820566ae6effedbdd208a78e0031bf67  bluedevil-5.27.10.tar.xz
-490bd81c915f332b65631b87b6eaa49d  kde-gtk-config-5.27.10.tar.xz
-7cade9cfce3ef14f14f55cd7a50fd7cf  khotkeys-5.27.10.tar.xz
-e98c999e6ee7f9bbe775d4e512368420  kmenuedit-5.27.10.tar.xz
-24bc4ed3ad5587bd05591aafd758df2c  kscreen-5.27.10.tar.xz
-3ab1c88cf91f0fb46ae3395d57709e12  kwallet-pam-5.27.10.tar.xz
-53d59d76b3dfac5f755d607798b08f85  kwayland-integration-5.27.10.tar.xz
-d7a9f2999352e91d504d52ad65336d9b  kwrited-5.27.10.tar.xz
-8a51e19d58acebb89a919b7377d8bc83  milou-5.27.10.tar.xz
-0e11c62c2a23d161b5b8cbe6e87517bc  plasma-nm-5.27.10.tar.xz
-02657d8fd46384f75ffe9c504f7c97b4  plasma-pa-5.27.10.tar.xz
-5c1cbd459e786deb16d5615748114bfa  plasma-workspace-wallpapers-5.27.10.tar.xz
-17302ca60f68e13e85bc24a4ec873622  polkit-kde-agent-1-5.27.10.tar.xz
-cc39dc5777614bd89ae96d38008dc7c9  powerdevil-5.27.10.tar.xz
-2417bb974152d4f2274ebe3b7b524ca8  plasma-desktop-5.27.10.tar.xz
-f51521902f0665349c0fa012590a1eec  kgamma-5.27.10.tar.xz
-e95d6813c180b078be4bf40550791e26  ksshaskpass-5.27.10.tar.xz
-#8c52fad441ffe43969458ae71b6a2f26  plasma-sdk-5.27.10.tar.xz
-1af573d08dd99879f27c5a2b55b02bc9  sddm-kcm-5.27.10.tar.xz
-#560ac5c60112e18bb44c46eec3563d7d  discover-5.27.10.tar.xz
-#3af40cfe47213087d2a8c89132ff004d  discover-5.27.10.1.tar.xz
-#2cd0a4e1e3e89197e18f48d893c0f2d6  breeze-grub-5.27.10.tar.xz
-#fe7bb4efec17206a9faceb9cfe35fbf5  breeze-plymouth-5.27.10.tar.xz
-5bbb5c7a2985f8d7b8816a35d517d333  kactivitymanagerd-5.27.10.tar.xz
-c1810c7d54842028fb5968097add5538  plasma-integration-5.27.10.tar.xz
-#75bedf5da4b7497a18238011d12bec26  plymouth-kcm-5.27.10.tar.xz
-440dd7cb1f43d7d86862a1165b48c4f2  xdg-desktop-portal-kde-5.27.10.tar.xz
-657984f8356578253e1911c8d35041f6  drkonqi-5.27.10.tar.xz
-912db896afe71a8283e36037b4bba79e  plasma-vault-5.27.10.tar.xz
-e03d33ca8a9905df3c2901cef5512a14  plasma-browser-integration-5.27.10.tar.xz
-30797f3809675e61542518f9b15be2c3  kde-cli-tools-5.27.10.tar.xz
-1319f82a4043456a4cb99cfcc2ba90fe  systemsettings-5.27.10.tar.xz
-2861104cf1e31393d9cd87701042d3aa  plasma-thunderbolt-5.27.10.tar.xz
-#79ffc86387c7024bd834b349fba9b79f  plasma-nano-5.27.10.tar.xz
-#802d5a3cd34f5ec3825c21905f0ed9db  plasma-mobile-5.27.10.tar.xz
-1f4875f2cf9c0d949961aa9ad6635e6f  plasma-firewall-5.27.10.tar.xz
-b6648b45d9824b565dda1f100e7d83a6  plasma-systemmonitor-5.27.10.tar.xz
-8e46e5afde739a6361b1838f71eb182d  qqc2-breeze-style-5.27.10.tar.xz
-fd93592f9895c5c09f4c0db771c1710a  ksystemstats-5.27.10.tar.xz
-4f55bb4490751abb23046165d68e8ca7  oxygen-sounds-5.27.10.tar.xz
-#6300c88c07debeb60760dede52a791ee  aura-browser-5.27.10.tar.xz
-00afc45528267a5e2ec11b47b8a7779b  kdeplasma-addons-5.27.10.tar.xz
-7f432fbb0d205d6e30714e731f91a459  kpipewire-5.27.10.tar.xz
-5f37a2e3acf00a0616e13d86ed225d7f  plank-player-5.27.10.tar.xz
-f3a08cefe61643273a9e06cfd6b2746a  plasma-bigscreen-5.27.10.tar.xz
-a69142a27ab62c583fa5d4d4577427ff  plasma-remotecontrollers-5.27.10.tar.xz
-#16e67ca215d44ec59130214ca6e13e80  flatpak-kcm-5.27.10.tar.xz
-#4ef3e1d988e5edfa8ee20f9373a82680  plasma-welcome-5.27.10.tar.xz</literal>
+<screen><userinput>cat &gt; plasma-&plasma-version;.md5 &lt;&lt; "EOF"
+<literal>599e79f2908879ed7f7ffda3637c54a6  kdecoration-6.0.0.tar.xz
+96f956b40d929ddecb208101564aa269  libkscreen-6.0.0.tar.xz
+e09b5326dea0c32c64745a0ab3bb17fd  libksysguard-6.0.0.tar.xz
+6546c71b2707637fb0c8ffd90abfc981  breeze-6.0.0.tar.xz
+6ec29676f896546f9fab485142fff113  breeze-gtk-6.0.0.tar.xz
+5d02ead00aa69e96d71fb892aa941fa3  layer-shell-qt-6.0.0.tar.xz
+c91f8689b5386ce42d8a270ba669dfc3  plasma-activities-6.0.0.tar.xz
+125c3e7cf3bb32d3103bb769c584660f  libplasma-6.0.0.tar.xz
+9dbfb8774a5acead43b3a0afb90a893f  kscreenlocker-6.0.0.tar.xz
+b37312379616a7c2309c834005ada178  oxygen-6.0.0.tar.xz
+643d13b69ffddf133f4067bd25e33034  kinfocenter-6.0.0.tar.xz
+4bc12254229c9762e29f2f75d2f44e1a  kglobalacceld-6.0.0.tar.xz
+97c448777e08ea7fe53aaef2cb35d17a  kwayland-6.0.0.tar.xz
+b5b1a531a62ba3b778c793c63b262509  kwin-6.0.0.tar.xz
+5ac7afff15ac496b580526cf5c017db7  plasma5support-6.0.0.tar.xz
+d931aa7909d574c0a5b26a4d5af1f4eb  plasma-activities-stats-6.0.0.tar.xz
+1ce2e4da8cf65347f6fc5099b418ecc6  kpipewire-6.0.0.tar.xz
+4a155013537b80009cc1e7d1582fda33  plasma-workspace-6.0.0.tar.xz
+e32c8a5eac1ac01a763bbcc70b3f6945  plasma-disks-6.0.0.tar.xz
+4d18ce97c23bbf35d87b73efec71420c  bluedevil-6.0.0.tar.xz
+bfc8028a6f0888965a3a555663ba893b  kde-gtk-config-6.0.0.tar.xz
+83dffdc80445bbc617f0c0dcef04ca4a  kmenuedit-6.0.0.tar.xz
+57acadb3a31ff06cad411269de2ea700  kscreen-6.0.0.tar.xz
+7fad253ac68778bf4046b72a892ade92  kwallet-pam-6.0.0.tar.xz
+115cb1253c7a903070ff76630370d97d  kwrited-6.0.0.tar.xz
+90eb8b277e475f1447472ba467336547  milou-6.0.0.tar.xz
+7dcf751acdb6fc66b50734948831731a  plasma-nm-6.0.0.tar.xz
+ca57d6c816ae40b595bf3e3e1a2617ff  plasma-pa-6.0.0.tar.xz
+f4445ecabf52a5777fa405f36c791d72  plasma-workspace-wallpapers-6.0.0.tar.xz
+ae7b1d18a20699124d924b126335aaed  polkit-kde-agent-1-6.0.0.tar.xz
+93aacc0af152b6d2e28a694bd211f29d  powerdevil-6.0.0.tar.xz
+46d9dee5d8abfc12bd8c3ca8811327e7  plasma-desktop-6.0.0.tar.xz
+2b522f3fd18ed563c9fab882b83193eb  kgamma-6.0.0.tar.xz
+a832617c17070ec2dce5cf019ab7ab1c  ksshaskpass-6.0.0.tar.xz
+#65ceae0e87f6b11ec924d57d764913f4  plasma-sdk-6.0.0.tar.xz
+973e99f506a6fdad96a8b43d04a0b510  sddm-kcm-6.0.0.tar.xz
+#a7ab65d4a36e402df4b42c91cd2a16da  discover-6.0.0.tar.xz
+#bc42922097f6964252a5f56e759c3844  breeze-grub-6.0.0.tar.xz
+#f399364375591938bdfb2d235f13923b  breeze-plymouth-6.0.0.tar.xz
+c0248379f3df970fa19fe6d341dd00a4  kactivitymanagerd-6.0.0.tar.xz
+ad6dee45c10e415a92d76745e5901842  plasma-integration-6.0.0.tar.xz
+#e377ca58ca8089ce4e4c26c03e85b4f1  plymouth-kcm-6.0.0.tar.xz
+b0a1e9952e09e35f90d8131faed98882  xdg-desktop-portal-kde-6.0.0.tar.xz
+53864beb8ca2de75a8e4c1f52b0f4ea5  drkonqi-6.0.0.tar.xz
+e6c9b78fd0022d37dc4913e3dbe5205e  plasma-vault-6.0.0.tar.xz
+#a5b70716031e98843e8fa1088f2eb0bc  plasma-browser-integration-6.0.0.tar.xz
+91f1b7dbde5fcd508f3eab9cdf5f0681  kde-cli-tools-6.0.0.tar.xz
+876c57804ef1daadfcce81bb0d7e82a4  systemsettings-6.0.0.tar.xz
+29588e3f9d64d092060890a5a438cdb6  plasma-thunderbolt-6.0.0.tar.xz
+#cc307526ac2f02e7547cacea0eeccda6  plasma-nano-6.0.0.tar.xz
+#5e2effe947e2edf89cce35ef5c2527f6  plasma-mobile-6.0.0.tar.xz
+f791645b191b9f2e6cc9e6cf0037af00  plasma-firewall-6.0.0.tar.xz
+a4d558a30b2ae93dc680010867e10abc  plasma-systemmonitor-6.0.0.tar.xz
+f250350b7fa2ff6f28f88233955c5638  qqc2-breeze-style-6.0.0.tar.xz
+28f4d1841cecffaf76462ba20e45c45b  ksystemstats-6.0.0.tar.xz
+8aad48fd0f58f08ea197aa6d8e4dfab3  oxygen-sounds-6.0.0.tar.xz
+4d7c36f9ada95960ec0619547c716f81  kdeplasma-addons-6.0.0.tar.xz
+#df582e99c5288d1c0b8dcd1b34a31d08  flatpak-kcm-6.0.0.tar.xz
+#eebf65971b0066c707eef50742a9c49e  plasma-welcome-6.0.0.tar.xz
+8f0c51c160819c170dcc77722b6153e3  ocean-sound-theme-6.0.0.tar.xz
+b8963fb1790449d4a905cf85f017d1e9  print-manager-6.0.0.tar.xz
+#a05c7d650e44cd046fbc090fcbb69ae4  wacomtablet-6.0.0.tar.xz</literal>
 EOF</userinput></screen>
 
@@ -266,5 +266,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Plasma5</title>
+    <title>Installation of Plasma</title>
 
     &as_root;
@@ -311,5 +311,5 @@
        cd    build
 
-       cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+       cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
              -DCMAKE_BUILD_TYPE=Release         \
              -DBUILD_TESTING=OFF                \
@@ -325,42 +325,51 @@
     as_root /sbin/ldconfig
 
-done &lt; plasma-&plasma5-version;.md5
+done &lt; plasma-&plasma-version;.md5
 
 exit</userinput></screen>
 
     <para>
-      If you did not set <envar>$KF5_PREFIX</envar> to
+      If you did not set <envar>$KF6_PREFIX</envar> to
       <filename>/usr</filename>, create symlinks to allow display managers to
       find <application>Plasma</application>, and to allow the XDG Desktop
-      Portal to be detected:
-    </para>
-
-<screen><userinput>as_root install -dvm 755 /usr/share/xsessions              &amp;&amp;
-cd /usr/share/xsessions/                                   &amp;&amp;
-[ -e plasma.desktop ]                                      ||
-as_root ln -sfv $KF5_PREFIX/share/xsessions/plasma.desktop &amp;&amp;
-as_root install -dvm 755 /usr/share/wayland-sessions       &amp;&amp;
-cd /usr/share/wayland-sessions/                            &amp;&amp;
-[ -e plasmawayland.desktop ]                               ||
-as_root ln -sfv $KF5_PREFIX/share/wayland-sessions/plasmawayland.desktop
-<!-- work around a bug in xdg-desktop-portal
--->as_root install -dvm 755 /usr/share/xdg-desktop-portal     &amp;&amp;
-cd /usr/share/xdg-desktop-portal/                          &amp;&amp;
-[ -e kde-portals.conf ]                                    ||
-as_root ln -sfv $KF5_PREFIX/share/xdg-desktop-portal/kde-portals.conf
-as_root install -dvm 755 /usr/share/xdg-desktop-portal/portals &amp;&amp;
-cd /usr/share/xdg-desktop-portal/portals                       &amp;&amp;
-[ -e kde.portal ]                                              ||
-as_root ln -sfv $KF5_PREFIX/share/xdg-desktop-portal/portals/kde.portal
-</userinput></screen>
+      Portal to be detected. As the &root; user:
+    </para>
+
+<screen><userinput># Setup xsessions (X11 sessions)
+install -dvm 755 /usr/share/xsessions
+cd /usr/share/xsessions
+
+[ -e plasma.desktop ] ||
+ln -sfv $KF6_PREFIX/share/xsessions/plasmax11.desktop 
+
+# Setup wayland-sessions 
+install -dvm 755 /usr/share/wayland-sessions
+cd /usr/share/wayland-sessions
+
+[ -e plasmawayland.desktop ] ||
+ln -sfv $KF6_PREFIX/share/wayland-sessions/plasma.desktop
+<!-- work around a bug in xdg-desktop-portal-->
+# Setup xdg-desktop-portal
+install -dvm 755 /usr/share/xdg-desktop-portal
+cd /usr/share/xdg-desktop-portal 
+
+[ -e kde-portals.conf ] ||
+ln -sfv $KF6_PREFIX/share/xdg-desktop-portal/kde-portals.conf
+
+# Setup kde partal
+install -dvm 755 /usr/share/xdg-desktop-portal/portals
+cd /usr/share/xdg-desktop-portal/portals
+
+[ -e kde.portal ] ||
+ln -sfv $KF6_PREFIX/share/xdg-desktop-portal/portals/kde.portal</userinput></screen>
 
     <para revision="sysv">
       Useless systemd units have been installed in
-      <filename class="directory">$KF5_PREFIX/lib</filename>. Remove
+      <filename class="directory">$KF6_PREFIX/lib</filename>. Remove
       them now (as <systemitem class="username">root</systemitem>):
     </para>
 
 <screen role="root"
-        revision="sysv"><userinput>rm -rf $KF5_PREFIX/lib/systemd</userinput></screen>
+        revision="sysv"><userinput>rm -rf $KF6_PREFIX/lib/systemd</userinput></screen>
 
   </sect2>
@@ -433,8 +442,8 @@
 
   <sect2 role="starting">
-    <title>Starting Plasma5</title>
+    <title>Starting Plasma</title>
 
     <para revision="sysv">
-      You can start <application>Plasma5</application> from runlevel 3, using
+      You can start <application>Plasma</application> from runlevel 3, using
       <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
       such as <xref linkend="lightdm"/>.
@@ -442,5 +451,5 @@
 
     <para revision="systemd">
-      You can start <application>Plasma5</application> from a TTY, using
+      You can start <application>Plasma</application> from a TTY, using
       <xref linkend="xinit"/><!--, or from a graphical display manager, such as
       <xref linkend="sddm"/>-->.
@@ -448,10 +457,10 @@
 
     <para>
-      To start <application>Plasma 5</application> using <xref linkend="xinit"/>,
+      To start <application>Plasma</application> using <xref linkend="xinit"/>,
       run the following commands:
     </para>
 
 <screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>dbus-launch --exit-with-x11 $KF5_PREFIX/bin/startplasma-x11</literal>
+<literal>dbus-launch --exit-with-x11 $KF6_PREFIX/bin/startplasma-x11</literal>
 EOF
 
@@ -479,5 +488,12 @@
       press keys Alt-F7 (assuming that X was running on vt7).
     </para>
-<!-- Now the entry is "plasma (X11)" for Xorg, so I guess this is
+<!-- Start plasma wayland with 
+
+/opt/kf6/lib/libexec/plasma-dbus-run-session-if-needed /opt/kf6/bin/startplasma-wayland
+
+Investigate why it's in /opt/kf6/lib/libexec and not just in /opt/kf6/libexec
+
+
+Now the entry is "plasma (X11)" for Xorg, so I guess this is
      not needed anymore:
     <para>
@@ -506,13 +522,13 @@
       <seglistitem>
         <seg>
-           There are too many plasma programs (63 in /opt/kf5/bin) to list
+           There are too many plasma programs (over 50 in /opt/kf6/bin) to list
            separately here.
         </seg>
         <seg>
-           There are too many plasma libraries (40 in /opt/kf5/lib) to list
+           There are too many plasma libraries (over 250 in /opt/kf6/lib) to list
            separately here.
         </seg>
         <seg>
-           There are too many plasma directories (over 1000 in /opt/kf5) to
+           There are too many plasma directories (over 2700 in /opt/kf6) to
            list separately here.
         </seg>
