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

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

commit:     832aea1fee97c4233d0c1e8b72a8a312de1d83af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 10:51:54 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 17:24:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=832aea1f

Documentation: regenerate-files: Prepare for parallel KF5/KF6 support

- Rename KF_RELEASE(S) to KF5_RELEASE(S)
- Add KF6_RELEASE(S) and initial yet inactive file generation support

- sets:
  - kde-frameworks-*-live will be renamed to kde-frameworks-5-*-live
  - release kde-frameworks-* sets will be renamed to kde-frameworks-5-*
  - version atoms in KF5 sets do need slotting to be future-proof

- Documentation:
  - Prepare for 5.9999 versioned live ebuilds instead of 9999
  - .kde-frameworks-5-live.base is new base for KDE Frameworks 5 file gen
  - .kde-frameworks-6-live.base will be used for KF6 in the future
  - package.{accept_keywords,unmask}/kde-frameworks-live will be renamed
    to kde-frameworks-5-live respectively

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

 Documentation/maintainers/regenerate-files | 105 ++++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 25 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index a558d839df..cec360f2ff 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,8 +9,11 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.99 5.101"
-KF_RELEASE=${KF_RELEASE:-5.99}
+KF5_RELEASES="5.99 5.101"
+KF5_RELEASE=${KF5_RELEASE:-5.99}
+
+KF6_RELEASES=""
+KF6_RELEASE=${KF6_RELEASE:-}
 
 PLASMA_RELEASES="5.25 5.26"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.25}
@@ -20,14 +23,24 @@ GEAR_RELEASE=${GEAR_RELEASE:-22.08}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
-for release in $KF_RELEASES; do
-	echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
-	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
-			sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
+for release in $KF5_RELEASES; do
+	if [[ -d ".kde-frameworks-5-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
+		cat ".kde-frameworks-5-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
+			sed -e '/^~.*[.-]5\.9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
 	fi
 done
 
+if [[ -n ${KF6_RELEASES} ]]; then
+	for release in $KF6_RELEASES; do
+		if [[ -d ".kde-frameworks-6-${release}" ]]; then
+			echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
+			cat ".kde-frameworks-6-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
+				sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
+		fi
+	done
+fi
+
 for release in $PLASMA_RELEASES; do
 	echo -e "${HEADER}" > "kde-plasma-${release}.keywords"
 	if [[ -d ".kde-plasma-${release}" ]]; then
@@ -59,15 +72,26 @@ for release in $GEAR_RELEASES; do
 	fi
 done
 
-if [[ -d .kde-frameworks-live.base ]]; then
-	rm -rf .kde-frameworks-live
-	mkdir -p .kde-frameworks-live
-	echo -e "${HEADER}" > kde-frameworks-live.keywords
-	for file in .kde-frameworks-live.base/*; do
-		newfile=.kde-frameworks-live/$(basename "${file}")
+if [[ -d .kde-frameworks-5-live.base ]]; then
+	rm -rf .kde-frameworks-5-live
+	mkdir -p .kde-frameworks-5-live
+	echo -e "${HEADER}" > kde-frameworks-5-live.keywords
+	for file in .kde-frameworks-5-live.base/*; do
+		newfile=.kde-frameworks-5-live/$(basename "${file}")
+		sed -e '/^~.*[.-]5.9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
+	done
+	cat .kde-frameworks-5-live/* >> kde-frameworks-5-live.keywords
+fi
+
+if [[ -d .kde-frameworks-6-live.base ]]; then
+	rm -rf .kde-frameworks-6-live
+	mkdir -p .kde-frameworks-6-live
+	echo -e "${HEADER}" > kde-frameworks-6-live.keywords
+	for file in .kde-frameworks-6-live.base/*; do
+		newfile=.kde-frameworks-6-live/$(basename "${file}")
 		sed -e '/^~.*[.-]9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
 	done
-	cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
+	cat .kde-frameworks-6-live/* >> kde-frameworks-6-live.keywords
 fi
 
 if [[ -d .kde-plasma-live.base ]]; then
@@ -95,15 +119,26 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in $KF_RELEASES live; do
-	echo -e "${HEADER}" > "kde-frameworks-${release}"
-	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | \
+for release in $KF5_RELEASES 5-live; do
+	if [[ -d ".kde-frameworks-5-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}"
+		cat ".kde-frameworks-5-${release}/"* | \
 			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 		sed -i "kde-frameworks-${release}" -e "/^@/d"
 	fi
 done
 
+if [[ -n ${KF6_RELEASES} ]]; then
+	for release in $KF6_RELEASES 6-live; do
+		if [[ -d ".kde-frameworks-6-${release}" ]]; then
+			echo -e "${HEADER}" > "kde-frameworks-${release}"
+			cat ".kde-frameworks-6-${release}/"* | \
+				grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+			sed -i "kde-frameworks-${release}" -e "/^@/d"
+		fi
+	done
+fi
+
 for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d ".kde-plasma-${release}" ]]; then
@@ -122,16 +157,28 @@ popd > /dev/null
 
 # regenerate mask entries (base for package mask)
 pushd ../package.mask/ > /dev/null
-for release in $KF_RELEASES live; do
-	echo -e "${HEADER}" > "kde-frameworks-${release}"
-	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
-		cat "../package.unmask/.kde-frameworks-${release}/"* | \
+for release in $KF5_RELEASES 5-live; do
+	if [[ -d "../package.unmask/.kde-frameworks-5-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}"
+		cat "../package.unmask/.kde-frameworks-5-${release}/"* | \
 			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 		sed -i "kde-frameworks-${release}" \
 			-e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
 	fi
 done
 
+if [[ -n ${KF6_RELEASES} ]]; then
+	for release in $KF6_RELEASES 6-live; do
+		if [[ -d "../package.unmask/.kde-frameworks-6-${release}" ]]; then
+			echo -e "${HEADER}" > "kde-frameworks-${release}"
+			cat "../package.unmask/.kde-frameworks-6-${release}/"* | \
+				grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+			sed -i "kde-frameworks-${release}" \
+				-e "/^<kde-frameworks\/.*-6\..\.50:6$/{s/-6\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
+		fi
+	done
+fi
+
 for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
@@ -153,12 +200,20 @@ popd > /dev/null
 
 # regenerate unversioned sets
 pushd ../../sets/ > /dev/null
-for set in *frameworks*${KF_RELEASE}; do
-	newfile=${set/%-${KF_RELEASE}}
+for set in *frameworks-5*${KF5_RELEASE}; do
+	newfile=${set/%-${KF5_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${KF_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\...\.50)//" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${KF5_RELEASE}//g;/5\.9999$/s/~//;s/<//;\@kde-frameworks/@s/-(5\.9999|5\...\.50)/:5/" "${set}" >> "${newfile}"
 done
 
+if [[ -n ${KF6_RELEASE} ]]; then
+	for set in *frameworks-6*${KF6_RELEASE}; do
+		newfile=${set/%-${KF6_RELEASE}}
+		echo -e "${HEADER}" > "${newfile}"
+		sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\...\.50)//" "${set}" >> "${newfile}"
+	done
+fi
+
 for set in *plasma-${PLASMA_RELEASE}; do
 	newfile=${set/%-${PLASMA_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"