diff options
107 files changed, 2837 insertions, 3390 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 diff --git a/Documentation/package.keywords/.kde-4.6.9999/kdenetwork-4.6 b/Documentation/package.keywords/.kde-4.6.9999/kdenetwork-4.6 index 102bb0adddf..62a38b8e427 100644 --- a/Documentation/package.keywords/.kde-4.6.9999/kdenetwork-4.6 +++ b/Documentation/package.keywords/.kde-4.6.9999/kdenetwork-4.6 @@ -3,6 +3,5 @@ ~kde-base/kdnssd-4.6.49.9999 ** ~kde-base/kget-4.6.49.9999 ** ~kde-base/kopete-4.6.49.9999 ** -~kde-base/kppp-4.6.49.9999 ** ~kde-base/krdc-4.6.49.9999 ** ~kde-base/krfb-4.6.49.9999 ** diff --git a/Documentation/package.keywords/.kde-4.6.9999/kdeutils-4.6 b/Documentation/package.keywords/.kde-4.6.9999/kdeutils-4.6 index a19ac6d81ed..5cc5b57c041 100644 --- a/Documentation/package.keywords/.kde-4.6.9999/kdeutils-4.6 +++ b/Documentation/package.keywords/.kde-4.6.9999/kdeutils-4.6 @@ -4,7 +4,6 @@ ~kde-base/kcharselect-4.6.49.9999 ** ~kde-base/kdeutils-meta-4.6.49.9999 ** ~kde-base/kdf-4.6.49.9999 ** -~kde-base/kfloppy-4.6.49.9999 ** ~kde-base/kgpg-4.6.49.9999 ** ~kde-base/kremotecontrol-4.6.49.9999 ** ~kde-base/ktimer-4.6.49.9999 ** diff --git a/Documentation/package.keywords/.kde-live/kdedeps-live b/Documentation/package.keywords/.kde-live/kdedeps-live index d36088d815d..c22e75c8fb4 100644 --- a/Documentation/package.keywords/.kde-live/kdedeps-live +++ b/Documentation/package.keywords/.kde-live/kdedeps-live @@ -11,6 +11,3 @@ ~sys-auth/polkit-qt-9999 ** ~sys-auth/polkit-kde-agent-9999 ** ~kde-misc/polkit-kde-kcmodules-9999 ** - -# For kde-base/kopete ->=net-libs/libmsn-4.0 diff --git a/Documentation/package.keywords/kde-4.6.9999.keywords b/Documentation/package.keywords/kde-4.6.9999.keywords index 1e98b5ab30d..845401013ec 100644 --- a/Documentation/package.keywords/kde-4.6.9999.keywords +++ b/Documentation/package.keywords/kde-4.6.9999.keywords @@ -225,7 +225,6 @@ ~kde-base/kdnssd-4.6.49.9999 ** ~kde-base/kget-4.6.49.9999 ** ~kde-base/kopete-4.6.49.9999 ** -~kde-base/kppp-4.6.49.9999 ** ~kde-base/krdc-4.6.49.9999 ** ~kde-base/krfb-4.6.49.9999 ** ~kde-base/kfloppy-4.6.49.9999 ** @@ -309,7 +308,6 @@ ~kde-base/kcharselect-4.6.49.9999 ** ~kde-base/kdeutils-meta-4.6.49.9999 ** ~kde-base/kdf-4.6.49.9999 ** -~kde-base/kfloppy-4.6.49.9999 ** ~kde-base/kgpg-4.6.49.9999 ** ~kde-base/kremotecontrol-4.6.49.9999 ** ~kde-base/ktimer-4.6.49.9999 ** diff --git a/Documentation/package.keywords/kde-4.6.keywords b/Documentation/package.keywords/kde-4.6.keywords index ba0128b3b82..54d5379a74e 100644 --- a/Documentation/package.keywords/kde-4.6.keywords +++ b/Documentation/package.keywords/kde-4.6.keywords @@ -11,225 +11,224 @@ ~sci-libs/clapack-3.2.1 ~dev-libs/libf2c-20090407 -kde-base/kdeplasma-addons:4.6 -kde-base/kde-l10n:4.6 -kde-base/jovie:4.6 -kde-base/kaccessible:4.6 -kde-base/kdeaccessibility-colorschemes:4.6 -kde-base/kdeaccessibility-iconthemes:4.6 -kde-base/kdeaccessibility-meta:4.6 -kde-base/kmag:4.6 -kde-base/kmousetool:4.6 -kde-base/kmouth:4.6 -kde-base/kcron:4.6 -kde-base/kdeadmin-meta:4.6 -kde-base/ksystemlog:4.6 -kde-base/kuser:4.6 -kde-base/system-config-printer-kde:4.6 -kde-base/kdeartwork-colorschemes:4.6 -kde-base/kdeartwork-desktopthemes:4.6 -kde-base/kdeartwork-emoticons:4.6 |