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 170EF1381F3 for ; Thu, 22 Aug 2013 17:32:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88683E0BF0; Thu, 22 Aug 2013 17:32:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A52AE0BF0 for ; Thu, 22 Aug 2013 17:32:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A7AD33EC03 for ; Thu, 22 Aug 2013 17:32:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B5ACAE468F for ; Thu, 22 Aug 2013 17:32:20 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1377192671.77570d9d3df177dc2cb55a83541965a32dd79c67.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, bin/, doc/package/ebuild/eapi/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/keepdir bin/ebuild.sh bin/phase-helpers.sh bin/save-ebuild-env.sh doc/package/ebuild/eapi/4-python.docbook doc/package/ebuild/eapi/5-progress.docbook X-VCS-Directories: bin/ebuild-helpers/ bin/ doc/package/ebuild/eapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 77570d9d3df177dc2cb55a83541965a32dd79c67 X-VCS-Branch: master Date: Thu, 22 Aug 2013 17:32:20 +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: a785df3f-d616-4f2c-8670-6ca66f61ec91 X-Archives-Hash: 4ee91a290355e2a882832af2549769b7 commit: 77570d9d3df177dc2cb55a83541965a32dd79c67 Author: Ulrich Müller gentoo org> AuthorDate: Thu Aug 22 17:22:27 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 22 17:31:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77570d9d Make keepdir an external ebuild helper program. This is required by PMS section 11.3.3.8 "Installation commands". Fixes bug #481762. --- bin/ebuild-helpers/keepdir | 20 ++++++++++++++++++++ bin/ebuild.sh | 2 +- bin/phase-helpers.sh | 24 ------------------------ bin/save-ebuild-env.sh | 2 +- doc/package/ebuild/eapi/4-python.docbook | 1 - doc/package/ebuild/eapi/5-progress.docbook | 1 - 6 files changed, 22 insertions(+), 28 deletions(-) diff --git a/bin/ebuild-helpers/keepdir b/bin/ebuild-helpers/keepdir new file mode 100755 index 0000000..bec2feb --- /dev/null +++ b/bin/ebuild-helpers/keepdir @@ -0,0 +1,20 @@ +#!/bin/bash +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + +if ! ___eapi_has_prefix_variables; then + ED=${D} +fi + +dodir "$@" +ret=$? + +for x in "$@"; do + >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT%/*}" || \ + { echo "!!! ${0##*/}: cannot write .keep in ${ED}${x}" 1>&2; ret=1; } +done + +[[ ${ret} -ne 0 ]] && __helpers_die "${0##*/} failed" +exit ${ret} diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 18703bb..35f4b91 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -21,7 +21,7 @@ else # in global scope, even though they are completely useless during # the "depend" phase. for x in diropts docompress exeopts get_KV insopts \ - keepdir KV_major KV_micro KV_minor KV_to_int \ + KV_major KV_micro KV_minor KV_to_int \ libopts register_die_hook register_success_hook \ __strip_duplicate_slashes \ use_with use_enable ; do diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index ba12f1f..91762bf 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -141,30 +141,6 @@ docompress() { fi } -# adds ".keep" files so that dirs aren't auto-cleaned -keepdir() { - dodir "$@" - local x - if ! ___eapi_has_prefix_variables; then - local ED=${D} - fi - if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then - shift - find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT%/*}\n" \ - | tr "\n" "\0" | \ - while read -r -d $'\0' ; do - >> "$REPLY" || \ - die "Failed to recursively create .keep files" - done - else - for x in "$@"; do - >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT%/*}" || \ - die "Failed to create .keep in ${ED}${x}" - done - fi -} - - useq() { has $EBUILD_PHASE prerm postrm || eqawarn \ "QA Notice: The 'useq' function is deprecated (replaced by 'use')" diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index f695245..2a3d5ea 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -56,7 +56,7 @@ __save_ebuild_env() { addread addwrite adddeny addpredict __sb_append_var \ use usev useq has_version portageq \ best_version use_with use_enable register_die_hook \ - keepdir unpack __strip_duplicate_slashes econf einstall \ + unpack __strip_duplicate_slashes econf einstall \ __dyn_setup __dyn_unpack __dyn_clean \ into insinto exeinto docinto \ insopts diropts exeopts libopts docompress \ diff --git a/doc/package/ebuild/eapi/4-python.docbook b/doc/package/ebuild/eapi/4-python.docbook index 9e8a9da..a61ac05 100644 --- a/doc/package/ebuild/eapi/4-python.docbook +++ b/doc/package/ebuild/eapi/4-python.docbook @@ -19,7 +19,6 @@ docompress exeopts insopts - keepdir libopts use use_enable diff --git a/doc/package/ebuild/eapi/5-progress.docbook b/doc/package/ebuild/eapi/5-progress.docbook index 93ce6dc..5fd623b 100644 --- a/doc/package/ebuild/eapi/5-progress.docbook +++ b/doc/package/ebuild/eapi/5-progress.docbook @@ -61,7 +61,6 @@ docompress exeopts insopts - keepdir libopts use use_enable