aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-12-26 11:10:25 +0100
committerMichał Górny <mgorny@gentoo.org>2019-12-26 12:22:30 +0100
commit9b1992c050bf9fa698f227e635af5c341e85c9a4 (patch)
tree70600fa209833f51c75865a53c723b9f1f113d8f /lib/_emerge/depgraph.py
parentMergeOrderTestCase: update circ-buildtime mergelist for bug 690436 (diff)
downloadportage-9b1992c050bf9fa698f227e635af5c341e85c9a4.tar.gz
portage-9b1992c050bf9fa698f227e635af5c341e85c9a4.tar.bz2
portage-9b1992c050bf9fa698f227e635af5c341e85c9a4.zip
Clean up remnants of eapi5-hdepend, HDEPEND and targetroot
Reviewed-by: Zac Medico <zmedico@gentoo.org> Closes: https://github.com/gentoo/portage/pull/490 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'lib/_emerge/depgraph.py')
-rw-r--r--lib/_emerge/depgraph.py12
1 files changed, 1 insertions, 11 deletions
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),