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

[Andreas Sturmlechner]

commit:     fb473ff4157299cc5a9a3f62fdb4dae7b0107c87
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 14:56:22 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 19:52:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb473ff4

regenerate-files: Allow Frameworks sets to reference smaller (tier) sets

Same as is already done with Release Service sets.

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

 Documentation/maintainers/regenerate-files | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files 
b/Documentation/maintainers/regenerate-files
index 0c0dbf5785..947fb8daa9 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -23,7 +23,7 @@ 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 '/^~.*[.-]9999$/s/$/ **/' >> 
"kde-frameworks-${release}.keywords"
+               cat ".kde-frameworks-${release}/"* | grep -P -v 
'^>=kde-frameworks/(?!kf-env)' | sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> 
"kde-frameworks-${release}.keywords"
        fi
 done
 
@@ -62,7 +62,7 @@ if [[ -d .kde-frameworks-live.base ]]; then
        echo -e "${HEADER}" > kde-frameworks-live.keywords
        for file in .kde-frameworks-live.base/*; do
                newfile=.kde-frameworks-live/$(basename "${file}")
-               sed '/^~.*[.-]9999$/s/$/ **/' "${file}" > "${newfile}"
+               sed -e '/^~.*[.-]9999$/s/$/ **/'  -e '/^@/d' "${file}" > 
"${newfile}"
        done
        cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
 fi
@@ -104,6 +104,7 @@ for release in $KF_RELEASES live; do
        echo -e "${HEADER}" > "kde-frameworks-${release}"
        if [[ -d ".kde-frameworks-${release}" ]]; then
                cat ".kde-frameworks-${release}/"* | grep -P -v 
'^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+               sed -i "kde-frameworks-${release}" -e "/^@/d"
        fi
 done
 
@@ -129,7 +130,7 @@ 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}/"* | 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/^</>=/}"
+               sed -i "kde-frameworks-${release}" -e 
"/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e 
'/^@/d'
        fi
 done