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 1R3DML-0007iW-NP for garchives@archives.gentoo.org; Mon, 12 Sep 2011 20:44:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DDFA21C182; Mon, 12 Sep 2011 20:43:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 013AA21C182 for ; Mon, 12 Sep 2011 20:43:52 +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 7EF211B400C for ; Mon, 12 Sep 2011 20:43:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A878580042 for ; Mon, 12 Sep 2011 20:43:51 +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: <9116d2b8a7b553e4d445f0d9329a28aa54dfd1ef.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: 9116d2b8a7b553e4d445f0d9329a28aa54dfd1ef Date: Mon, 12 Sep 2011 20:43:51 +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: 2bca4f3c47546473a05842eeb715ae03 commit: 9116d2b8a7b553e4d445f0d9329a28aa54dfd1ef Author: Zac Medico gentoo org> AuthorDate: Mon Sep 12 20:37:32 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 12 20:37:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9116d2b8 ebuild.sh: make use* return false for "depend" This ensures that `use multislot` is false for the "depend" phase. --- bin/ebuild.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 641d827..7b77c10 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -31,9 +31,14 @@ else keepdir KV_major KV_micro KV_minor KV_to_int \ libopts register_die_hook register_success_hook \ remove_path_entry set_unless_changed strip_duplicate_slashes \ - unset_unless_changed use useq usev use_with use_enable ; do + unset_unless_changed use_with use_enable ; do eval "${x}() { : ; }" done + # These dummy functions return false, in order to ensure that + # `use multislot` is false for the "depend" phase. + for x in use useq usev ; do + eval "${x}() { return 1; }" + done # These functions die because calls to them during the "depend" phase # are considered to be severe QA violations. for x in best_version has_version portageq ; do