From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B8319138CEF for ; Wed, 12 Feb 2014 14:19:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52BFCE0D7B; Wed, 12 Feb 2014 14:19:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0869E0D7B for ; Wed, 12 Feb 2014 14:19:02 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB9F133EFDC for ; Wed, 12 Feb 2014 14:19:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 347C118873 for ; Wed, 12 Feb 2014 14:18:59 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1392214714.ce594b4897d2f6b89d6faa210686d884a78867b2.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/bump_new_revision.sh X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: ce594b4897d2f6b89d6faa210686d884a78867b2 X-VCS-Branch: master Date: Wed, 12 Feb 2014 14:18:59 +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-Archives-Salt: 027ef465-fcd4-43b0-9808-6ffe300207f9 X-Archives-Hash: 9e8ac3b15187929190a6f58220f03fb4 commit: ce594b4897d2f6b89d6faa210686d884a78867b2 Author: Michael Palimaka gentoo org> AuthorDate: Wed Feb 12 14:18:34 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Feb 12 14:18:34 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ce594b48 [Documentation/maintainers] Add to support non-kde-base categories. --- Documentation/maintainers/bump_new_revision.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh index 9158622..bdbf257 100755 --- a/Documentation/maintainers/bump_new_revision.sh +++ b/Documentation/maintainers/bump_new_revision.sh @@ -19,7 +19,7 @@ get_packages_from_slot() { # version.ebuild sed -e '/^[@#]/d' \ -e '/^$/d' \ - -e '\@kde-base/@!d' \ + -e "\@${CATEGORY}/@!d" \ -e 's/^>=//g' \ -e 's/^~//g' \ -e 's/^=:;s:-(9999|4\..\.50)$:-${PREVVER}.50:};/@kde/s:${SLOT}:${BUMP_VERSION}:" \ + -e "\@${CATEGORY}/@{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} @@ -54,9 +54,9 @@ add_new_sloted_version() { # write ebuild directories in which i will work to file. find_packagedirs_for_removal() { - find ${PORTDIR_BUMPING}/kde-base/ -name \*${VERSION}\*.ebuild -print |while read FILE; do - echo ${FILE} |sed -e "s:${PORTDIR_BUMPING}/kde-base/::" \ - |awk -F'/' '{print "kde-base/"$1}' \ + find ${PORTDIR_BUMPING}/${CATEGORY}/ -name \*${VERSION}\*.ebuild -print |while read FILE; do + echo ${FILE} |sed -e "s:${PORTDIR_BUMPING}/${CATEGORY}/::" \ + |awk -F'/' '{print "'${CATEGORY}'/"$1}' \ >> ${TMPFILE} done } @@ -203,7 +203,8 @@ BUMP_VERSION= SET= DIR= OUTPUT_DIR= -while getopts a:s:v:b:l:p:o: arg ; do +CATEGORY="kde-base" +while getopts a:s:v:b:l:p:o:c: arg ; do case ${arg} in a) OPERATION=${OPTARG} ;; s) SLOT=${OPTARG} ;; @@ -212,6 +213,7 @@ while getopts a:s:v:b:l:p:o: arg ; do l) SET="${OPTARG}" ;; p) DIR="${OPTARG}" ;; o) OUTPUT_DIR="${OPTARG}" ;; + c) CATEGORY="${OPTARG}" ;; *) help ;; ?) help ;; esac @@ -347,7 +349,7 @@ case ${OPERATION} in # then start going per each dir # cvs up, move the ebuild, its patches if needed, run echangelog, run keywords check, manifest #_cvsupdate "${MAINTREE}" - find ./kde-base/ -mindepth 1 -maxdepth 1 -type d |sed -e "s:./::" | sort |while read dir; do + find ./${CATEGORY}/ -mindepth 1 -maxdepth 1 -type d |sed -e "s:./::" | sort |while read dir; do # we also have to check if directory contains our version if not, we dont copy it pushd "${OVERLAY}/${dir}" &> /dev/null if [[ `find ./ -name \*.ebuild|grep ${VERSION} |wc -l` -gt 0 ]]; then