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 B8A701389E2 for ; Thu, 4 Dec 2014 14:01:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 260C2E08BD; Thu, 4 Dec 2014 14:01:53 +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 144B9E08B0 for ; Thu, 4 Dec 2014 14:01:52 +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 46D17340669 for ; Thu, 4 Dec 2014 14:01:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5810AB8FD for ; Thu, 4 Dec 2014 14:01:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1417701695.b830bbc3b10bf239611663d0572b2cd4ba3d656a.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/eapi.sh X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b830bbc3b10bf239611663d0572b2cd4ba3d656a X-VCS-Branch: master Date: Thu, 4 Dec 2014 14:01:47 +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: a278f591-1bdf-490b-a62c-972d0a9a1e56 X-Archives-Hash: 6cd5c6f7ceaeccc0ca04a9397b44019a commit: b830bbc3b10bf239611663d0572b2cd4ba3d656a Author: Michał Górny gentoo org> AuthorDate: Mon Sep 1 20:16:46 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 4 14:01:35 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b830bbc3 Disallow helpers in global scope in EAPI 6 Disallow calling most of the ebuild helpers in global scope since they are meaningless in that context. Most of them are also prohibited by PMS for all EAPIs, so EAPI 6 sounds like a good moment to finally enforce that restriction. --- bin/eapi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/eapi.sh b/bin/eapi.sh index e0ade02..5ab92f4 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -159,7 +159,7 @@ ___eapi_helpers_can_die() { } ___eapi_disallows_helpers_in_global_scope() { - [[ ${1-${EAPI}} =~ ^(4-python|5-progress)$ ]] + [[ ! ${1-${EAPI}} =~ ^(0|1|2|3|4|4-slot-abi|5|5-hdepend)$ ]] } ___eapi_unpack_is_case_sensitive() {