Merge updates from master

25 files changed, 97 insertions, 52 deletions

diff --git a/Documentation/CONTRIBUTORS b/Documentation/CONTRIBUTORS
index 0c722fcf780..dd0f1ee8f1e 100644
--- a/Documentation/CONTRIBUTORS
+++ b/Documentation/CONTRIBUTORS
@@ -93,6 +93,7 @@ Krzysztof Nowicki <krissn@op.pl>
 Lars Wendler <polynomial-c@gentoo.org>
 Locke Shinseiko <wizzleby@gmail.com>
 Lorenzo Porta <vindex17@outlook.it>
+Lucio Sauer <watermanpaint@posteo.net>
 M. David Bennett <mdavidbennett@syntheticworks.com>
 Maciej Mrozowski <reavertm@gentoo.org>
 Magnus Kessler <Magnus.Kessler@gmx.net>
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeaccessibility-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeaccessibility-25.04
index 4187d6aa3ae..7b709b57b69 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeaccessibility-25.04
+++ b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeaccessibility-25.04
@@ -2,4 +2,4 @@
 ~kde-apps/kdeaccessibility-meta-25.04.49.9999 **
 ~kde-apps/kmag-25.04.49.9999 **
 ~kde-apps/kmousetool-25.04.49.9999 **
-~kde-apps/kmouth-25.04.49.9999 **
+# <kde-apps/kmouth-25.08.50 # managed by 25.08
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeedu-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeedu-25.04
index 287b98ed44e..dea9e71de7d 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeedu-25.04
+++ b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeedu-25.04
@@ -1,4 +1,5 @@
 ~kde-apps/analitza-25.04.49.9999 **
+# <kde-apps/artikulate-25.08.50 # managed by 25.08
 ~kde-apps/blinken-25.04.49.9999 **
 ~kde-apps/cantor-25.04.49.9999 **
 ~kde-apps/kalgebra-25.04.49.9999 **
@@ -9,13 +10,17 @@
 ~kde-apps/kdeedu-meta-25.04.49.9999 **
 ~kde-apps/kgeography-25.04.49.9999 **
 ~kde-apps/khangman-25.04.49.9999 **
+# <kde-apps/kig-25.08.50 # managed by 25.08
 ~kde-apps/kiten-25.04.49.9999 **
 ~kde-apps/klettres-25.04.49.9999 **
 ~kde-apps/kmplot-25.04.49.9999 **
+# <kde-apps/kqtquickcharts-25.08.50 # managed by 25.08
+# <kde-apps/ktouch-25.08.50 # managed by 25.08
 ~kde-apps/kturtle-25.04.49.9999 **
 ~kde-apps/kwordquiz-25.04.49.9999 **
 ~kde-apps/libkeduvocdocument-25.04.49.9999 **
 ~kde-apps/marble-25.04.49.9999 **
 ~kde-apps/minuet-25.04.49.9999 **
 ~kde-apps/parley-25.04.49.9999 **
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 ~kde-apps/step-25.04.49.9999 **
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdemultimedia-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdemultimedia-25.04
index 53b267a7bc5..794960c194b 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdemultimedia-25.04
+++ b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdemultimedia-25.04
@@ -3,6 +3,7 @@
 ~kde-apps/ffmpegthumbs-25.04.49.9999 **
 ~kde-apps/juk-25.04.49.9999 **
 ~kde-apps/k3b-25.04.49.9999 **
+# <kde-apps/kamoso-25.08.50 # managed by 25.08
 ~kde-apps/kdemultimedia-meta-25.04.49.9999 **
 ~kde-apps/kdenlive-25.04.49.9999 **
 ~kde-apps/kmix-25.04.49.9999 **
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdesdk-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdesdk-25.04
index a7a6c85f85a..eeb34ff8365 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdesdk-25.04
+++ b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdesdk-25.04
@@ -18,4 +18,4 @@
 ~kde-apps/libkomparediff2-25.04.49.9999 **
 ~kde-apps/lokalize-25.04.49.9999 **
 ~kde-apps/poxml-25.04.49.9999 **
-~kde-apps/umbrello-25.04.49.9999 **
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/more-deps b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/more-deps
index 1eafc99a94d..2ba34c8e12f 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/more-deps
+++ b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/more-deps
@@ -1 +1,7 @@
-~media-libs/opentimelineio-0.17.0
+~kde-apps/kamoso-25.08.0
+~kde-apps/artikulate-25.08.0
+~kde-apps/kig-25.08.0
+~kde-apps/kqtquickcharts-25.08.0
+~kde-apps/ktouch-25.08.0
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04/more-deps b/Documentation/package.accept_keywords/.kde-gear-25.04/more-deps
index 1eafc99a94d..2ba34c8e12f 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.04/more-deps
+++ b/Documentation/package.accept_keywords/.kde-gear-25.04/more-deps
@@ -1 +1,7 @@
-~media-libs/opentimelineio-0.17.0
+~kde-apps/kamoso-25.08.0
+~kde-apps/artikulate-25.08.0
+~kde-apps/kig-25.08.0
+~kde-apps/kqtquickcharts-25.08.0
+~kde-apps/ktouch-25.08.0
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdeedu-25.08 b/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdeedu-25.08
index 57d45173832..2626029c732 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdeedu-25.08
+++ b/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdeedu-25.08
@@ -22,5 +22,5 @@
 ~kde-apps/marble-25.08.49.9999 **
 ~kde-apps/minuet-25.08.49.9999 **
 ~kde-apps/parley-25.08.49.9999 **
-# <kde-apps/rocs-9999 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 ~kde-apps/step-25.08.49.9999 **
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdesdk-25.08 b/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdesdk-25.08
index f763a818bd6..4ce42849e2a 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdesdk-25.08
+++ b/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/kdesdk-25.08
@@ -18,4 +18,4 @@
 ~kde-apps/libkomparediff2-25.08.49.9999 **
 ~kde-apps/lokalize-25.08.49.9999 **
 ~kde-apps/poxml-25.08.49.9999 **
-# <kde-apps/umbrello-9999 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/more-deps b/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/more-deps
index e69de29bb2d..7c519a88323 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/more-deps
+++ b/Documentation/package.accept_keywords/.kde-gear-25.08.49.9999/more-deps
@@ -0,0 +1,2 @@
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.08/more-deps b/Documentation/package.accept_keywords/.kde-gear-25.08/more-deps
index e69de29bb2d..7c519a88323 100644
--- a/Documentation/package.accept_keywords/.kde-gear-25.08/more-deps
+++ b/Documentation/package.accept_keywords/.kde-gear-25.08/more-deps
@@ -0,0 +1,2 @@
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/kde-gear-25.04.49.9999.keywords b/Documentation/package.accept_keywords/kde-gear-25.04.49.9999.keywords
index dfcd37f28c4..91594276e98 100644
--- a/Documentation/package.accept_keywords/kde-gear-25.04.49.9999.keywords
+++ b/Documentation/package.accept_keywords/kde-gear-25.04.49.9999.keywords
@@ -21,12 +21,13 @@
 ~kde-apps/kdeaccessibility-meta-25.04.49.9999 **
 ~kde-apps/kmag-25.04.49.9999 **
 ~kde-apps/kmousetool-25.04.49.9999 **
-~kde-apps/kmouth-25.04.49.9999 **
+# <kde-apps/kmouth-25.08.50 # managed by 25.08
 ~app-admin/kio-admin-25.04.49.9999 **
 ~kde-apps/kdeadmin-meta-25.04.49.9999 **
 ~kde-apps/kcron-25.04.49.9999 **
 ~kde-apps/ksystemlog-25.04.49.9999 **
 ~kde-apps/analitza-25.04.49.9999 **
+# <kde-apps/artikulate-25.08.50 # managed by 25.08
 ~kde-apps/blinken-25.04.49.9999 **
 ~kde-apps/cantor-25.04.49.9999 **
 ~kde-apps/kalgebra-25.04.49.9999 **
@@ -37,15 +38,19 @@
 ~kde-apps/kdeedu-meta-25.04.49.9999 **
 ~kde-apps/kgeography-25.04.49.9999 **
 ~kde-apps/khangman-25.04.49.9999 **
+# <kde-apps/kig-25.08.50 # managed by 25.08
 ~kde-apps/kiten-25.04.49.9999 **
 ~kde-apps/klettres-25.04.49.9999 **
 ~kde-apps/kmplot-25.04.49.9999 **
+# <kde-apps/kqtquickcharts-25.08.50 # managed by 25.08
+# <kde-apps/ktouch-25.08.50 # managed by 25.08
 ~kde-apps/kturtle-25.04.49.9999 **
 ~kde-apps/kwordquiz-25.04.49.9999 **
 ~kde-apps/libkeduvocdocument-25.04.49.9999 **
 ~kde-apps/marble-25.04.49.9999 **
 ~kde-apps/minuet-25.04.49.9999 **
 ~kde-apps/parley-25.04.49.9999 **
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 ~kde-apps/step-25.04.49.9999 **
 ~games-puzzle/skladnik-25.04.49.9999 **
 ~kde-apps/bomber-25.04.49.9999 **
@@ -120,6 +125,7 @@
 ~kde-apps/ffmpegthumbs-25.04.49.9999 **
 ~kde-apps/juk-25.04.49.9999 **
 ~kde-apps/k3b-25.04.49.9999 **
+# <kde-apps/kamoso-25.08.50 # managed by 25.08
 ~kde-apps/kdemultimedia-meta-25.04.49.9999 **
 ~kde-apps/kdenlive-25.04.49.9999 **
 ~kde-apps/kmix-25.04.49.9999 **
@@ -228,7 +234,7 @@
 ~kde-apps/libkomparediff2-25.04.49.9999 **
 ~kde-apps/lokalize-25.04.49.9999 **
 ~kde-apps/poxml-25.04.49.9999 **
-~kde-apps/umbrello-25.04.49.9999 **
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 ~app-cdr/dolphin-plugins-mountiso-25.04.49.9999 **
 ~app-cdr/isoimagewriter-25.04.49.9999 **
 ~app-crypt/keysmith-25.04.49.9999 **
@@ -255,4 +261,10 @@
 ~kde-misc/markdownpart-25.04.49.9999 **
 ~sys-block/partitionmanager-25.04.49.9999 **
 ~sys-libs/kpmcore-25.04.49.9999 **
-~media-libs/opentimelineio-0.17.0
+~kde-apps/kamoso-25.08.0
+~kde-apps/artikulate-25.08.0
+~kde-apps/kig-25.08.0
+~kde-apps/kqtquickcharts-25.08.0
+~kde-apps/ktouch-25.08.0
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/kde-gear-25.04.keywords b/Documentation/package.accept_keywords/kde-gear-25.04.keywords
index d71a0ef77a8..f9daed2b5b3 100644
--- a/Documentation/package.accept_keywords/kde-gear-25.04.keywords
+++ b/Documentation/package.accept_keywords/kde-gear-25.04.keywords
@@ -21,13 +21,13 @@
 <kde-apps/kdeaccessibility-meta-25.04.50
 <kde-apps/kmag-25.04.50
 <kde-apps/kmousetool-25.04.50
-<kde-apps/kmouth-25.04.50
+# <kde-apps/kmouth-25.08.50 # managed by 25.08
 <app-admin/kio-admin-25.04.50
 <kde-apps/kdeadmin-meta-25.04.50
 <kde-apps/kcron-25.04.50
 <kde-apps/ksystemlog-25.04.50
 <kde-apps/analitza-25.04.50
-<kde-apps/artikulate-25.08.0
+# <kde-apps/artikulate-25.08.50 # managed by 25.08
 <kde-apps/blinken-25.04.50
 <kde-apps/cantor-25.04.50
 <kde-apps/kalgebra-25.04.50
@@ -38,19 +38,19 @@
 <kde-apps/kdeedu-meta-25.04.50
 <kde-apps/kgeography-25.04.50
 <kde-apps/khangman-25.04.50
-<kde-apps/kig-25.08.0
+# <kde-apps/kig-25.08.50 # managed by 25.08
 <kde-apps/kiten-25.04.50
 <kde-apps/klettres-25.04.50
 <kde-apps/kmplot-25.04.50
-<kde-apps/kqtquickcharts-25.08.0
-<kde-apps/ktouch-25.08.0
+# <kde-apps/kqtquickcharts-25.08.50 # managed by 25.08
+# <kde-apps/ktouch-25.08.50 # managed by 25.08
 <kde-apps/kturtle-25.04.50
 <kde-apps/kwordquiz-25.04.50
 <kde-apps/libkeduvocdocument-25.04.50
 <kde-apps/marble-25.04.50
 <kde-apps/minuet-25.04.50
 <kde-apps/parley-25.04.50
-# <kde-apps/rocs-25.04.50 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.04.50
 <games-puzzle/skladnik-25.04.50
 <kde-apps/bomber-25.04.50
@@ -125,7 +125,7 @@
 <kde-apps/ffmpegthumbs-25.04.50
 <kde-apps/juk-25.04.50
 <kde-apps/k3b-25.04.50
-<kde-apps/kamoso-25.08.0
+# <kde-apps/kamoso-25.08.50 # managed by 25.08
 <kde-apps/kdemultimedia-meta-25.04.50
 <kde-apps/kdenlive-25.04.50
 <kde-apps/kmix-25.04.50
@@ -234,7 +234,7 @@
 <kde-apps/libkomparediff2-25.04.50
 <kde-apps/lokalize-25.04.50
 <kde-apps/poxml-25.04.50
-# <kde-apps/umbrello-25.04.50 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 <app-cdr/dolphin-plugins-mountiso-25.04.50
 <app-cdr/isoimagewriter-25.04.50
 <app-crypt/keysmith-25.04.50
@@ -261,4 +261,10 @@
 <kde-misc/markdownpart-25.04.50
 <sys-block/partitionmanager-25.04.50
 <sys-libs/kpmcore-25.04.50
-~media-libs/opentimelineio-0.17.0
+~kde-apps/kamoso-25.08.0
+~kde-apps/artikulate-25.08.0
+~kde-apps/kig-25.08.0
+~kde-apps/kqtquickcharts-25.08.0
+~kde-apps/ktouch-25.08.0
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/kde-gear-25.08.49.9999.keywords b/Documentation/package.accept_keywords/kde-gear-25.08.49.9999.keywords
index 89dcea7587b..0130cf603d7 100644
--- a/Documentation/package.accept_keywords/kde-gear-25.08.49.9999.keywords
+++ b/Documentation/package.accept_keywords/kde-gear-25.08.49.9999.keywords
@@ -50,7 +50,7 @@
 ~kde-apps/marble-25.08.49.9999 **
 ~kde-apps/minuet-25.08.49.9999 **
 ~kde-apps/parley-25.08.49.9999 **
-# <kde-apps/rocs-9999 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 ~kde-apps/step-25.08.49.9999 **
 ~games-puzzle/skladnik-25.08.49.9999 **
 ~kde-apps/bomber-25.08.49.9999 **
@@ -234,7 +234,7 @@
 ~kde-apps/libkomparediff2-25.08.49.9999 **
 ~kde-apps/lokalize-25.08.49.9999 **
 ~kde-apps/poxml-25.08.49.9999 **
-# <kde-apps/umbrello-9999 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 ~app-cdr/dolphin-plugins-mountiso-25.08.49.9999 **
 ~app-cdr/isoimagewriter-25.08.49.9999 **
 ~app-crypt/keysmith-25.08.49.9999 **
@@ -261,3 +261,5 @@
 ~kde-misc/markdownpart-25.08.49.9999 **
 ~sys-block/partitionmanager-25.08.49.9999 **
 ~sys-libs/kpmcore-25.08.49.9999 **
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.accept_keywords/kde-gear-25.08.keywords b/Documentation/package.accept_keywords/kde-gear-25.08.keywords
index 62a62ccf4b2..e90a24c502d 100644
--- a/Documentation/package.accept_keywords/kde-gear-25.08.keywords
+++ b/Documentation/package.accept_keywords/kde-gear-25.08.keywords
@@ -50,7 +50,7 @@
 <kde-apps/marble-25.08.50
 <kde-apps/minuet-25.08.50
 <kde-apps/parley-25.08.50
-# <kde-apps/rocs-9999 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.08.50
 <games-puzzle/skladnik-25.08.50
 <kde-apps/bomber-25.08.50
@@ -234,7 +234,7 @@
 <kde-apps/libkomparediff2-25.08.50
 <kde-apps/lokalize-25.08.50
 <kde-apps/poxml-25.08.50
-# <kde-apps/umbrello-9999 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 <app-cdr/dolphin-plugins-mountiso-25.08.50
 <app-cdr/isoimagewriter-25.08.50
 <app-crypt/keysmith-25.08.50
@@ -261,3 +261,5 @@
 <kde-misc/markdownpart-25.08.50
 <sys-block/partitionmanager-25.08.50
 <sys-libs/kpmcore-25.08.50
+~kde-apps/rocs-25.11.70_pre20250830
+~kde-apps/umbrello-25.11.70_pre20250830
diff --git a/Documentation/package.mask/kde-gear-25.04 b/Documentation/package.mask/kde-gear-25.04
index ef09a0d09a0..241cd78326c 100644
--- a/Documentation/package.mask/kde-gear-25.04
+++ b/Documentation/package.mask/kde-gear-25.04
@@ -21,13 +21,13 @@
 <kde-apps/kdeaccessibility-meta-25.04.50
 <kde-apps/kmag-25.04.50
 <kde-apps/kmousetool-25.04.50
-<kde-apps/kmouth-25.04.50
+# <kde-apps/kmouth-25.08.50 # managed by 25.08
 <app-admin/kio-admin-25.04.50
 <kde-apps/kdeadmin-meta-25.04.50
 <kde-apps/kcron-25.04.50
 <kde-apps/ksystemlog-25.04.50
 <kde-apps/analitza-25.04.50
-<kde-apps/artikulate-25.08.0
+# <kde-apps/artikulate-25.08.50 # managed by 25.08
 <kde-apps/blinken-25.04.50
 <kde-apps/cantor-25.04.50
 <kde-apps/kalgebra-25.04.50
@@ -38,19 +38,19 @@
 <kde-apps/kdeedu-meta-25.04.50
 <kde-apps/kgeography-25.04.50
 <kde-apps/khangman-25.04.50
-<kde-apps/kig-25.08.0
+# <kde-apps/kig-25.08.50 # managed by 25.08
 <kde-apps/kiten-25.04.50
 <kde-apps/klettres-25.04.50
 <kde-apps/kmplot-25.04.50
-<kde-apps/kqtquickcharts-25.08.0
-<kde-apps/ktouch-25.08.0
+# <kde-apps/kqtquickcharts-25.08.50 # managed by 25.08
+# <kde-apps/ktouch-25.08.50 # managed by 25.08
 <kde-apps/kturtle-25.04.50
 <kde-apps/kwordquiz-25.04.50
 <kde-apps/libkeduvocdocument-25.04.50
 <kde-apps/marble-25.04.50
 <kde-apps/minuet-25.04.50
 <kde-apps/parley-25.04.50
-# <kde-apps/rocs-25.04.50 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.04.50
 <games-puzzle/skladnik-25.04.50
 <kde-apps/bomber-25.04.50
@@ -125,7 +125,7 @@
 <kde-apps/ffmpegthumbs-25.04.50
 <kde-apps/juk-25.04.50
 <kde-apps/k3b-25.04.50
-<kde-apps/kamoso-25.08.0
+# <kde-apps/kamoso-25.08.50 # managed by 25.08
 <kde-apps/kdemultimedia-meta-25.04.50
 <kde-apps/kdenlive-25.04.50
 <kde-apps/kmix-25.04.50
@@ -234,7 +234,7 @@
 <kde-apps/libkomparediff2-25.04.50
 <kde-apps/lokalize-25.04.50
 <kde-apps/poxml-25.04.50
-# <kde-apps/umbrello-25.04.50 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 <app-cdr/dolphin-plugins-mountiso-25.04.50
 <app-cdr/isoimagewriter-25.04.50
 <app-crypt/keysmith-25.04.50
diff --git a/Documentation/package.mask/kde-gear-25.08 b/Documentation/package.mask/kde-gear-25.08
index 9e8a16041dc..7bccbb0f9a8 100644
--- a/Documentation/package.mask/kde-gear-25.08
+++ b/Documentation/package.mask/kde-gear-25.08
@@ -50,7 +50,7 @@
 <kde-apps/marble-25.08.50
 <kde-apps/minuet-25.08.50
 <kde-apps/parley-25.08.50
-# <kde-apps/rocs-9999 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.08.50
 <games-puzzle/skladnik-25.08.50
 <kde-apps/bomber-25.08.50
@@ -234,7 +234,7 @@
 <kde-apps/libkomparediff2-25.08.50
 <kde-apps/lokalize-25.08.50
 <kde-apps/poxml-25.08.50
-# <kde-apps/umbrello-9999 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 <app-cdr/dolphin-plugins-mountiso-25.08.50
 <app-cdr/isoimagewriter-25.08.50
 <app-crypt/keysmith-25.08.50
diff --git a/Documentation/package.unmask/kde-gear-25.04 b/Documentation/package.unmask/kde-gear-25.04
index ef09a0d09a0..241cd78326c 100644
--- a/Documentation/package.unmask/kde-gear-25.04
+++ b/Documentation/package.unmask/kde-gear-25.04
@@ -21,13 +21,13 @@
 <kde-apps/kdeaccessibility-meta-25.04.50
 <kde-apps/kmag-25.04.50
 <kde-apps/kmousetool-25.04.50
-<kde-apps/kmouth-25.04.50
+# <kde-apps/kmouth-25.08.50 # managed by 25.08
 <app-admin/kio-admin-25.04.50
 <kde-apps/kdeadmin-meta-25.04.50
 <kde-apps/kcron-25.04.50
 <kde-apps/ksystemlog-25.04.50
 <kde-apps/analitza-25.04.50
-<kde-apps/artikulate-25.08.0
+# <kde-apps/artikulate-25.08.50 # managed by 25.08
 <kde-apps/blinken-25.04.50
 <kde-apps/cantor-25.04.50
 <kde-apps/kalgebra-25.04.50
@@ -38,19 +38,19 @@
 <kde-apps/kdeedu-meta-25.04.50
 <kde-apps/kgeography-25.04.50
 <kde-apps/khangman-25.04.50
-<kde-apps/kig-25.08.0
+# <kde-apps/kig-25.08.50 # managed by 25.08
 <kde-apps/kiten-25.04.50
 <kde-apps/klettres-25.04.50
 <kde-apps/kmplot-25.04.50
-<kde-apps/kqtquickcharts-25.08.0
-<kde-apps/ktouch-25.08.0
+# <kde-apps/kqtquickcharts-25.08.50 # managed by 25.08
+# <kde-apps/ktouch-25.08.50 # managed by 25.08
 <kde-apps/kturtle-25.04.50
 <kde-apps/kwordquiz-25.04.50
 <kde-apps/libkeduvocdocument-25.04.50
 <kde-apps/marble-25.04.50
 <kde-apps/minuet-25.04.50
 <kde-apps/parley-25.04.50
-# <kde-apps/rocs-25.04.50 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.04.50
 <games-puzzle/skladnik-25.04.50
 <kde-apps/bomber-25.04.50
@@ -125,7 +125,7 @@
 <kde-apps/ffmpegthumbs-25.04.50
 <kde-apps/juk-25.04.50
 <kde-apps/k3b-25.04.50
-<kde-apps/kamoso-25.08.0
+# <kde-apps/kamoso-25.08.50 # managed by 25.08
 <kde-apps/kdemultimedia-meta-25.04.50
 <kde-apps/kdenlive-25.04.50
 <kde-apps/kmix-25.04.50
@@ -234,7 +234,7 @@
 <kde-apps/libkomparediff2-25.04.50
 <kde-apps/lokalize-25.04.50
 <kde-apps/poxml-25.04.50
-# <kde-apps/umbrello-25.04.50 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 <app-cdr/dolphin-plugins-mountiso-25.04.50
 <app-cdr/isoimagewriter-25.04.50
 <app-crypt/keysmith-25.04.50
diff --git a/Documentation/package.unmask/kde-gear-25.08 b/Documentation/package.unmask/kde-gear-25.08
index 9e8a16041dc..7bccbb0f9a8 100644
--- a/Documentation/package.unmask/kde-gear-25.08
+++ b/Documentation/package.unmask/kde-gear-25.08
@@ -50,7 +50,7 @@
 <kde-apps/marble-25.08.50
 <kde-apps/minuet-25.08.50
 <kde-apps/parley-25.08.50
-# <kde-apps/rocs-9999 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.08.50
 <games-puzzle/skladnik-25.08.50
 <kde-apps/bomber-25.08.50
@@ -234,7 +234,7 @@
 <kde-apps/libkomparediff2-25.08.50
 <kde-apps/lokalize-25.08.50
 <kde-apps/poxml-25.08.50
-# <kde-apps/umbrello-9999 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
 <app-cdr/dolphin-plugins-mountiso-25.08.50
 <app-cdr/isoimagewriter-25.08.50
 <app-crypt/keysmith-25.08.50
diff --git a/sets/kdeaccessibility-25.04 b/sets/kdeaccessibility-25.04
index 2264e0a88bc..fbe8e3be153 100644
--- a/sets/kdeaccessibility-25.04
+++ b/sets/kdeaccessibility-25.04
@@ -2,4 +2,4 @@
 <kde-apps/kdeaccessibility-meta-25.04.50
 <kde-apps/kmag-25.04.50
 <kde-apps/kmousetool-25.04.50
-<kde-apps/kmouth-25.04.50
+# <kde-apps/kmouth-25.08.50 # managed by 25.08
diff --git a/sets/kdeedu-25.04 b/sets/kdeedu-25.04
index 2e404260ada..8970b00edc9 100644
--- a/sets/kdeedu-25.04
+++ b/sets/kdeedu-25.04
@@ -1,5 +1,5 @@
 <kde-apps/analitza-25.04.50
-<kde-apps/artikulate-25.08.0
+# <kde-apps/artikulate-25.08.50 # managed by 25.08
 <kde-apps/blinken-25.04.50
 <kde-apps/cantor-25.04.50
 <kde-apps/kalgebra-25.04.50
@@ -10,17 +10,17 @@
 <kde-apps/kdeedu-meta-25.04.50
 <kde-apps/kgeography-25.04.50
 <kde-apps/khangman-25.04.50
-<kde-apps/kig-25.08.0
+# <kde-apps/kig-25.08.50 # managed by 25.08
 <kde-apps/kiten-25.04.50
 <kde-apps/klettres-25.04.50
 <kde-apps/kmplot-25.04.50
-<kde-apps/kqtquickcharts-25.08.0
-<kde-apps/ktouch-25.08.0
+# <kde-apps/kqtquickcharts-25.08.50 # managed by 25.08
+# <kde-apps/ktouch-25.08.50 # managed by 25.08
 <kde-apps/kturtle-25.04.50
 <kde-apps/kwordquiz-25.04.50
 <kde-apps/libkeduvocdocument-25.04.50
 <kde-apps/marble-25.04.50
 <kde-apps/minuet-25.04.50
 <kde-apps/parley-25.04.50
-# <kde-apps/rocs-25.04.50 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.04.50
diff --git a/sets/kdeedu-25.08 b/sets/kdeedu-25.08
index b9af12e0f75..77528525a04 100644
--- a/sets/kdeedu-25.08
+++ b/sets/kdeedu-25.08
@@ -22,5 +22,5 @@
 <kde-apps/marble-25.08.50
 <kde-apps/minuet-25.08.50
 <kde-apps/parley-25.08.50
-# <kde-apps/rocs-9999 # while KF5-based
+# <kde-apps/rocs-25.12.50 # managed by 25.12
 <kde-apps/step-25.08.50
diff --git a/sets/kdemultimedia-25.04 b/sets/kdemultimedia-25.04
index 3fe9df53bc5..732934a9fc7 100644
--- a/sets/kdemultimedia-25.04
+++ b/sets/kdemultimedia-25.04
@@ -3,7 +3,7 @@
 <kde-apps/ffmpegthumbs-25.04.50
 <kde-apps/juk-25.04.50
 <kde-apps/k3b-25.04.50
-<kde-apps/kamoso-25.08.0
+# <kde-apps/kamoso-25.08.50 # managed by 25.08
 <kde-apps/kdemultimedia-meta-25.04.50
 <kde-apps/kdenlive-25.04.50
 <kde-apps/kmix-25.04.50
diff --git a/sets/kdesdk-25.04 b/sets/kdesdk-25.04
index 326c057b8f0..a0721aed60d 100644
--- a/sets/kdesdk-25.04
+++ b/sets/kdesdk-25.04
@@ -18,4 +18,4 @@
 <kde-apps/libkomparediff2-25.04.50
 <kde-apps/lokalize-25.04.50
 <kde-apps/poxml-25.04.50
-# <kde-apps/umbrello-25.04.50 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12
diff --git a/sets/kdesdk-25.08 b/sets/kdesdk-25.08
index 5555ae38504..f75f11b49d8 100644
--- a/sets/kdesdk-25.08
+++ b/sets/kdesdk-25.08
@@ -18,4 +18,4 @@
 <kde-apps/libkomparediff2-25.08.50
 <kde-apps/lokalize-25.08.50
 <kde-apps/poxml-25.08.50
-# <kde-apps/umbrello-9999 # while KF5-based
+# <kde-apps/umbrello-25.12.50 # managed by 25.12