Merge updates from master

91 files changed, 29 insertions, 1951 deletions

diff --git a/Documentation/CONTRIBUTORS b/Documentation/CONTRIBUTORS
index 8909572d328..185f584243a 100644
--- a/Documentation/CONTRIBUTORS
+++ b/Documentation/CONTRIBUTORS
@@ -48,6 +48,7 @@ Dror Levin <spatz@gentoo.org>
 Eli Schwartz <eschwartz@gentoo.org>
 Elias Probst <mail@eliasprobst.eu>
 Enrico Tagliavini <enrico.tagliavini@gmail.com>
+Esteve Varela Colominas <esteve.varela@gmail.com>
 Eugene Shalygin <eugene.shalygin@gmail.com>
 Fabian Groffen <grobian@gentoo.org>
 Fabian Köster <fabian.koester@bringnow.com>
@@ -88,6 +89,7 @@ José Pekkarinen <koalinux@gmail.com>
 Julian Ospald <hasufell@gentoo.org>
 Justin Lecher <jlec@gentoo.org>
 Karol Herbst <git@karolherbst.de>
+Kenton Groombridge <concord@gentoo.org>
 Kostadin Shishmanov <kocelfc@tutanota.com>
 Krzysztof Nowicki <krissn@op.pl>
 Lars Wendler <polynomial-c@gentoo.org>
@@ -157,6 +159,7 @@ Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
 Roy Bamford <neddyseagoon@gentoo.org>
 Sam James <sam@gentoo.org>
 Samuli Suominen <ssuominen@gentoo.org>
+Sasha Finkelstein <fnkl.kernel@gmail.com>
 Scarlett Clark <scarlett@scarlettgatelyclark.com>
 Sebastian Engel <sighunter@gmx.de>
 Sergey Alirzaev <zl29ah@gmail.com>
@@ -174,6 +177,7 @@ Unknown <root@localhost>
 Uwe L. Korn <uwelk@xhochy.com>
 Vadim A. Misbakh-Soloviev <mva@mva.name>
 Vadim Misbakh-Soloviov <mva@gentoo.org>
+Viorel Munteanu <ceamac@gentoo.org>
 Vladimir Smirnov <civil.over@gmail.com>
 WANG Xuerui <xen0n@gentoo.org>
 William <William@undefined.re>
diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 627850c7678..7f271f9beb7 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,14 +9,14 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF6_RELEASES=( 6.18 6.19 6.20 )
+KF6_RELEASES=( 6.18 6.20 )
 KF6_RELEASE=${KF6_RELEASE:-6.18}
 
 PLASMA_RELEASES=( 6.4 6.5 )
 PLASMA_RELEASE=${PLASMA_RELEASE:-6.4}
 
-GEAR_RELEASES=( 25.04 25.08 )
-GEAR_RELEASE=${GEAR_RELEASE:-25.04}
+GEAR_RELEASES=( 25.08 )
+GEAR_RELEASE=${GEAR_RELEASE:-25.08}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-6.19/_HEADER_ b/Documentation/package.accept_keywords/.kde-frameworks-6.19/_HEADER_
deleted file mode 100644
index 5b8b6331424..00000000000
--- a/Documentation/package.accept_keywords/.kde-frameworks-6.19/_HEADER_
+++ /dev/null
@@ -1,2 +0,0 @@
-# You can use this file to keyword/unkeyword the KDE Frameworks 6.19 release.
-# Edit Documentation/package.accept_keywords/.kde-frameworks-6.19/ files instead.
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-6.19 b/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-6.19
deleted file mode 120000
index 449365739af..00000000000
--- a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-6.19
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kde-frameworks-6.19
\ No newline at end of file
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier1-6.19 b/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier1-6.19
deleted file mode 120000
index 765745f25c6..00000000000
--- a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier1-6.19
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kde-frameworks-tier1-6.19
\ No newline at end of file
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier2-6.19 b/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier2-6.19
deleted file mode 120000
index 1f7ec304fb0..00000000000
--- a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier2-6.19
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kde-frameworks-tier2-6.19
\ No newline at end of file
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier3-6.19 b/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier3-6.19
deleted file mode 120000
index 9b3e578d7c7..00000000000
--- a/Documentation/package.accept_keywords/.kde-frameworks-6.19/kde-frameworks-tier3-6.19
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kde-frameworks-tier3-6.19
\ No newline at end of file
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-6.19/more-deps b/Documentation/package.accept_keywords/.kde-frameworks-6.19/more-deps
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Documentation/package.accept_keywords/.kde-frameworks-6.19/more-deps
+++ /dev/null
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/_HEADER_ b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/_HEADER_
deleted file mode 100644
index 807e8206d6d..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/_HEADER_
+++ /dev/null
@@ -1,2 +0,0 @@
-# You can use this file to keyword/unkeyword the KDE Gear 25.04 release.
-# Edit Documentation/package.accept_keywords/.kde-gear-25.04/ files instead.
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kde-baseapps-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kde-baseapps-25.04
deleted file mode 100644
index 433dab354ae..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kde-baseapps-25.04
+++ /dev/null
@@ -1,5 +0,0 @@
-~kde-apps/kdialog-25.04.49.9999 **
-~kde-apps/keditbookmarks-25.04.49.9999 **
-~kde-apps/kfind-25.04.49.9999 **
-~kde-apps/konqueror-25.04.49.9999 **
-~www-client/falkon-25.04.49.9999 **
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kde-gear-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kde-gear-25.04
deleted file mode 100644
index 2495e89f4cc..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kde-gear-25.04
+++ /dev/null
@@ -1,11 +0,0 @@
-~kde-apps/baloo-widgets-25.04.49.9999 **
-~kde-apps/dolphin-25.04.49.9999 **
-~kde-apps/kate-25.04.49.9999 **
-~kde-apps/kate-addons-25.04.49.9999 **
-~kde-apps/kate-common-25.04.49.9999 **
-~kde-apps/kate-lib-25.04.49.9999 **
-~kde-apps/kde-apps-meta-25.04.49.9999 **
-~kde-apps/kdecore-meta-25.04.49.9999 **
-~kde-apps/khelpcenter-25.04.49.9999 **
-~kde-apps/konsole-25.04.49.9999 **
-~kde-apps/kwrite-25.04.49.9999 **
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
deleted file mode 100644
index 7b709b57b69..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeaccessibility-25.04
+++ /dev/null
@@ -1,5 +0,0 @@
-~app-accessibility/kontrast-25.04.49.9999 **
-~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.08.50 # managed by 25.08
diff --git a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeadmin-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeadmin-25.04
deleted file mode 100644
index 6f0b49d980a..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeadmin-25.04
+++ /dev/null
@@ -1,4 +0,0 @@
-~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 **
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
deleted file mode 100644
index dea9e71de7d..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdeedu-25.04
+++ /dev/null
@@ -1,26 +0,0 @@
-~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 **
-~kde-apps/kalzium-25.04.49.9999 **
-~kde-apps/kanagram-25.04.49.9999 **
-~kde-apps/kbruch-25.04.49.9999 **
-~kde-apps/kdeedu-data-25.04.49.9999 **
-~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/kdegames-25.04 b/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdegames-25.04
deleted file mode 100644
index 3500445372d..00000000000
--- a/Documentation/package.accept_keywords/.kde-gear-25.04.49.9999/kdegames-25.04
+++ /dev/null
@@ -1,44 +0,0 @@
-~games-puzzle/skladnik-25.04.49.9999 **
-~kde-apps/bomber-25.04.49.9999 **
-~kde-apps/bovo-25.04.49.9999 **
-~kde-apps/granatier-25.04.49.9999 **
-~kde-apps/kajongg-25.04.49.9999 **
-~kde-apps/kapman-25.04.49.9999 **
-~kde-apps/katomic-25.04.49.9999 **
-~kde-apps/kblackbox-25.04.49.9999 **
-~kde-apps/kblocks-25.04.49.9999 **
-~kde-apps/kbounce-25.04.49.9999 **
-~kde-apps/kbreakout-25.04.49.9999 **
-~kde-apps/kdegames-meta-25.04.49.9999 **