[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, pym/portage/

["Zac Medico" <zmedico@gentoo.org>]

commit:     a9cf08d97beffe90599d29c0d8e39235bc134047
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 22:48:03 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 05:49:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9cf08d9

eapi: use eapi_allows_package_provided via  _get_eapi_attrs

 pym/portage/eapi.py                  | 2 ++
 pym/portage/package/ebuild/config.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py
index d91edcce4..cdbbf07fb 100644
--- a/pym/portage/eapi.py
+++ b/pym/portage/eapi.py
@@ -124,6 +124,7 @@ def eapi_path_variables_end_with_trailing_slash(eapi):
 			"5", "5-progress", "6")
 
 _eapi_attrs = collections.namedtuple('_eapi_attrs',
+	'allows_package_provided '
 	'bdepend dots_in_PN dots_in_use_flags exports_EBUILD_PHASE_FUNC '
 	'exports_PORTDIR exports_ECLASSDIR '
 	'feature_flag_test feature_flag_targetroot '
@@ -152,6 +153,7 @@ def _get_eapi_attrs(eapi):
 		eapi = None
 
 	eapi_attrs = _eapi_attrs(
+		allows_package_provided=(eapi is None or eapi_allows_package_provided(eapi)),
 		bdepend = (eapi is not None and eapi_has_bdepend(eapi)),
 		dots_in_PN = (eapi is None or eapi_allows_dots_in_PN(eapi)),
 		dots_in_use_flags = (eapi is None or eapi_allows_dots_in_use_flags(eapi)),

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index ef9ec3e88..a32892e94 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -39,8 +39,7 @@ from portage.dbapi import dbapi
 from portage.dbapi.porttree import portdbapi
 from portage.dep import Atom, isvalidatom, match_from_list, use_reduce, _repo_separator, _slot_separator
 from portage.eapi import (eapi_exports_AA, eapi_exports_merge_type,
-	eapi_supports_prefix, eapi_exports_replace_vars, _get_eapi_attrs,
-	eapi_allows_package_provided)
+	eapi_supports_prefix, eapi_exports_replace_vars, _get_eapi_attrs)
 from portage.env.loaders import KeyValuePairFileLoader
 from portage.exception import InvalidDependString, IsADirectory, \
 		PortageException
@@ -805,7 +804,7 @@ class config(object):
 			for x in profiles_complex:
 				provpath = os.path.join(x.location, "package.provided")
 				if os.path.exists(provpath):
-					if x.eapi is None or eapi_allows_package_provided(x.eapi):
+					if _get_eapi_attrs(x.eapi).allows_package_provided:
 						pkgprovidedlines.append(grabfile(provpath,
 							recursive=x.portage1_directories))
 					else: