diff options
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index de54e22eb..b04244128 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -34,9 +34,7 @@ else # These dummy functions return false in non-strict EAPIs, in order to ensure that # `use multislot` is false for the "depend" phase. funcs="use useq usev" - if ___eapi_has_usex; then - funcs+=" usex" - fi + ___eapi_has_usex && funcs+=" usex" for x in ${funcs} ; do eval "${x}() { if ___eapi_disallows_helpers_in_global_scope; then @@ -48,7 +46,13 @@ else 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 + funcs="best_version has_version portageq" + ___eapi_has_master_repositories && funcs+=" master_repositories" + ___eapi_has_repository_path && funcs+=" repository_path" + ___eapi_has_available_eclasses && funcs+=" available_eclasses" + ___eapi_has_eclass_path && funcs+=" eclass_path" + ___eapi_has_license_path && funcs+=" license_path" + for x in ${funcs} ; do eval "${x}() { die \"\${FUNCNAME}() calls are not allowed in global scope\"; }" done unset funcs x |