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 5F06A138A3F for ; Sun, 5 Apr 2015 19:04:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D50A6E0979; Sun, 5 Apr 2015 19:04:42 +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 82E05E0979 for ; Sun, 5 Apr 2015 19:04:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BD6A340940 for ; Sun, 5 Apr 2015 19:04:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 553CC1547D for ; Sun, 5 Apr 2015 19:04:36 +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: <1428260650.e93b26313e0a61fb077f510cfcd1f03ef56e5e0f.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/bump-from-set.sh X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e93b26313e0a61fb077f510cfcd1f03ef56e5e0f X-VCS-Branch: master Date: Sun, 5 Apr 2015 19:04:36 +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: a3e65d42-fd9b-4885-b310-023d47cc29fa X-Archives-Hash: 04118b89526994d69a1424be59e61435 commit: e93b26313e0a61fb077f510cfcd1f03ef56e5e0f Author: Michael Palimaka gentoo org> AuthorDate: Sun Apr 5 19:04:10 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Apr 5 19:04:10 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e93b2631 [Documentation] Use keywords from main tree. Documentation/maintainers/bump-from-set.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh index 65c2e5b..a9b266d 100755 --- a/Documentation/maintainers/bump-from-set.sh +++ b/Documentation/maintainers/bump-from-set.sh @@ -2,7 +2,6 @@ # requires app-portage/portage-utils and app-portage/gentoolkit-dev -: ${KEYWORDS:="~amd64"} : ${PORTDIR:="$(pwd)"} get_package_list_from_set() { @@ -13,6 +12,13 @@ get_package_list_from_set() { done } +get_main_tree_keyword() { + local portdir="$(portageq portdir)" + local cp="${1}" + + echo $(sed -ne 's/^KEYWORDS="\(.*\)"/\1/p' "$(ls ${portdir}/${cp}/*.ebuild | sort | tail -n 1)") +} + help() { echo Simple set-based version bumper. echo @@ -46,8 +52,8 @@ fi packages=$(get_package_list_from_set ${SETNAME}) -for package in ${packages} ; do - pushd "${PORTDIR}/${package}" > /dev/null +for cp in ${packages} ; do + pushd "${PORTDIR}/${cp}" > /dev/null pn=$(basename $(pwd)) source=${pn}-${SOURCEVERSION}.ebuild @@ -57,7 +63,7 @@ for package in ${packages} ; do ekeyword ^all ${destination} > /dev/null if [[ ${destination} != *9999* ]] ; then - ekeyword ${KEYWORDS} ${destination} > /dev/null + ekeyword $(get_main_tree_keyword ${cp}) ${destination} > /dev/null fi repoman manifest