Attachment #229283 for bug #317337

Lines 1088-1094 Link Here

(-)portage-2.1.7.17.orig/bin/ebuild.sh (-8 / +22 lines)
1088	local f x	1088	local f x
1089	IFS=$' \t\n\r'	1089	IFS=$' \t\n\r'
1090	for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \	1090	for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \
1091	CXXFLAGS DEFINED_PHASES DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \	1091	CXXFLAGS DEFINED_PHASES DEPEND HDEPEND TDEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \
1092	FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \	1092	FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \
1093	LICENSE PDEPEND PF PKGUSE PROPERTIES PROVIDE RDEPEND RESTRICT SLOT \	1093	LICENSE PDEPEND PF PKGUSE PROPERTIES PROVIDE RDEPEND RESTRICT SLOT \
1094	KEYWORDS HOMEPAGE SRC_URI DESCRIPTION; do	1094	KEYWORDS HOMEPAGE SRC_URI DESCRIPTION; do
Lines 1256-1261 Link Here
1256		1256
1257	local B_IUSE	1257	local B_IUSE
1258	local B_DEPEND	1258	local B_DEPEND
		1259	local B_HDEPEND
		1260	local B_TDEPEND
1259	local B_RDEPEND	1261	local B_RDEPEND
1260	local B_PDEPEND	1262	local B_PDEPEND
1261	while [ "$1" ]; do	1263	while [ "$1" ]; do
Lines 1303-1314 Link Here
1303	set -f	1305	set -f
1304		1306
1305	# Retain the old data and restore it later.	1307	# Retain the old data and restore it later.
1306	unset B_IUSE B_DEPEND B_RDEPEND B_PDEPEND	1308	unset B_IUSE B_DEPEND B_HDEPEND B_TDEPEND B_RDEPEND B_PDEPEND
1307	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"	1309	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"
1308	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"	1310	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"
		1311	[ "${HDEPEND+set}" = set ] && B_HDEPEND="${HDEPEND}"
		1312	[ "${TDEPEND+set}" = set ] && B_TDEPEND="${TDEPEND}"
1309	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"	1313	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"
1310	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"	1314	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"
1311	unset IUSE DEPEND RDEPEND PDEPEND	1315	unset IUSE DEPEND HDEPEND TDEPEND RDEPEND PDEPEND
1312	#turn on glob expansion	1316	#turn on glob expansion
1313	set +f	1317	set +f
1314		1318
Lines 1321-1326 Link Here
1321	# be applied after everything is finished. New incremental behavior.	1325	# be applied after everything is finished. New incremental behavior.
1322	[ "${IUSE+set}" = set ] && export E_IUSE="${E_IUSE} ${IUSE}"	1326	[ "${IUSE+set}" = set ] && export E_IUSE="${E_IUSE} ${IUSE}"
1323	[ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"	1327	[ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"
		1328	[ "${HDEPEND+set}" = set ] && export E_HDEPEND="${E_HDEPEND} ${HDEPEND}"
		1329	[ "${TDEPEND+set}" = set ] && export E_TDEPEND="${E_TDEPEND} ${TDEPEND}"
1324	[ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"	1330	[ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"
1325	[ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"	1331	[ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"
1326		1332
Lines 1330-1335 Link Here
1330	[ "${B_DEPEND+set}" = set ] && DEPEND="${B_DEPEND}"	1336	[ "${B_DEPEND+set}" = set ] && DEPEND="${B_DEPEND}"
1331	[ "${B_DEPEND+set}" = set ] \|\| unset DEPEND	1337	[ "${B_DEPEND+set}" = set ] \|\| unset DEPEND
1332		1338
		1339	[ "${B_HDEPEND+set}" = set ] && HDEPEND="${B_HDEPEND}"
		1340	[ "${B_HDEPEND+set}" = set ] \|\| unset HDEPEND
		1341
		1342	[ "${B_TDEPEND+set}" = set ] && TDEPEND="${B_TDEPEND}"
		1343	[ "${B_TDEPEND+set}" = set ] \|\| unset TDEPEND
		1344
1333	[ "${B_RDEPEND+set}" = set ] && RDEPEND="${B_RDEPEND}"	1345	[ "${B_RDEPEND+set}" = set ] && RDEPEND="${B_RDEPEND}"
1334	[ "${B_RDEPEND+set}" = set ] \|\| unset RDEPEND	1346	[ "${B_RDEPEND+set}" = set ] \|\| unset RDEPEND
1335		1347
Lines 1591-1597 Link Here
1591	# of ebuild.sh will work for pkg_postinst, pkg_prerm, and pkg_postrm	1603	# of ebuild.sh will work for pkg_postinst, pkg_prerm, and pkg_postrm
1592	# when portage is upgrading itself.	1604	# when portage is upgrading itself.
1593		1605
1594	READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION	1606	READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND HDEPEND TDEPEND DESCRIPTION
1595	EAPI HOMEPAGE INHERITED IUSE KEYWORDS LICENSE	1607	EAPI HOMEPAGE INHERITED IUSE KEYWORDS LICENSE
1596	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"	1608	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
1597		1609
Lines 1766-1772 Link Here
1766	export SANDBOX_ON="1"	1778	export SANDBOX_ON="1"
1767	export S=${WORKDIR}/${P}	1779	export S=${WORKDIR}/${P}
1768		1780
1769	unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND	1781	unset E_IUSE E_DEPEND E_HDEPEND E_TDEPEND E_RDEPEND E_PDEPEND
1770		1782
1771	# Turn of extended glob matching so that g++ doesn't get incorrectly matched.	1783	# Turn of extended glob matching so that g++ doesn't get incorrectly matched.
1772	shopt -u extglob	1784	shopt -u extglob
Lines 1870-1876 Link Here
1870	# In order to ensure correct interaction between ebuilds and	1882	# In order to ensure correct interaction between ebuilds and
1871	# eclasses, they need to be unset before this process of	1883	# eclasses, they need to be unset before this process of
1872	# interaction begins.	1884	# interaction begins.
1873	unset DEPEND RDEPEND PDEPEND IUSE	1885	unset DEPEND HDEPEND TDEPEND RDEPEND PDEPEND IUSE
1874		1886
1875	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then	1887	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then
1876	source "$EBUILD" \|\| die "error sourcing ebuild"	1888	source "$EBUILD" \|\| die "error sourcing ebuild"
Lines 1896-1905 Link Here
1896	# add in dependency info from eclasses	1908	# add in dependency info from eclasses
1897	IUSE="${IUSE} ${E_IUSE}"	1909	IUSE="${IUSE} ${E_IUSE}"
1898	DEPEND="${DEPEND} ${E_DEPEND}"	1910	DEPEND="${DEPEND} ${E_DEPEND}"
		1911	HDEPEND="${HDEPEND} ${E_HDEPEND}"
		1912	TDEPEND="${TDEPEND} ${E_TDEPEND}"
1899	RDEPEND="${RDEPEND} ${E_RDEPEND}"	1913	RDEPEND="${RDEPEND} ${E_RDEPEND}"
1900	PDEPEND="${PDEPEND} ${E_PDEPEND}"	1914	PDEPEND="${PDEPEND} ${E_PDEPEND}"
1901		1915
1902	unset ECLASS E_IUSE E_DEPEND E_RDEPEND E_PDEPEND	1916	unset ECLASS E_IUSE E_DEPEND E_HDEPEND E_TDEPEND E_RDEPEND E_PDEPEND
1903		1917
1904	# alphabetically ordered by $EBUILD_PHASE value	1918	# alphabetically ordered by $EBUILD_PHASE value
1905	case "$EAPI" in	1919	case "$EAPI" in
Lines 2131-2137 Link Here
2131		2145
2132	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE	2146	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
2133	DESCRIPTION KEYWORDS INHERITED IUSE UNUSED_00 PDEPEND PROVIDE EAPI	2147	DESCRIPTION KEYWORDS INHERITED IUSE UNUSED_00 PDEPEND PROVIDE EAPI
2134	PROPERTIES DEFINED_PHASES UNUSED_05 UNUSED_04	2148	PROPERTIES DEFINED_PHASES HDEPEND TDEPEND
2135	UNUSED_03 UNUSED_02 UNUSED_01"	2149	UNUSED_03 UNUSED_02 UNUSED_01"
2136		2150
2137	#the extra $(echo) commands remove newlines	2151	#the extra $(echo) commands remove newlines

Lines 230-236 Link Here

(-)portage-2.1.7.17.orig/bin/emaint (-1 / +1 lines)
230	def __init__(self, tree):	230	def __init__(self, tree):
231	self._tree = tree	231	self._tree = tree
232	self._portdir = tree.settings["PORTDIR"]	232	self._portdir = tree.settings["PORTDIR"]
233	self._update_keys = ["DEPEND", "RDEPEND", "PDEPEND", "PROVIDE"]	233	self._update_keys = ["DEPEND", "HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND", "PROVIDE"]
234		234
235	def _grab_global_updates(self, portdir):	235	def _grab_global_updates(self, portdir):
236	from portage.update import grab_updates, parse_updates	236	from portage.update import grab_updates, parse_updates




		graph = digraph()
		del cleanlist[:]

		dep_keys = ["HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND"]
		runtime = UnmergeDepPriority(runtime=True)
		runtime_post = UnmergeDepPriority(runtime_post=True)
		buildtime = UnmergeDepPriority(buildtime=True)
		priority_map = {
			"RDEPEND": runtime,
			"PDEPEND": runtime_post,
			"HDEPEND": buildtime,
			"TDEPEND": buildtime,
		}

		for node in clean_set:

Lines 40-46 Link Here

(-)portage-2.1.7.17.orig/pym/_emerge/BlockerDB.py (-1 / +1 lines)
40		40
41	def findInstalledBlockers(self, new_pkg, acquire_lock=0):	41	def findInstalledBlockers(self, new_pkg, acquire_lock=0):
42	blocker_cache = BlockerCache(self._vartree.root, self._vartree.dbapi)	42	blocker_cache = BlockerCache(self._vartree.root, self._vartree.dbapi)
43	dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"]	43	dep_keys = ["DEPEND", "HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND"]
44	settings = self._vartree.settings	44	settings = self._vartree.settings
45	stale_cache = set(blocker_cache)	45	stale_cache = set(blocker_cache)
46	fake_vartree = self._get_fake_vartree(acquire_lock=acquire_lock)	46	fake_vartree = self._get_fake_vartree(acquire_lock=acquire_lock)

Lines 239-245 Link Here

(-)portage-2.1.7.17.orig/pym/_emerge/depgraph.py (-7 / +20 lines)
239		239
240	pkg_tree_map = RootConfig.pkg_tree_map	240	pkg_tree_map = RootConfig.pkg_tree_map
241		241
242	_dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"]	242	_dep_keys = ["HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND"]
243		243
244	def __init__(self, settings, trees, myopts, myparams, spinner,	244	def __init__(self, settings, trees, myopts, myparams, spinner,
245	frozen_config=None, runtime_pkg_mask=None, allow_backtracking=False):	245	frozen_config=None, runtime_pkg_mask=None, allow_backtracking=False):
Lines 1097-1106 Link Here
1097	removal_action = "remove" in self._dynamic_config.myparams	1097	removal_action = "remove" in self._dynamic_config.myparams
1098		1098
1099	edepend={}	1099	edepend={}
1100	depkeys = ["DEPEND","RDEPEND","PDEPEND"]	1100	depkeys = ["HDEPEND","TDEPEND","RDEPEND","PDEPEND"]
1101	for k in depkeys:	1101	for k in depkeys:
1102	edepend[k] = metadata[k]	1102	edepend[k] = metadata[k]
1103		1103
		1104	# if HDEPEND and TDEPEND are empty, treat DEPEND as if it was HDEPEND,
		1105	# otherwise ignore DEPEND
		1106	if edepend["HDEPEND"] == "" and edepend["TDEPEND"] == "":
		1107	edepend["HDEPEND"] = metadata["DEPEND"]
		1108
1104	if not pkg.built and \	1109	if not pkg.built and \
1105	"--buildpkgonly" in self._frozen_config.myopts and \	1110	"--buildpkgonly" in self._frozen_config.myopts and \
1106	"deep" not in self._dynamic_config.myparams and \	1111	"deep" not in self._dynamic_config.myparams and \
Lines 1121-1130 Link Here
1121	bdeps_optional = True	1126	bdeps_optional = True
1122	else:	1127	else:
1123	# built packages do not have build time dependencies.	1128	# built packages do not have build time dependencies.
1124	edepend["DEPEND"] = ""	1129	edepend["HDEPEND"] = ""
		1130	edepend["TDEPEND"] = ""
1125		1131
1126	if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":	1132	if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":
1127	edepend["DEPEND"] = ""	1133	edepend["HDEPEND"] = ""
		1134	edepend["TDEPEND"] = ""
1128		1135
1129	if removal_action:	1136	if removal_action:
1130	bdeps_root = myroot	1137	bdeps_root = myroot
Lines 1135-1144 Link Here
1135	if root_deps is True:	1142	if root_deps is True:
1136	bdeps_root = myroot	1143	bdeps_root = myroot
1137	elif root_deps == "rdeps":	1144	elif root_deps == "rdeps":
1138	edepend["DEPEND"] = ""	1145	edepend["HDEPEND"] = ""
1139		1146
1140	deps = (	1147	deps = (
1141	(bdeps_root, edepend["DEPEND"],	1148	(bdeps_root, edepend["HDEPEND"],
		1149	self._priority(buildtime=(not bdeps_optional),
		1150	optional=bdeps_optional)),
		1151	(myroot, edepend["TDEPEND"],
1142	self._priority(buildtime=(not bdeps_optional),	1152	self._priority(buildtime=(not bdeps_optional),
1143	optional=bdeps_optional)),	1153	optional=bdeps_optional)),
1144	(myroot, edepend["RDEPEND"], self._priority(runtime=True)),	1154	(myroot, edepend["RDEPEND"], self._priority(runtime=True)),
Lines 1991-1997 Link Here
1991	return [pkg.slot_atom for pkg in greedy_pkgs]	2001	return [pkg.slot_atom for pkg in greedy_pkgs]
1992		2002
1993	blockers = {}	2003	blockers = {}
1994	blocker_dep_keys = ["DEPEND", "PDEPEND", "RDEPEND"]	2004	if pkg.metadata["HDEPEND"] == "" and pkg.metadata["TDEPEND"] == "":
		2005	blocker_dep_keys = ["DEPEND", "PDEPEND", "RDEPEND"]
		2006	else:
		2007	blocker_dep_keys = ["HDEPEND", "TDEPEND", "PDEPEND", "RDEPEND"]
1995	for pkg in greedy_pkgs + [highest_pkg]:	2008	for pkg in greedy_pkgs + [highest_pkg]:
1996	dep_str = " ".join(pkg.metadata[k] for k in blocker_dep_keys)	2009	dep_str = " ".join(pkg.metadata[k] for k in blocker_dep_keys)
1997	try:	2010	try:

Lines 46-52 Link Here

(-)portage-2.1.7.17.orig/pym/_emerge/FakeVartree.py (-2 / +2 lines)
46	self._match = self.dbapi.match	46	self._match = self.dbapi.match
47	self.dbapi.match = self._match_wrapper	47	self.dbapi.match = self._match_wrapper
48	self._aux_get_history = set()	48	self._aux_get_history = set()
49	self._portdb_keys = ["EAPI", "DEPEND", "RDEPEND", "PDEPEND"]	49	self._portdb_keys = ["EAPI", "DEPEND", "HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND"]
50	self._portdb = portdb	50	self._portdb = portdb
51	self._global_updates = None	51	self._global_updates = None
52		52
Lines 193-199 Link Here
193		193
194	def perform_global_updates(mycpv, mydb, mycommands):	194	def perform_global_updates(mycpv, mydb, mycommands):
195	from portage.update import update_dbentries	195	from portage.update import update_dbentries
196	aux_keys = ["DEPEND", "RDEPEND", "PDEPEND"]	196	aux_keys = ["DEPEND", "HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND"]
197	aux_dict = dict(zip(aux_keys, mydb.aux_get(mycpv, aux_keys)))	197	aux_dict = dict(zip(aux_keys, mydb.aux_get(mycpv, aux_keys)))
198	updates = update_dbentries(mycommands, aux_dict)	198	updates = update_dbentries(mycommands, aux_dict)
199	if updates:	199	if updates:

Lines 27-33 Link Here

(-)portage-2.1.7.17.orig/pym/_emerge/Package.py (-1 / +1 lines)
27	("_use",)	27	("_use",)
28		28
29	metadata_keys = [	29	metadata_keys = [
30	"CHOST", "COUNTER", "DEPEND", "EAPI",	30	"CHOST", "COUNTER", "DEPEND", "HDEPEND", "TDEPEND", "EAPI",
31	"INHERITED", "IUSE", "KEYWORDS",	31	"INHERITED", "IUSE", "KEYWORDS",
32	"LICENSE", "PDEPEND", "PROVIDE", "RDEPEND",	32	"LICENSE", "PDEPEND", "PROVIDE", "RDEPEND",
33	"repository", "PROPERTIES", "RESTRICT", "SLOT", "USE", "_mtime_"]	33	"repository", "PROPERTIES", "RESTRICT", "SLOT", "USE", "_mtime_"]

Lines 20-26 Link Here

(-)portage-2.1.7.17.orig/pym/portage/cache/flat_list.py (-1 / +1 lines)
20	auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',	20	auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',
21	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',	21	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',
22	'KEYWORDS', 'IUSE', 'UNUSED_00',	22	'KEYWORDS', 'IUSE', 'UNUSED_00',
23	'PDEPEND', 'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES')	23	'PDEPEND', 'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES', 'HDEPEND', 'TDEPEND')
24		24
25	def __init__(self, label, auxdbkeys, **config):	25	def __init__(self, label, auxdbkeys, **config):
26	super(database,self).__init__(label, auxdbkeys, **config)	26	super(database,self).__init__(label, auxdbkeys, **config)

Lines 28-34 Link Here

(-)portage-2.1.7.17.orig/pym/portage/cache/metadata.py (-1 / +1 lines)
28	auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',	28	auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',
29	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',	29	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',
30	'KEYWORDS', 'INHERITED', 'IUSE', 'UNUSED_00',	30	'KEYWORDS', 'INHERITED', 'IUSE', 'UNUSED_00',
31	'PDEPEND', 'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES')	31	'PDEPEND', 'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES', 'HDEPEND', 'TDEPEND')
32		32
33	autocommits = True	33	autocommits = True
34	serialize_eclasses = False	34	serialize_eclasses = False

Lines 49-55 Link Here

(-)portage-2.1.7.17.orig/pym/portage/dbapi/bintree.py (-3 / +5 lines)
49	self.cpdict={}	49	self.cpdict={}
50	# Selectively cache metadata in order to optimize dep matching.	50	# Selectively cache metadata in order to optimize dep matching.
51	self._aux_cache_keys = set(	51	self._aux_cache_keys = set(
52	["CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",	52	["CHOST", "DEPEND", "HDEPEND", "TDEPEND", "EAPI", "IUSE", "KEYWORDS",
53	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",	53	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",
54	"RDEPEND", "repository", "RESTRICT", "SLOT", "USE"])	54	"RDEPEND", "repository", "RESTRICT", "SLOT", "USE"])
55	self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)	55	self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)
Lines 187-198 Link Here
187	self._pkgindex_keys = self.dbapi._aux_cache_keys.copy()	187	self._pkgindex_keys = self.dbapi._aux_cache_keys.copy()
188	self._pkgindex_keys.update(["CPV", "MTIME", "SIZE"])	188	self._pkgindex_keys.update(["CPV", "MTIME", "SIZE"])
189	self._pkgindex_aux_keys = \	189	self._pkgindex_aux_keys = \
190	["CHOST", "DEPEND", "DESCRIPTION", "EAPI",	190	["CHOST", "DEPEND", "HDEPEND", "TDEPEND", "DESCRIPTION", "EAPI",
191	"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",	191	"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
192	"PROVIDE", "RDEPEND", "repository", "SLOT", "USE"]	192	"PROVIDE", "RDEPEND", "repository", "SLOT", "USE"]
193	self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)	193	self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
194	self._pkgindex_use_evaluated_keys = \	194	self._pkgindex_use_evaluated_keys = \
195	("LICENSE", "RDEPEND", "DEPEND",	195	("LICENSE", "RDEPEND", "DEPEND", "HDEPEND", "TDEPEND",
196	"PDEPEND", "PROPERTIES", "PROVIDE")	196	"PDEPEND", "PROPERTIES", "PROVIDE")
197	self._pkgindex_header_keys = set([	197	self._pkgindex_header_keys = set([
198	"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",	198	"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
Lines 201-206 Link Here
201	"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE"])	201	"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE"])
202	self._pkgindex_default_pkg_data = {	202	self._pkgindex_default_pkg_data = {
203	"DEPEND" : "",	203	"DEPEND" : "",
		204	"HDEPEND" : "",
		205	"TDEPEND" : "",
204	"EAPI" : "0",	206	"EAPI" : "0",
205	"IUSE" : "",	207	"IUSE" : "",
206	"KEYWORDS": "",	208	"KEYWORDS": "",

Lines 217-223 Link Here

(-)portage-2.1.7.17.orig/pym/portage/dbapi/__init__.py (-1 / +1 lines)
217	maxval = len(cpv_all)	217	maxval = len(cpv_all)
218	aux_get = self.aux_get	218	aux_get = self.aux_get
219	aux_update = self.aux_update	219	aux_update = self.aux_update
220	update_keys = ["DEPEND", "RDEPEND", "PDEPEND", "PROVIDE"]	220	update_keys = ["DEPEND", "HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND", "PROVIDE"]
221	from portage.update import update_dbentries	221	from portage.update import update_dbentries
222	if onUpdate:	222	if onUpdate:
223	onUpdate(maxval, 0)	223	onUpdate(maxval, 0)

Lines 375-381 Link Here

(-)portage-2.1.7.17.orig/pym/portage/dbapi/porttree.py (-1 / +1 lines)
375	pass	375	pass
376	# Selectively cache metadata in order to optimize dep matching.	376	# Selectively cache metadata in order to optimize dep matching.
377	self._aux_cache_keys = set(	377	self._aux_cache_keys = set(
378	["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE",	378	["DEPEND", "HDEPEND", "TDEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE",
379	"PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository",	379	"PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository",
380	"RESTRICT", "SLOT"])	380	"RESTRICT", "SLOT"])
381		381

Lines 113-119 Link Here

(-)portage-2.1.7.17.orig/pym/portage/dbapi/vartree.py (-1 / +1 lines)
113	vartree = db[root]["vartree"]	113	vartree = db[root]["vartree"]
114	self.vartree = vartree	114	self.vartree = vartree
115	self._aux_cache_keys = set(	115	self._aux_cache_keys = set(
116	["CHOST", "COUNTER", "DEPEND", "DESCRIPTION",	116	["CHOST", "COUNTER", "DEPEND", "HDEPEND", "TDEPEND", "DESCRIPTION",
117	"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS",	117	"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS",
118	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND",	118	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND",
119	"repository", "RESTRICT" , "SLOT", "USE"])	119	"repository", "RESTRICT" , "SLOT", "USE"])

Lines 8747-8753 Link Here

(-)portage-2.1.7.17.orig/pym/portage/__init__.py (-1 / +1 lines)
8747	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',	8747	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',
8748	'KEYWORDS', 'INHERITED', 'IUSE', 'UNUSED_00',	8748	'KEYWORDS', 'INHERITED', 'IUSE', 'UNUSED_00',
8749	'PDEPEND', 'PROVIDE', 'EAPI',	8749	'PDEPEND', 'PROVIDE', 'EAPI',
8750	'PROPERTIES', 'DEFINED_PHASES', 'UNUSED_05', 'UNUSED_04',	8750	'PROPERTIES', 'DEFINED_PHASES', 'HDEPEND', 'TDEPEND',
8751	'UNUSED_03', 'UNUSED_02', 'UNUSED_01',	8751	'UNUSED_03', 'UNUSED_02', 'UNUSED_01',
8752	]	8752	]
8753	auxdbkeylen=len(auxdbkeys)	8753	auxdbkeylen=len(auxdbkeys)

Return to bug 317337

Lines 884-897 Link Here

(-)portage-2.1.7.17.orig/pym/_emerge/actions.py (-2 / +3 lines)
884	graph = digraph()	884	graph = digraph()
885	del cleanlist[:]	885	del cleanlist[:]
886		886
887	dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"]	887	dep_keys = ["HDEPEND", "TDEPEND", "RDEPEND", "PDEPEND"]
888	runtime = UnmergeDepPriority(runtime=True)	888	runtime = UnmergeDepPriority(runtime=True)
889	runtime_post = UnmergeDepPriority(runtime_post=True)	889	runtime_post = UnmergeDepPriority(runtime_post=True)
890	buildtime = UnmergeDepPriority(buildtime=True)	890	buildtime = UnmergeDepPriority(buildtime=True)
891	priority_map = {	891	priority_map = {
892	"RDEPEND": runtime,	892	"RDEPEND": runtime,
893	"PDEPEND": runtime_post,	893	"PDEPEND": runtime_post,
894	"DEPEND": buildtime,	894	"HDEPEND": buildtime,
		895	"TDEPEND": buildtime,
895	}	896	}
896		897
897	for node in clean_set:	898	for node in clean_set: