Attachment #324038 for bug #317337




	local B_DEPEND
	local B_RDEPEND
	local B_PDEPEND
	local B_HDEPEND
	local B_CROSS_HDEPEND
	while [ "$1" ]; do
		location="${ECLASSDIR}/${1}.eclass"
		olocation=""

				EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"
		fi

		#We need to back up the values of *DEPEND to B_*DEPEND
		#(if set).. and then restore them after the inherit call.

		#turn off glob expansion
		set -f

		# Retain the old data and restore it later.
		unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND B_HDEPEND B_CROSS_HDEPEND
		[ "${IUSE+set}"       = set ] && B_IUSE="${IUSE}"
		[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"
		[ "${DEPEND+set}"     = set ] && B_DEPEND="${DEPEND}"
		[ "${RDEPEND+set}"    = set ] && B_RDEPEND="${RDEPEND}"
		[ "${PDEPEND+set}"    = set ] && B_PDEPEND="${PDEPEND}"
		[ "${HDEPEND+set}"    = set ] && B_HDEPEND="${HDEPEND}"
		[ "${CROSS_HDEPEND+set}" = set ] && B_CROSS_HDEPEND="${CROSS_HDEPEND}"
		unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND HDEPEND CROSS_HDEPEND
		#turn on glob expansion
		set +f


		[ "${DEPEND+set}"       = set ] && E_DEPEND+="${E_DEPEND:+ }${DEPEND}"
		[ "${RDEPEND+set}"      = set ] && E_RDEPEND+="${E_RDEPEND:+ }${RDEPEND}"
		[ "${PDEPEND+set}"      = set ] && E_PDEPEND+="${E_PDEPEND:+ }${PDEPEND}"
		[ "${HDEPEND+set}"      = set ] && E_HDEPEND+="${E_HDEPEND:+ }${HDEPEND}"
		[ "${CROSS_HDEPEND+set}" = set ] && E_CROSS_HDEPEND+="${E_CROSS_HDEPEND:+ }${CROSS_HDEPEND}"

		[ "${B_IUSE+set}"     = set ] && IUSE="${B_IUSE}"
		[ "${B_IUSE+set}"     = set ] || unset IUSE

		[ "${B_PDEPEND+set}"  = set ] && PDEPEND="${B_PDEPEND}"
		[ "${B_PDEPEND+set}"  = set ] || unset PDEPEND

		[ "${B_HDEPEND+set}"  = set ] && HDEPEND="${B_HDEPEND}"
		[ "${B_HDEPEND+set}"  = set ] || unset HDEPEND

		[ "${B_CROSS_HDEPEND+set}"  = set ] && CROSS_HDEPEND="${B_CROSS_HDEPEND}"
		[ "${B_CROSS_HDEPEND+set}"  = set ] || unset CROSS_HDEPEND

		#turn on glob expansion
		set +f


		# In order to ensure correct interaction between ebuilds and
		# eclasses, they need to be unset before this process of
		# interaction begins.
		unset EAPI DEPEND RDEPEND PDEPEND HDEPEND CROSS_HDEPEND INHERITED IUSE REQUIRED_USE \
			ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND \
			E_HDEPEND E_CROSS_HDEPEND

		if [[ $PORTAGE_DEBUG != 1 || ${-/x/} != $- ]] ; then
			source "$EBUILD" || die "error sourcing ebuild"

		DEPEND+="${DEPEND:+ }${E_DEPEND}"
		RDEPEND+="${RDEPEND:+ }${E_RDEPEND}"
		PDEPEND+="${PDEPEND:+ }${E_PDEPEND}"
		HDEPEND+="${HDEPEND:+ }${E_HDEPEND}"
		CROSS_HDEPEND+="${CROSS_HDEPEND:+ }${E_CROSS_HDEPEND}"
		REQUIRED_USE+="${REQUIRED_USE:+ }${E_REQUIRED_USE}"
		
		unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_HDEPEND \
			E_CROSS_HDEPEND __INHERITED_QA_CACHE

		# alphabetically ordered by $EBUILD_PHASE value
		case "$EAPI" in


	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
		DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI
		PROPERTIES DEFINED_PHASES HDEPEND CROSS_HDEPEND
		UNUSED_03 UNUSED_02 UNUSED_01"

	case "$EAPI" in
		0|1|2|3|4)
			unset HDEPEND
			unset CROSS_HDEPEND
			;;
	esac

	# The extra $(echo) commands remove newlines.
	if [ -n "${dbkey}" ] ; then
		> "${dbkey}"

Lines 503-509 Link Here

(-)portage-2.1.11.17/pym/_emerge/depgraph.py (-12 / +40 lines)
503		503
504	pkg_tree_map = RootConfig.pkg_tree_map	504	pkg_tree_map = RootConfig.pkg_tree_map
505		505
506	_dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"]	506	_dep_keys = ["DEPEND", "RDEPEND", "PDEPEND", "HDEPEND", "CROSS_HDEPEND"]
507		507
508	def __init__(self, settings, trees, myopts, myparams, spinner,	508	def __init__(self, settings, trees, myopts, myparams, spinner,
509	frozen_config=None, backtrack_parameters=BacktrackParameter(), allow_backtracking=False):	509	frozen_config=None, backtrack_parameters=BacktrackParameter(), allow_backtracking=False):
Lines 1682-1688 Link Here
1682	removal_action = "remove" in self._dynamic_config.myparams	1682	removal_action = "remove" in self._dynamic_config.myparams
1683		1683
1684	edepend={}	1684	edepend={}
1685	depkeys = ["DEPEND","RDEPEND","PDEPEND"]	1685	depkeys = ["DEPEND","RDEPEND","PDEPEND","HDEPEND","CROSS_HDEPEND"]
1686	for k in depkeys:	1686	for k in depkeys:
1687	edepend[k] = metadata[k]	1687	edepend[k] = metadata[k]
1688		1688
Lines 1710-1727 Link Here
1710	# Removal actions never traverse ignored buildtime	1710	# Removal actions never traverse ignored buildtime
1711	# dependencies, so it's safe to discard them early.	1711	# dependencies, so it's safe to discard them early.
1712	edepend["DEPEND"] = ""	1712	edepend["DEPEND"] = ""
		1713	edepend["HDEPEND"] = ""
		1714	edepend["CROSS_HDEPEND"] = ""
1713	ignore_build_time_deps = True	1715	ignore_build_time_deps = True
		1716
		1717	is_crosscompile = self._frozen_config.myopts.get("--crosscompile")
1714		1718
1715	if removal_action:	1719	if removal_action:
1716	depend_root = myroot	1720	depend_root = myroot
1717	else:	1721	else:
1718	depend_root = self._frozen_config._running_root.root	1722	if pkg.metadata['EAPI'] not in ('0', '1', '2', '3', '4'):
1719	root_deps = self._frozen_config.myopts.get("--root-deps")	1723	# For ebuilds that have EAPI 5 or later, --root-deps
1720	if root_deps is not None:	1724	# has no effect, since DEPEND has been divided into two parts:
1721	if root_deps is True:	1725	# DEPEND for build-time target dependencies, and HDEPEND for
		1726	# build-time host dependencies.
		1727	if is_crosscompile:
1722	depend_root = myroot	1728	depend_root = myroot
1723	elif root_deps == "rdeps":	1729	else:
1724	ignore_build_time_deps = True	1730	depend_root = self._frozen_config._running_root.root
		1731	else:
		1732	depend_root = self._frozen_config._running_root.root
		1733	root_deps = self._frozen_config.myopts.get("--root-deps")
		1734	if root_deps is not None:
		1735	if root_deps is True:
		1736	depend_root = myroot
		1737	elif root_deps == "rdeps":
		1738	ignore_build_time_deps = True
1725		1739
1726	# If rebuild mode is not enabled, it's safe to discard ignored	1740	# If rebuild mode is not enabled, it's safe to discard ignored
1727	# build-time dependencies. If you want these deps to be traversed	1741	# build-time dependencies. If you want these deps to be traversed
Lines 1729-1734 Link Here
1729	if ignore_build_time_deps and \	1743	if ignore_build_time_deps and \
1730	not self._rebuild.rebuild:	1744	not self._rebuild.rebuild:
1731	edepend["DEPEND"] = ""	1745	edepend["DEPEND"] = ""
		1746	edepend["HDEPEND"] = ""
		1747	edepend["CROSS_HDEPEND"] = ""
1732		1748
1733	deps = (	1749	deps = (
1734	(depend_root, edepend["DEPEND"],	1750	(depend_root, edepend["DEPEND"],
Lines 1738-1744 Link Here
1738	(myroot, edepend["RDEPEND"],	1754	(myroot, edepend["RDEPEND"],
1739	self._priority(runtime=True)),	1755	self._priority(runtime=True)),
1740	(myroot, edepend["PDEPEND"],	1756	(myroot, edepend["PDEPEND"],
1741	self._priority(runtime_post=True))	1757	self._priority(runtime_post=True)),
		1758	(self._frozen_config._running_root.root, edepend["HDEPEND"],
		1759	self._priority(buildtime=True,
		1760	optional=(pkg.built or ignore_build_time_deps),
		1761	ignored=ignore_build_time_deps)),
		1762	(self._frozen_config._running_root.root, edepend["CROSS_HDEPEND"],
		1763	self._priority(buildtime=True,
		1764	optional=(pkg.built or ignore_build_time_deps),
		1765	ignored=(ignore_build_time_deps or not is_crosscompile)))
1742	)	1766	)
1743		1767
1744	debug = "--debug" in self._frozen_config.myopts	1768	debug = "--debug" in self._frozen_config.myopts
Lines 2835-2841 Link Here
2835	return [pkg.slot_atom for pkg in greedy_pkgs]	2859	return [pkg.slot_atom for pkg in greedy_pkgs]
2836		2860
2837	blockers = {}	2861	blockers = {}
2838	blocker_dep_keys = ["DEPEND", "PDEPEND", "RDEPEND"]	2862	blocker_dep_keys = ["DEPEND", "PDEPEND", "RDEPEND", "HDEPEND", "CROSS_HDEPEND"]
2839	for pkg in greedy_pkgs + [highest_pkg]:	2863	for pkg in greedy_pkgs + [highest_pkg]:
2840	dep_str = " ".join(pkg.metadata[k] for k in blocker_dep_keys)	2864	dep_str = " ".join(pkg.metadata[k] for k in blocker_dep_keys)
2841	try:	2865	try:
Lines 3096-3102 Link Here
3096		3120
3097	if target_atom is not None and isinstance(node, Package):	3121	if target_atom is not None and isinstance(node, Package):
3098	affecting_use = set()	3122	affecting_use = set()
3099	for dep_str in "DEPEND", "RDEPEND", "PDEPEND":	3123	for dep_str in "DEPEND", "RDEPEND", "PDEPEND", "HDEPEND", "CROSS_HDEPEND":
3100	try:	3124	try:
3101	affecting_use.update(extract_affecting_use(	3125	affecting_use.update(extract_affecting_use(
3102	node.metadata[dep_str], target_atom,	3126	node.metadata[dep_str], target_atom,
Lines 3180-3189 Link Here
3180	dep_strings.add(node.metadata["DEPEND"])	3204	dep_strings.add(node.metadata["DEPEND"])
3181	dep_strings.add(node.metadata["RDEPEND"])	3205	dep_strings.add(node.metadata["RDEPEND"])
3182	dep_strings.add(node.metadata["PDEPEND"])	3206	dep_strings.add(node.metadata["PDEPEND"])
		3207	dep_strings.add(node.metadata["HDEPEND"])
		3208	dep_strings.add(node.metadata["CROSS_HDEPEND"])
3183	else:	3209	else:
3184	for priority in priorities:	3210	for priority in priorities:
3185	if priority.buildtime:	3211	if priority.buildtime:
3186	dep_strings.add(node.metadata["DEPEND"])	3212	dep_strings.add(node.metadata["DEPEND"])
		3213	dep_strings.add(node.metadata["HDEPEND"])
		3214	dep_strings.add(node.metadata["CROSS_HDEPEND"])
3187	if priority.runtime:	3215	if priority.runtime:
3188	dep_strings.add(node.metadata["RDEPEND"])	3216	dep_strings.add(node.metadata["RDEPEND"])
3189	if priority.runtime_post:	3217	if priority.runtime_post:
Lines 4126-4132 Link Here
4126	if pkg not in self._dynamic_config.digraph.nodes:	4154	if pkg not in self._dynamic_config.digraph.nodes:
4127	return False	4155	return False
4128		4156
4129	for key in "DEPEND", "RDEPEND", "PDEPEND", "LICENSE":	4157	for key in "DEPEND", "RDEPEND", "PDEPEND", "HDEPEND", "CROSS_HDEPEND", "LICENSE":
4130	dep = pkg.metadata[key]	4158	dep = pkg.metadata[key]
4131	old_val = set(portage.dep.use_reduce(dep, pkg.use.enabled, is_valid_flag=pkg.iuse.is_valid_flag, flat=True))	4159	old_val = set(portage.dep.use_reduce(dep, pkg.use.enabled, is_valid_flag=pkg.iuse.is_valid_flag, flat=True))
4132	new_val = set(portage.dep.use_reduce(dep, new_use, is_valid_flag=pkg.iuse.is_valid_flag, flat=True))	4160	new_val = set(portage.dep.use_reduce(dep, new_use, is_valid_flag=pkg.iuse.is_valid_flag, flat=True))

Lines 489-494 Link Here

(-)portage-2.1.11.17/pym/_emerge/main.py (+6 lines)
489	"--use-ebuild-visibility": y_or_n,	489	"--use-ebuild-visibility": y_or_n,
490	'--usepkg' : y_or_n,	490	'--usepkg' : y_or_n,
491	'--usepkgonly' : y_or_n,	491	'--usepkgonly' : y_or_n,
		492	'--crosscompile' : y_or_n,
492	}	493	}
493		494
494	if _ENABLE_DYN_LINK_MAP:	495	if _ENABLE_DYN_LINK_MAP:
Lines 975-980 Link Here
975	"choices" : true_y_or_n	976	"choices" : true_y_or_n
976	},	977	},
977		978
		979	"--crosscompile": {
		980	"help" : "cross compile mode",
		981	"type" : "choice",
		982	"choices" : true_y_or_n
		983	},
978	}	984	}
979		985
980	if _ENABLE_DYN_LINK_MAP:	986	if _ENABLE_DYN_LINK_MAP:

Lines 75-80 Link Here

(-)portage-2.1.11.17/pym/portage/dbapi/bintree.py (-2 / +5 lines)
75	["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",	75	["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",
76	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",	76	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",
77	"RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",	77	"RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",
		78	"HDEPEND", "CROSS_HDEPEND",
78	])	79	])
79	self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)	80	self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)
80	self._aux_cache = {}	81	self._aux_cache = {}
Lines 304-314 Link Here
304	["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",	305	["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",
305	"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",	306	"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
306	"PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",	307	"PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
307	"BASE_URI"]	308	"BASE_URI", "HDEPEND", "CROSS_HDEPEND"]
308	self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)	309	self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
309	self._pkgindex_use_evaluated_keys = \	310	self._pkgindex_use_evaluated_keys = \
310	("LICENSE", "RDEPEND", "DEPEND",	311	("LICENSE", "RDEPEND", "DEPEND",
311	"PDEPEND", "PROPERTIES", "PROVIDE")	312	"PDEPEND", "PROPERTIES", "PROVIDE", "HDEPEND", "CROSS_HDEPEND")
312	self._pkgindex_header_keys = set([	313	self._pkgindex_header_keys = set([
313	"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",	314	"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
314	"ACCEPT_PROPERTIES", "CBUILD",	315	"ACCEPT_PROPERTIES", "CBUILD",
Lines 330-335 Link Here
330	"SLOT" : "0",	331	"SLOT" : "0",
331	"USE" : "",	332	"USE" : "",
332	"DEFINED_PHASES" : "",	333	"DEFINED_PHASES" : "",
		334	"HDEPEND" : "",
		335	"CROSS_HDEPEND" : "",
333	}	336	}
334	self._pkgindex_inherited_keys = ["CHOST", "repository"]	337	self._pkgindex_inherited_keys = ["CHOST", "repository"]
335		338

Lines 189-195 Link Here

(-)portage-2.1.11.17/pym/portage/dbapi/porttree.py (-1 / +2 lines)
189	self._aux_cache_keys = set(	189	self._aux_cache_keys = set(
190	["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE",	190	["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE",
191	"PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository",	191	"PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository",
192	"RESTRICT", "SLOT", "DEFINED_PHASES", "REQUIRED_USE"])	192	"RESTRICT", "SLOT", "DEFINED_PHASES", "REQUIRED_USE", "HDEPEND",
		193	"CROSS_HDEPEND"])
193		194
194	self._aux_cache = {}	195	self._aux_cache = {}
195	self._broken_ebuilds = set()	196	self._broken_ebuilds = set()

Lines 165-170 Link Here

(-)portage-2.1.11.17/pym/portage/dbapi/vartree.py (+1 lines)
165	"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS",	165	"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS",
166	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND",	166	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND",
167	"repository", "RESTRICT" , "SLOT", "USE", "DEFINED_PHASES",	167	"repository", "RESTRICT" , "SLOT", "USE", "DEFINED_PHASES",
		168	"HDEPEND", "CROSS_HDEPEND",
168	])	169	])
169	self._aux_cache_obj = None	170	self._aux_cache_obj = None
170	self._aux_cache_filename = os.path.join(self._eroot,	171	self._aux_cache_filename = os.path.join(self._eroot,

Lines 414-420 Link Here

(-)portage-2.1.11.17/pym/portage/__init__.py (-2 / +2 lines)
414		414
415	_doebuild_manifest_exempt_depend = 0	415	_doebuild_manifest_exempt_depend = 0
416		416
417	_testing_eapis = frozenset(["4-python", "4-slot-abi", "5_pre2"])	417	_testing_eapis = frozenset(["4-python", "4-slot-abi", "4-hdepend", "5_pre2"])
418	_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1"])	418	_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1"])
419		419
420	def _eapi_is_deprecated(eapi):	420	def _eapi_is_deprecated(eapi):
Lines 472-478 Link Here
472	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',	472	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',
473	'KEYWORDS', 'INHERITED', 'IUSE', 'REQUIRED_USE',	473	'KEYWORDS', 'INHERITED', 'IUSE', 'REQUIRED_USE',
474	'PDEPEND', 'PROVIDE', 'EAPI',	474	'PDEPEND', 'PROVIDE', 'EAPI',
475	'PROPERTIES', 'DEFINED_PHASES', 'UNUSED_05', 'UNUSED_04',	475	'PROPERTIES', 'DEFINED_PHASES', 'HDEPEND', 'CROSS_HDEPEND',
476	'UNUSED_03', 'UNUSED_02', 'UNUSED_01',	476	'UNUSED_03', 'UNUSED_02', 'UNUSED_01',
477	)	477	)
478	auxdbkeylen=len(auxdbkeys)	478	auxdbkeylen=len(auxdbkeys)

Return to bug 317337

Lines 221-226 Link Here

(-)portage-2.1.11.17/bin/ebuild.sh (-8 / +30 lines)
221	local B_DEPEND	221	local B_DEPEND
222	local B_RDEPEND	222	local B_RDEPEND
223	local B_PDEPEND	223	local B_PDEPEND
		224	local B_HDEPEND
		225	local B_CROSS_HDEPEND
224	while [ "$1" ]; do	226	while [ "$1" ]; do
225	location="${ECLASSDIR}/${1}.eclass"	227	location="${ECLASSDIR}/${1}.eclass"
226	olocation=""	228	olocation=""
Lines 263-282 Link Here
263	EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"	265	EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"
264	fi	266	fi
265		267
266	#We need to back up the value of DEPEND and RDEPEND to B_DEPEND and B_RDEPEND	268	#We need to back up the values of DEPEND to B_DEPEND
267	#(if set).. and then restore them after the inherit call.	269	#(if set).. and then restore them after the inherit call.
268		270
269	#turn off glob expansion	271	#turn off glob expansion
270	set -f	272	set -f
271		273
272	# Retain the old data and restore it later.	274	# Retain the old data and restore it later.
273	unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND	275	unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND B_HDEPEND B_CROSS_HDEPEND
274	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"	276	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"
275	[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"	277	[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"
276	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"	278	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"
277	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"	279	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"
278	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"	280	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"
279	unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND	281	[ "${HDEPEND+set}" = set ] && B_HDEPEND="${HDEPEND}"
		282	[ "${CROSS_HDEPEND+set}" = set ] && B_CROSS_HDEPEND="${CROSS_HDEPEND}"
		283	unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND HDEPEND CROSS_HDEPEND
280	#turn on glob expansion	284	#turn on glob expansion
281	set +f	285	set +f
282		286
Lines 292-297 Link Here
292	[ "${DEPEND+set}" = set ] && E_DEPEND+="${E_DEPEND:+ }${DEPEND}"	296	[ "${DEPEND+set}" = set ] && E_DEPEND+="${E_DEPEND:+ }${DEPEND}"
293	[ "${RDEPEND+set}" = set ] && E_RDEPEND+="${E_RDEPEND:+ }${RDEPEND}"	297	[ "${RDEPEND+set}" = set ] && E_RDEPEND+="${E_RDEPEND:+ }${RDEPEND}"
294	[ "${PDEPEND+set}" = set ] && E_PDEPEND+="${E_PDEPEND:+ }${PDEPEND}"	298	[ "${PDEPEND+set}" = set ] && E_PDEPEND+="${E_PDEPEND:+ }${PDEPEND}"
		299	[ "${HDEPEND+set}" = set ] && E_HDEPEND+="${E_HDEPEND:+ }${HDEPEND}"
		300	[ "${CROSS_HDEPEND+set}" = set ] && E_CROSS_HDEPEND+="${E_CROSS_HDEPEND:+ }${CROSS_HDEPEND}"
295		301
296	[ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}"	302	[ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}"
297	[ "${B_IUSE+set}" = set ] \|\| unset IUSE	303	[ "${B_IUSE+set}" = set ] \|\| unset IUSE
Lines 308-313 Link Here
308	[ "${B_PDEPEND+set}" = set ] && PDEPEND="${B_PDEPEND}"	314	[ "${B_PDEPEND+set}" = set ] && PDEPEND="${B_PDEPEND}"
309	[ "${B_PDEPEND+set}" = set ] \|\| unset PDEPEND	315	[ "${B_PDEPEND+set}" = set ] \|\| unset PDEPEND
310		316
		317	[ "${B_HDEPEND+set}" = set ] && HDEPEND="${B_HDEPEND}"
		318	[ "${B_HDEPEND+set}" = set ] \|\| unset HDEPEND
		319
		320	[ "${B_CROSS_HDEPEND+set}" = set ] && CROSS_HDEPEND="${B_CROSS_HDEPEND}"
		321	[ "${B_CROSS_HDEPEND+set}" = set ] \|\| unset CROSS_HDEPEND
		322
311	#turn on glob expansion	323	#turn on glob expansion
312	set +f	324	set +f
313		325
Lines 534-541 Link Here
534	# In order to ensure correct interaction between ebuilds and	546	# In order to ensure correct interaction between ebuilds and
535	# eclasses, they need to be unset before this process of	547	# eclasses, they need to be unset before this process of
536	# interaction begins.	548	# interaction begins.
537	unset EAPI DEPEND RDEPEND PDEPEND INHERITED IUSE REQUIRED_USE \	549	unset EAPI DEPEND RDEPEND PDEPEND HDEPEND CROSS_HDEPEND INHERITED IUSE REQUIRED_USE \
538	ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND	550	ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND \
		551	E_HDEPEND E_CROSS_HDEPEND
539		552
540	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then	553	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then
541	source "$EBUILD" \|\| die "error sourcing ebuild"	554	source "$EBUILD" \|\| die "error sourcing ebuild"
Lines 566-575 Link Here
566	DEPEND+="${DEPEND:+ }${E_DEPEND}"	579	DEPEND+="${DEPEND:+ }${E_DEPEND}"
567	RDEPEND+="${RDEPEND:+ }${E_RDEPEND}"	580	RDEPEND+="${RDEPEND:+ }${E_RDEPEND}"
568	PDEPEND+="${PDEPEND:+ }${E_PDEPEND}"	581	PDEPEND+="${PDEPEND:+ }${E_PDEPEND}"
		582	HDEPEND+="${HDEPEND:+ }${E_HDEPEND}"
		583	CROSS_HDEPEND+="${CROSS_HDEPEND:+ }${E_CROSS_HDEPEND}"
569	REQUIRED_USE+="${REQUIRED_USE:+ }${E_REQUIRED_USE}"	584	REQUIRED_USE+="${REQUIRED_USE:+ }${E_REQUIRED_USE}"
570		585
571	unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND \	586	unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_HDEPEND \
572	__INHERITED_QA_CACHE	587	E_CROSS_HDEPEND __INHERITED_QA_CACHE
573		588
574	# alphabetically ordered by $EBUILD_PHASE value	589	# alphabetically ordered by $EBUILD_PHASE value
575	case "$EAPI" in	590	case "$EAPI" in
Lines 670-678 Link Here
670		685
671	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE	686	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
672	DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI	687	DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI
673	PROPERTIES DEFINED_PHASES UNUSED_05 UNUSED_04	688	PROPERTIES DEFINED_PHASES HDEPEND CROSS_HDEPEND
674	UNUSED_03 UNUSED_02 UNUSED_01"	689	UNUSED_03 UNUSED_02 UNUSED_01"
675		690
		691	case "$EAPI" in
		692	0\|1\|2\|3\|4)
		693	unset HDEPEND
		694	unset CROSS_HDEPEND
		695	;;
		696	esac
		697
676	# The extra $(echo) commands remove newlines.	698	# The extra $(echo) commands remove newlines.
677	if [ -n "${dbkey}" ] ; then	699	if [ -n "${dbkey}" ] ; then
678	> "${dbkey}"	700	> "${dbkey}"