From: "Wolfgang E. Sanyer" <wolfgangesan...@gmail.com> Reviewed-by: Matt Turner <matts...@gentoo.org> Signed-off-by: Wolfgang E. Sanyer <wolfgangesan...@gmail.com> --- lib/portage/eapi.py | 162 +++++++++++++++++++++++++++++++++----------- 1 file changed, 121 insertions(+), 41 deletions(-)
diff --git a/lib/portage/eapi.py b/lib/portage/eapi.py index 18069b04b..56e64620a 100644 --- a/lib/portage/eapi.py +++ b/lib/portage/eapi.py @@ -9,26 +9,44 @@ from portage import eapi_is_supported def eapi_has_iuse_defaults(eapi): + if eapi is None: + return True + return eapi != "0" def eapi_has_iuse_effective(eapi): + if eapi is None: + return False + return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi") def eapi_has_slot_deps(eapi): + if eapi is None: + return True + return eapi != "0" def eapi_has_slot_operator(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3", "4", "4-python") def eapi_has_src_uri_arrows(eapi): + if eapi is None: + return True + return eapi not in ("0", "1") def eapi_has_selective_src_uri_restriction(eapi): + if eapi is None: + return True + return eapi not in ( "0", "1", @@ -45,10 +63,16 @@ def eapi_has_selective_src_uri_restriction(eapi): def eapi_has_use_deps(eapi): + if eapi is None: + return True + return eapi not in ("0", "1") def eapi_has_strong_blocks(eapi): + if eapi is None: + return True + return eapi not in ("0", "1") @@ -57,30 +81,51 @@ def eapi_has_src_prepare_and_src_configure(eapi): def eapi_supports_prefix(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2") def eapi_exports_AA(eapi): + if eapi is None: + return False + return eapi in ("0", "1", "2", "3") def eapi_exports_KV(eapi): + if eapi is None: + return False + return eapi in ("0", "1", "2", "3") def eapi_exports_merge_type(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3") def eapi_exports_replace_vars(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3") def eapi_exports_EBUILD_PHASE_FUNC(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi") def eapi_exports_PORTDIR(eapi): + if eapi is None: + return True + return eapi in ( "0", "1", @@ -96,6 +141,9 @@ def eapi_exports_PORTDIR(eapi): def eapi_exports_ECLASSDIR(eapi): + if eapi is None: + return False + return eapi in ( "0", "1", @@ -127,18 +175,30 @@ def eapi_has_dosed_dohard(eapi): def eapi_has_required_use(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3") def eapi_has_required_use_at_most_one_of(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi") def eapi_has_use_dep_defaults(eapi): + if eapi is None: + return True + return eapi not in ("0", "1", "2", "3") def eapi_requires_posixish_locale(eapi): + if eapi is None: + return False + return eapi not in ( "0", "1", @@ -153,14 +213,23 @@ def eapi_requires_posixish_locale(eapi): def eapi_has_repo_deps(eapi): + if eapi is None: + return True + return eapi in ("4-python", "5-progress") def eapi_allows_dots_in_PN(eapi): + if eapi is None: + return True + return eapi in ("4-python", "5-progress") def eapi_allows_dots_in_use_flags(eapi): + if eapi is None: + return True + return eapi in ("4-python", "5-progress") @@ -181,6 +250,9 @@ def eapi_has_automatic_unpack_dependencies(eapi): def eapi_allows_package_provided(eapi): + if eapi is None: + return True + return eapi in ( "0", "1", @@ -196,6 +268,9 @@ def eapi_allows_package_provided(eapi): def eapi_has_bdepend(eapi): + if eapi is None: + return False + return eapi not in ( "0", "1", @@ -211,6 +286,9 @@ def eapi_has_bdepend(eapi): def eapi_has_idepend(eapi): + if eapi is None: + return False + return eapi not in ( "0", "1", @@ -227,6 +305,9 @@ def eapi_has_idepend(eapi): def eapi_empty_groups_always_true(eapi): + if eapi is None: + return False + return eapi in ( "0", "1", @@ -242,6 +323,9 @@ def eapi_empty_groups_always_true(eapi): def eapi_path_variables_end_with_trailing_slash(eapi): + if eapi is None: + return False + return eapi in ( "0", "1", @@ -257,6 +341,9 @@ def eapi_path_variables_end_with_trailing_slash(eapi): def eapi_has_broot(eapi): + if eapi is None: + return True + return eapi not in ( "0", "1", @@ -272,6 +359,9 @@ def eapi_has_broot(eapi): def eapi_has_sysroot(eapi): + if eapi is None: + return True + return eapi not in ( "0", "1", @@ -387,49 +477,39 @@ def _get_eapi_attrs(eapi): eapi = None eapi_attrs = _eapi_attrs( - allows_package_provided=( - eapi is None or eapi_allows_package_provided.func(eapi) - ), - bdepend=(eapi is not None and eapi_has_bdepend.func(eapi)), - broot=(eapi is None or eapi_has_broot.func(eapi)), - dots_in_PN=(eapi is None or eapi_allows_dots_in_PN.func(eapi)), - dots_in_use_flags=(eapi is None or eapi_allows_dots_in_use_flags.func(eapi)), - empty_groups_always_true=( - eapi is not None and eapi_empty_groups_always_true.func(eapi) - ), - exports_AA=(eapi is not None and eapi_exports_AA.func(eapi)), - exports_EBUILD_PHASE_FUNC=( - eapi is None or eapi_exports_EBUILD_PHASE_FUNC.func(eapi) - ), - exports_ECLASSDIR=(eapi is not None and eapi_exports_ECLASSDIR.func(eapi)), - exports_KV=(eapi is not None and eapi_exports_KV.func(eapi)), - exports_merge_type=(eapi is None or eapi_exports_merge_type.func(eapi)), - exports_PORTDIR=(eapi is None or eapi_exports_PORTDIR.func(eapi)), - exports_replace_vars=(eapi is None or eapi_exports_replace_vars.func(eapi)), + allows_package_provided=eapi_allows_package_provided.func(eapi), + bdepend=eapi_has_bdepend.func(eapi), + broot=eapi_has_broot.func(eapi), + dots_in_PN=eapi_allows_dots_in_PN.func(eapi), + dots_in_use_flags=eapi_allows_dots_in_use_flags.func(eapi), + empty_groups_always_true=eapi_empty_groups_always_true.func(eapi), + exports_AA=eapi_exports_AA.func(eapi), + exports_EBUILD_PHASE_FUNC=eapi_exports_EBUILD_PHASE_FUNC.func(eapi), + exports_ECLASSDIR=eapi_exports_ECLASSDIR.func(eapi), + exports_KV=eapi_exports_KV.func(eapi), + exports_merge_type=eapi_exports_merge_type.func(eapi), + exports_PORTDIR=eapi_exports_PORTDIR.func(eapi), + exports_replace_vars=eapi_exports_replace_vars.func(eapi), feature_flag_test=False, - idepend=(eapi is not None and eapi_has_idepend.func(eapi)), - iuse_defaults=(eapi is None or eapi_has_iuse_defaults.func(eapi)), - iuse_effective=(eapi is not None and eapi_has_iuse_effective.func(eapi)), - path_variables_end_with_trailing_slash=( - eapi is not None and eapi_path_variables_end_with_trailing_slash.func(eapi) - ), - posixish_locale=(eapi is not None and eapi_requires_posixish_locale.func(eapi)), - prefix=(eapi is None or eapi_supports_prefix.func(eapi)), - repo_deps=(eapi is None or eapi_has_repo_deps.func(eapi)), - required_use=(eapi is None or eapi_has_required_use.func(eapi)), - required_use_at_most_one_of=( - eapi is None or eapi_has_required_use_at_most_one_of.func(eapi) - ), - selective_src_uri_restriction=( - eapi is None or eapi_has_selective_src_uri_restriction.func(eapi) + idepend=eapi_has_idepend.func(eapi), + iuse_defaults=eapi_has_iuse_defaults.func(eapi), + iuse_effective=eapi_has_iuse_effective.func(eapi), + path_variables_end_with_trailing_slash=eapi_path_variables_end_with_trailing_slash.func( + eapi ), - slot_deps=(eapi is None or eapi_has_slot_deps.func(eapi)), - slot_operator=(eapi is None or eapi_has_slot_operator.func(eapi)), - src_uri_arrows=(eapi is None or eapi_has_src_uri_arrows.func(eapi)), - strong_blocks=(eapi is None or eapi_has_strong_blocks.func(eapi)), - sysroot=(eapi is None or eapi_has_sysroot.func(eapi)), - use_deps=(eapi is None or eapi_has_use_deps.func(eapi)), - use_dep_defaults=(eapi is None or eapi_has_use_dep_defaults.func(eapi)), + posixish_locale=eapi_requires_posixish_locale.func(eapi), + prefix=eapi_supports_prefix.func(eapi), + repo_deps=eapi_has_repo_deps.func(eapi), + required_use=eapi_has_required_use.func(eapi), + required_use_at_most_one_of=eapi_has_required_use_at_most_one_of.func(eapi), + selective_src_uri_restriction=eapi_has_selective_src_uri_restriction.func(eapi), + slot_deps=eapi_has_slot_deps.func(eapi), + slot_operator=eapi_has_slot_operator.func(eapi), + src_uri_arrows=eapi_has_src_uri_arrows.func(eapi), + strong_blocks=eapi_has_strong_blocks.func(eapi), + sysroot=eapi_has_sysroot.func(eapi), + use_deps=eapi_has_use_deps.func(eapi), + use_dep_defaults=eapi_has_use_dep_defaults.func(eapi), ) _eapi_attrs_cache[orig_eapi] = eapi_attrs -- 2.34.1