diff options
Diffstat (limited to 'Documentation/maintainers')
| -rwxr-xr-x | Documentation/maintainers/bump_new_revision.sh | 13 | ||||
| -rwxr-xr-x | Documentation/maintainers/regenerate-files | 6 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh index 931668566d8..265af22c63c 100755 --- a/Documentation/maintainers/bump_new_revision.sh +++ b/Documentation/maintainers/bump_new_revision.sh @@ -17,9 +17,8 @@ get_packages_from_slot() { echo ${SLOTFILE} # debug # remove empty lines, another slots and comments, replace slot by # version.ebuild - cat ${SLOTFILE} | grep -v ^@ | grep -v ^$ | grep -v ^#| grep 'kde-base/' \ - | sed -e "s/:${SLOT}//g" \ - >> ${TMPFILE} + sed -e '/^[@#]/d;/^$/d;\@kde-base/@!d;s/^>=//g;s/^~//g;s/-4\..\.50$//g;s/-9999$//g' \ + ${SLOTFILE} >> ${TMPFILE} done } @@ -27,16 +26,18 @@ get_packages_from_slot() { add_new_sloted_version() { local SLOTFILE local NEWSLOTFILE + local PREVVER find ${PORTDIR_BUMPING}/sets/ -maxdepth 1 -type f -name \*-${SLOT} -print \ | while read SLOTFILE; do NEWSLOTFILE=${SLOTFILE/${SLOT}/${BUMP_VERSION}} + PREVVER=4.$((${BUMP_VERSION#4.}-1)) echo "creating ${NEWSLOTFILE}" # copy actualy that file cp ${SLOTFILE} ${NEWSLOTFILE} # fix versioning - sed -i \ - -e "s:${SLOT}:${BUMP_VERSION}:" \ + sed -r -i \ + -e "\@kde-base/@{s:~:>=:;s:-(9999|4\..\.50)$:-${PREVVER}.50:};/@kde/s:${SLOT}:${BUMP_VERSION}:" \ ${NEWSLOTFILE} || die "unable to update slotfile versioning" # add to git git add ${NEWSLOTFILE} @@ -262,8 +263,6 @@ case ${OPERATION} in # actualy create our desired ebuild files # echo "Creating: ${NEW}" # verbosity cp "${OLD}" "${NEW}" - # if the ebuild sets SLOT, then update it properly - sed -i "/^SLOT=/s/^.*$/SLOT=\"${SLOT}\"/" "${NEW}" if [ `grep ".patch" ${NEW} |wc -l` -gt 0 ]; then INFO_LIST="${INFO_LIST} You should pay more attention to ebuild ${NEW}, because it has some patches.\n" fi diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files index 4a5e7cdb905..a7684575233 100755 --- a/Documentation/maintainers/regenerate-files +++ b/Documentation/maintainers/regenerate-files @@ -28,7 +28,7 @@ for release in 4.6 4.7; do echo -e "${HEADER}" > "kde-${release}.9999.keywords" for file in ".kde-${release}"/*; do newfile=".kde-${release}.9999"/$(basename "${file}") - sed "/^kde-base\/.*:${release}$/{s/:${release}/-${release}.49.9999/;s/^/~/};/^~.*[.-]9999$/s/$/ **/" "${file}" > "${newfile}" + sed "/^>=kde-base\/.*-4\..\.50$/{s/-4\..\.50/-${release}.49.9999/;s/^>=/~/};/^~.*[.-]9999$/s/$/ **/" "${file}" > "${newfile}" done cat ".kde-${release}.9999"/* >> "kde-${release}.9999.keywords" fi @@ -40,7 +40,7 @@ if [[ -d .kde-live.base ]]; then echo -e "${HEADER}" > kde-live.keywords for file in .kde-live.base/*; do newfile=.kde-live/$(basename "${file}") - sed '/^kde-base\/.*:live$/{s/:live/-9999/;s/^/~/};/^~.*[.-]9999$/s/$/ **/' "${file}" > "${newfile}" + sed '/^~.*[.-]9999$/s/$/ **/' "${file}" > "${newfile}" done cat .kde-live/* >> kde-live.keywords fi @@ -83,6 +83,6 @@ pushd ../../sets/ > /dev/null for set in *-${RELEASE}; do newfile=${set/%-${RELEASE}} echo -e "${HEADER}" > "${newfile}" - sed "s/[:-]${RELEASE}//g" "${set}" >> "${newfile}" + sed -r "/@/s/-${RELEASE}//g;s/~//;s/>=//;\@kde-base/@s/-(9999|4\..\.50)/:4/" "${set}" >> "${newfile}" done popd > /dev/null |