Use constants for hardcoded *DEPEND lists.

3 files changed, 9 insertions, 11 deletions

diff --git a/pym/portage/dep/_slot_operator.py b/pym/portage/dep/_slot_operator.py
index 9fe19fc59..d7933b592 100644
--- a/pym/portage/dep/_slot_operator.py
+++ b/pym/portage/dep/_slot_operator.py
@@ -3,13 +3,11 @@
 
 from portage.dep import Atom, paren_enclose, use_reduce
 from portage.exception import InvalidData
-
-_dep_keys = ('DEPEND', 'HDEPEND', 'PDEPEND', 'RDEPEND')
-_runtime_keys = ('PDEPEND', 'RDEPEND')
+from _emerge.Package import Package
 
 def find_built_slot_operator_atoms(pkg):
 	atoms = {}
-	for k in _dep_keys:
+	for k in Package._dep_keys:
 		atom_list = list(_find_built_slot_operator(use_reduce(pkg.metadata[k],
 			uselist=pkg.use.enabled, eapi=pkg.metadata['EAPI'],
 			token_class=Atom)))
@@ -43,11 +41,11 @@ def evaluate_slot_operator_equal_deps(settings, use, trees):
 	target_vardb = trees[trees._target_eroot]["vartree"].dbapi
 	vardbs = [target_vardb]
 	deps = {}
-	for k in _dep_keys:
+	for k in Package._dep_keys:
 		deps[k] = use_reduce(metadata[k],
 			uselist=use, eapi=eapi, token_class=Atom)
 
-	for k in _runtime_keys:
+	for k in Package._runtime_keys:
 		_eval_deps(deps[k], vardbs)
 
 	if running_vardb is not target_vardb:
diff --git a/pym/portage/emaint/modules/move/move.py b/pym/portage/emaint/modules/move/move.py
index 5e1d99492..29ff33005 100644
--- a/pym/portage/emaint/modules/move/move.py
+++ b/pym/portage/emaint/modules/move/move.py
@@ -3,14 +3,14 @@
 
 import portage
 from portage import os
-
+from _emerge.Package import Package
 
 class MoveHandler(object):
 
 	def __init__(self, tree, porttree):
 		self._tree = tree
 		self._portdb = porttree.dbapi
-		self._update_keys = ["DEPEND", "HDEPEND", "RDEPEND", "PDEPEND", "PROVIDE"]
+		self._update_keys = ["PROVIDE"] + list(Package._dep_keys)
 		self._master_repo = \
 			self._portdb.getRepositoryName(self._portdb.porttree_root)
 
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index b50b452ea..04d0808ae 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -93,6 +93,9 @@ _phase_func_map = {
 	"pretend": "pkg_pretend",
 }
 
+_vdb_use_conditional_keys = Package._dep_keys + \
+	('LICENSE', 'PROPERTIES', 'PROVIDE', 'RESTRICT',)
+
 def _doebuild_spawn(phase, settings, actionmap=None, **kwargs):
 	"""
 	All proper ebuild phases which execute ebuild.sh are spawned
@@ -1735,9 +1738,6 @@ def _post_src_install_write_metadata(settings):
 				errors='strict') as f:
 				f.write(_unicode_decode(v + '\n'))
 
-_vdb_use_conditional_keys = ('DEPEND', 'HDEPEND', 'LICENSE', 'PDEPEND',
-	'PROPERTIES', 'PROVIDE', 'RDEPEND', 'RESTRICT',)
-
 def _preinst_bsdflags(mysettings):
 	if bsd_chflags:
 		# Save all the file flags for restoration later.