From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R2rOp-0008T9-Lr for garchives@archives.gentoo.org; Sun, 11 Sep 2011 21:17:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1987A21C0FD; Sun, 11 Sep 2011 21:17:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D89CE21C0FD for ; Sun, 11 Sep 2011 21:17:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FFD41B4004 for ; Sun, 11 Sep 2011 21:17:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4609480042 for ; Sun, 11 Sep 2011 21:17:02 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <6a1a8397003edc599c3916d284676a81a02af0e0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6a1a8397003edc599c3916d284676a81a02af0e0 Date: Sun, 11 Sep 2011 21:17:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1ebc04cb9ca3126866b5e7845989e90a commit: 6a1a8397003edc599c3916d284676a81a02af0e0 Author: Zac Medico gentoo org> AuthorDate: Sun Sep 11 21:16:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Sep 11 21:16:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6a1a8397 ebuild.sh: add dummy funcs for "depend" phase --- bin/ebuild.sh | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a5cc5ef..936405d 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -833,6 +833,15 @@ trap 'exit 1' SIGTERM if [[ $EBUILD_PHASE !=3D depend ]] ; then source "${PORTAGE_BIN_PATH}/phase-functions.sh" source "${PORTAGE_BIN_PATH}/phase-helpers.sh" +else + # These dummy functions are for things that are likely to be called + # in global scope, even though they are completely useless during + # the "depend" phase. + for x in diropts docompress exeopts insopts \ + keepdir libopts use_with use_enable ; do + eval "${x}() { : ; }" + done + unset x fi =20 if ! has "$EBUILD_PHASE" clean cleanrm depend && \