From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E1FC158015 for ; Sat, 16 Dec 2023 22:02:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0FE42BC062; Sat, 16 Dec 2023 22:02:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFD262BC062 for ; Sat, 16 Dec 2023 22:02:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD024335DC2 for ; Sat, 16 Dec 2023 22:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5811C1257 for ; Sat, 16 Dec 2023 22:02:21 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1702763998.75d64c7cf399d5d83147a73a768f4d61714c15b5.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/regenerate-files X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 75d64c7cf399d5d83147a73a768f4d61714c15b5 X-VCS-Branch: master Date: Sat, 16 Dec 2023 22:02:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e26b7eb8-eef1-46d2-b465-c9be4fcc460f X-Archives-Hash: 0ac4ce69c44641293270b6aed500f7a6 commit: 75d64c7cf399d5d83147a73a768f4d61714c15b5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 16 21:27:47 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 16 21:59:58 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=75d64c7c Documentation: regenerate-files: Fix it for KDE Frameworks 6 (live) Signed-off-by: Andreas Sturmlechner gentoo.org> Documentation/maintainers/regenerate-files | 58 ++++++++++++++---------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files index 5daf9a3260..e9140383a9 100755 --- a/Documentation/maintainers/regenerate-files +++ b/Documentation/maintainers/regenerate-files @@ -33,9 +33,9 @@ done if [[ -n ${KF6_RELEASES} ]]; then for release in $KF6_RELEASES; do - if [[ -d ".kde-frameworks-6-${release}" ]]; then + if [[ -d ".kde-frameworks-${release}" ]]; then echo -e "${HEADER}" > "kde-frameworks-${release}.keywords" - cat ".kde-frameworks-6-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \ + cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \ sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords" fi done @@ -83,15 +83,15 @@ if [[ -d .kde-frameworks-5-live.base ]]; then 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}") +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}") sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' "${file}" > "${newfile}" done - cat .kde-frameworks-6-live/* >> kde-frameworks-6-live.keywords + cat .kde-frameworks-live/* >> kde-frameworks-live.keywords fi if [[ -d .kde-plasma-live.base ]]; then @@ -128,16 +128,14 @@ for release in $KF5_RELEASES 5-live; do 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 $KF6_RELEASES live; do + if [[ -d ".kde-frameworks-${release}" ]]; then + echo -e "${HEADER}" > "kde-frameworks-${release}" + cat ".kde-frameworks-${release}/"* | \ + grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}" + sed -i "kde-frameworks-${release}" -e "/^@/d" + fi +done for release in $PLASMA_RELEASES live; do echo -e "${HEADER}" > "kde-plasma-${release}" @@ -167,17 +165,15 @@ for release in $KF5_RELEASES 5-live; do 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 "/^=/}" -e '/^@/d' - fi - done -fi +for release in $KF6_RELEASES live; do + if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then + echo -e "${HEADER}" > "kde-frameworks-${release}" + cat "../package.unmask/.kde-frameworks-${release}/"* | \ + grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}" + sed -i "kde-frameworks-${release}" \ + -e "/^=/}" -e '/^@/d' + fi +done for release in $PLASMA_RELEASES live; do echo -e "${HEADER}" > "kde-plasma-${release}" @@ -207,7 +203,7 @@ for set in *frameworks-5*${KF5_RELEASE}; do done if [[ -n ${KF6_RELEASE} ]]; then - for set in *frameworks-6*${KF6_RELEASE}; do + for set in *frameworks-*${KF6_RELEASE}; do newfile=${set/%-${KF6_RELEASE}} echo -e "${HEADER}" > "${newfile}" sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/> "${newfile}"