[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/new/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6ef20dc0d29303c86b5deb134dfeaeb8654eb040
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 16:42:58 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 21:24:24 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ef20dc0

Documentation: lib.sh: create_keywords_files: Drop base name hack

Requires providing second argument.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/new/frameworks-bump.sh |  2 +-
 Documentation/maintainers/new/gear-bump.sh       |  2 +-
 Documentation/maintainers/new/lib.sh             | 10 +++++-----
 Documentation/maintainers/new/plasma-bump.sh     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/maintainers/new/frameworks-bump.sh b/Documentation/maintainers/new/frameworks-bump.sh
index 1d51c345f5..243f46d61e 100755
--- a/Documentation/maintainers/new/frameworks-bump.sh
+++ b/Documentation/maintainers/new/frameworks-bump.sh
@@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null
 bump_set_from_live kde-frameworks ${major_version}
 mask_from_live_set kde-frameworks ${VERSION} ${kfv}
 mark_unreleased frameworks ${VERSION}
-create_keywords_files ${kfmv}
+create_keywords_files ${kfmv} ${set}
 
 sed -i -e "/KF_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files
 Documentation/maintainers/regenerate-files

diff --git a/Documentation/maintainers/new/gear-bump.sh b/Documentation/maintainers/new/gear-bump.sh
index 853c1927e6..4d4fc7067e 100755
--- a/Documentation/maintainers/new/gear-bump.sh
+++ b/Documentation/maintainers/new/gear-bump.sh
@@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null
 
 if ! [[ -f sets/kde-gear-${major_version} ]]; then
 	bump_set_from_live kde-gear ${major_version}
-	create_keywords_files ${kfmv}
+	create_keywords_files ${kfmv} kde-gear
 
 	sed -i -e "/GEAR_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files
 	Documentation/maintainers/regenerate-files

diff --git a/Documentation/maintainers/new/lib.sh b/Documentation/maintainers/new/lib.sh
index d6317e1fa3..59bdcef983 100755
--- a/Documentation/maintainers/new/lib.sh
+++ b/Documentation/maintainers/new/lib.sh
@@ -101,16 +101,16 @@ commit_packages() {
 }
 
 # @FUNCTION: create_keywords_files
-# @USAGE: <set name>
+# @USAGE: <target set> <base setname>
 # @DESCRIPTION:
-# Creates new package.{accept_keywords,unmask,mask}/<set name> files based on
-# live dirs and referencing <set name> including any subsets.
+# Creates new package.{accept_keywords,unmask,mask}/<target set> files based on
+# <base setname>-live dirs and referencing <target setname> including any subsets.
 create_keywords_files() {
 	local target="${1}"
-	local base=${target/%-[0-9.]*/}
+	local base="${2}"
 	local x
 
-	if [[ $# -gt 1 ]]; then
+	if [[ $# -gt 2 ]]; then
 		echo "${FUNCNAME[0]}: error: must be passed exactly one argument!"
 		return
 	fi

diff --git a/Documentation/maintainers/new/plasma-bump.sh b/Documentation/maintainers/new/plasma-bump.sh
index e567fe8763..978f9cc857 100755
--- a/Documentation/maintainers/new/plasma-bump.sh
+++ b/Documentation/maintainers/new/plasma-bump.sh
@@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null
 
 if ! [[ -f sets/kde-plasma-${major_version} ]]; then
 	bump_set_from_live kde-plasma ${major_version} # TODO: s/49.9999/50:5/
-	create_keywords_files ${kfmv}
+	create_keywords_files ${kfmv} kde-plasma
 
 	sed -i -e "/PLASMA_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files
 	Documentation/maintainers/regenerate-files