commit: 6d8bdac80192fba96275e8071266637e8b4cb70d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 22 17:42:57 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 17:51:26 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6d8bdac8
[Documentation] Don't automatically pin Plasma 5 packages to a SLOT.
In order to avoid keywords/mask files accidentally applying to KDE 4 stuff, we
will specify the SLOT manually in the versioned set which will then carry over
automatically to the unversioned, generated set.
---
Documentation/maintainers/regenerate-files | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/maintainers/regenerate-files
b/Documentation/maintainers/regenerate-files
index 500d79a..9cde9c1 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -144,7 +144,7 @@ for release in $PLASMA_RELEASES live; do
echo -e "${HEADER}" > "kde-plasma-${release}"
if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
cat "../package.unmask/.kde-plasma-${release}/"* >>
"kde-plasma-${release}"
- sed -i "kde-plasma-${release}" -e
"/^<kde-base\/.*-5\..\.50$/{s/-5\..\.50/-${release}/;s/^</>=/}"
+ sed -i "kde-plasma-${release}" -e
"/^<kde-base\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
fi
done
popd > /dev/null
@@ -166,7 +166,7 @@ done
for set in *plasma-${PLASMA_RELEASE}; do
newfile=${set/%-${PLASMA_RELEASE}}
echo -e "${HEADER}" > "${newfile}"
- sed -r
"/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|5\..\.50)/:5/"
"${set}" >> "${newfile}"
+ sed -r
"/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|5\..\.50)//"
"${set}" >> "${newfile}"
done
popd > /dev/null
