From 9b1992c050bf9fa698f227e635af5c341e85c9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Dec 2019 11:10:25 +0100 Subject: Clean up remnants of eapi5-hdepend, HDEPEND and targetroot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Zac Medico Closes: https://github.com/gentoo/portage/pull/490 Signed-off-by: Michał Górny --- lib/_emerge/depgraph.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'lib/_emerge/depgraph.py') diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index dcef06f93..ed7aeccad 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -3356,19 +3356,15 @@ class depgraph(object): # dependencies, so it's safe to discard them early. edepend["DEPEND"] = "" edepend["BDEPEND"] = "" - edepend["HDEPEND"] = "" ignore_build_time_deps = True ignore_depend_deps = ignore_build_time_deps ignore_bdepend_deps = ignore_build_time_deps - ignore_hdepend_deps = ignore_build_time_deps if removal_action: depend_root = myroot else: - if eapi_attrs.hdepend: - depend_root = myroot - elif eapi_attrs.bdepend: + if eapi_attrs.bdepend: depend_root = pkg.root_config.settings["ESYSROOT"] else: depend_root = self._frozen_config._running_root.root @@ -3387,8 +3383,6 @@ class depgraph(object): edepend["DEPEND"] = "" if ignore_bdepend_deps: edepend["BDEPEND"] = "" - if ignore_hdepend_deps: - edepend["HDEPEND"] = "" # Since build-time deps tend to be a superset of run-time deps, order # dep processing such that build-time deps are popped from @@ -3403,10 +3397,6 @@ class depgraph(object): self._priority(buildtime=True, optional=(pkg.built or ignore_depend_deps), ignored=ignore_depend_deps)), - (self._frozen_config._running_root.root, edepend["HDEPEND"], - self._priority(buildtime=True, - optional=(pkg.built or ignore_hdepend_deps), - ignored=ignore_hdepend_deps)), (self._frozen_config._running_root.root, edepend["BDEPEND"], self._priority(buildtime=True, optional=(pkg.built or ignore_bdepend_deps), -- cgit v1.2.3