Attachment #242691 for bug #317337




	local B_DEPEND
	local B_RDEPEND
	local B_PDEPEND
	local B_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
		[ "${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}"
		unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND HDEPEND
		#turn on glob expansion
		set +f


		[ "${DEPEND+set}"     = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"
		[ "${RDEPEND+set}"    = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"
		[ "${PDEPEND+set}"    = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"
		[ "${HDEPEND+set}"    = set ] && export E_HDEPEND="${E_HDEPEND} ${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

		#turn on glob expansion
		set +f


# when portage is upgrading itself.

READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
	EAPI HDEPEND HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE
	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"

READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \

export SANDBOX_ON="1"
export S=${WORKDIR}/${P}

unset E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_HDEPEND

# Turn of extended glob matching so that g++ doesn't get incorrectly matched.
shopt -u extglob

		# In order to ensure correct interaction between ebuilds and
		# eclasses, they need to be unset before this process of
		# interaction begins.
		unset DEPEND RDEPEND PDEPEND HDEPEND IUSE REQUIRED_USE

		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}"
		REQUIRED_USE="${REQUIRED_USE} ${E_REQUIRED_USE}"
		
		unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_HDEPEND

		# 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 UNUSED_04
			UNUSED_03 UNUSED_02 UNUSED_01"

		#the extra $(echo) commands remove newlines
		[ -n "${EAPI}" ] || EAPI=0
		case "$EAPI" in
			0|1|2|3)
				unset HDEPEND
				;;
		esac

		if [ -n "${dbkey}" ] ; then
			> "${dbkey}"




</section>
<section id='package-ebuild-eapi-4_pre1-metadata'>
<title>Metadata</title>
<section id='package-ebuild-eapi-4_pre1-metadata-dependencies'>
<title>Dependencies</title>
<section id='package-ebuild-eapi-4_pre1-metadata-dependencies-tdepend'>
<title>HDEPEND</title>
<para>
In EAPI 4 or later, DEPEND has been divided into two parts:
DEPEND for build-time target dependencies, and HDEPEND for
build-time host dependencies.
<table><title>Build-Time Dependencies</title>
<tgroup cols='2' align='left' >
<colspec colname='variable'/>
<colspec colname='description'/>
<thead>
<row>
<entry>Variable</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>DEPEND</entry>
<entry>build-time target dependencies</entry>
</row>
<row>
<entry>HDEPEND</entry>
<entry>build-time host dependencies</entry>
</row>
</tbody>
</tgroup>
</table>
This division is designed
specifically to minimize difficulty in the process of
adapting ebuilds that were written for earlier EAPIs,
and therefore it also minimizes the adjustments that
ebuild developers will have to make to the thought
processes involved when writing ebuilds from scratch. In
an environment that does not involve cross-compilation,
HDEPEND behaves the same as DEPEND. When an ebuild is
converted from EAPI 3 or earlier to EAPI 4 or later,
in order to support cross-compilation environments, some
dependencies may need to be migrated to HDEPEND.
</para>
</section>
</section>
<section id='package-ebuild-eapi-4_pre1-metadata-required-use'>
<title>REQUIRED_USE</title>
<para>





.RE
.TP
\fBHDEPEND\fR
In EAPI 4 or later, \fBDEPEND\fR has been divided into two parts:
\fBDEPEND\fR for build-time target dependencies, and
\fBHDEPEND\fR for build-time host dependencies.
This division is designed
specifically to minimize difficulty in the process of
adapting ebuilds that were written for earlier \fBEAPI\fRs, and
therefore it also minimizes the adjustments that ebuild
developers will have to make to the thought processes
involved when writing ebuilds from scratch. In an
environment that does not involve cross-compilation,
\fBHDEPEND\fR behaves the same as \fBDEPEND\fR. When an ebuild is
converted from \fBEAPI 3\fR or earlier to \fBEAPI 4\fR or later,
in order to support cross-compilation environments, some
dependencies may need to be migrated to \fBHDEPEND\fR.
.br
You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR.
.TP
\fBRDEPEND\fR
This should contain a list of all packages that are required for this
program to run (aka runtime depend). If this is not set in \fBEAPI\fR




\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard
all build\-time dependencies of packages for \fBROOT\fR. This option is
only meaningful when used together with \fBROOT\fR and it should not
be enabled under normal circumstances. For ebuilds that have \fBEAPI\fR
3 or earlier, the build\-time dependencies are specified in the
\fBDEPEND\fR variable. For ebuilds that have \fBEAPI 4\fR or later,
the emerge \-\-root\-deps option has no effect
since it is made obsolete by division
between \fBDEPEND\fR and \fBHDEPEND\fR. If \fBEAPI 3\fR or
earlier ebuilds are used in combination with
\fBEAPI 4\fR or later ebuilds, the \-\-root\-deps
behavior will still be applied to the \fBEAPI
3\fR or earlier ebuilds (there is no behavior
change for ebuilds having older \fBEAPI\fRs).
.TP
.BR "\-\-select"[=n]
Add specified packages to the world set (inverse of

Lines 31-37 class Package(Task): Link Here

(-)a/pym/_emerge/Package.py (-1 / +1 lines)
31	"INHERITED", "IUSE", "KEYWORDS",	31	"INHERITED", "IUSE", "KEYWORDS",
32	"LICENSE", "PDEPEND", "PROVIDE", "RDEPEND",	32	"LICENSE", "PDEPEND", "PROVIDE", "RDEPEND",
33	"repository", "PROPERTIES", "RESTRICT", "SLOT", "USE",	33	"repository", "PROPERTIES", "RESTRICT", "SLOT", "USE",
34	"_mtime_", "DEFINED_PHASES", "REQUIRED_USE"]	34	"_mtime_", "DEFINED_PHASES", "REQUIRED_USE", "HDEPEND"]
35		35
36	def __init__(self, **kwargs):	36	def __init__(self, **kwargs):
37	Task.__init__(self, **kwargs)	37	Task.__init__(self, **kwargs)




		removal_action = "remove" in self._dynamic_config.myparams

		edepend={}
		depkeys = ["DEPEND","RDEPEND","PDEPEND","HDEPEND"]
		for k in depkeys:
			edepend[k] = metadata[k]


			"empty" not in self._dynamic_config.myparams:
			edepend["RDEPEND"] = ""
			edepend["PDEPEND"] = ""
		bdeps_optional = False

		if pkg.built and not removal_action:
			if self._frozen_config.myopts.get("--with-bdeps", "n") == "y":

				# could make --with-bdeps=y less effective if it is used to
				# adjust merge order to prevent built_with_use() calls from
				# failing.
				pass
			else:
				# built packages do not have build time dependencies.
				edepend["DEPEND"] = ""
				edepend["HDEPEND"] = ""

		if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":
			edepend["DEPEND"] = ""
			edepend["HDEPEND"] = ""

		if removal_action:
			depend_root = myroot
		else:
			if pkg.metadata['EAPI'] not in ('0', '1', '2', '3'):
				# For ebuilds that have EAPI 4 or later, --root-deps
				# has no effect, since DEPEND has been divided into two parts:
				# DEPEND for build-time target dependencies, and HDEPEND for
				# build-time host dependencies.
				depend_root = myroot
			else:
				depend_root = "/"
				root_deps = self._frozen_config.myopts.get("--root-deps")
				if root_deps is not None:
					if root_deps is True:
						depend_root = myroot
					elif root_deps == "rdeps":
						edepend["DEPEND"] = ""

		deps = (
			("/", edepend["HDEPEND"],
				self._priority(buildtime=(not pkg.built),
				optional=pkg.built),
				pkg.built),
			(depend_root, edepend["DEPEND"],
				self._priority(buildtime=(not pkg.built),
				optional=pkg.built),
				pkg.built),
			(myroot, edepend["RDEPEND"],
				self._priority(runtime=True),




			"ROOT instead of /. If the rdeps argument is given then discard " + \
			"all build-time dependencies of packages for ROOT. This option is " + \
			"only meaningful when used together with ROOT and it should not " + \
			"be enabled under normal circumstances. For ebuilds that have EAPI " + \
			"3 or earlier, the build-time dependencies are specified in the " + \
			"DEPEND variable. For ebuilds that have EAPI 4 or later, " + \
			"the emerge --root-deps option has no effect " + \
			"since it is made obsolete by division " + \
			"between DEPEND and HDEPEND. If EAPI 3 or " + \
			"earlier ebuilds are used in combination with " + \
			"EAPI 4 or later ebuilds, the --root-deps " + \
			"behavior will still be applied to the EAPI " + \
			"3 or earlier ebuilds (there is no behavior " + \
			"change for ebuilds having older EAPIs)."
		for line in wrap(desc, desc_width):
			print(desc_indent + line)
		print()

Lines 419-425 def abssymlink(symlink): Link Here

(-)a/pym/portage/__init__.py (-2 / +2 lines)
419		419
420	_doebuild_manifest_exempt_depend = 0	420	_doebuild_manifest_exempt_depend = 0
421		421
422	_testing_eapis = frozenset()	422	_testing_eapis = frozenset(['4_pre0_tdepend',])
423	_deprecated_eapis = frozenset(["3_pre2", "3_pre1", "2_pre3", "2_pre2", "2_pre1"])	423	_deprecated_eapis = frozenset(["3_pre2", "3_pre1", "2_pre3", "2_pre2", "2_pre1"])
424		424
425	def _eapi_is_deprecated(eapi):	425	def _eapi_is_deprecated(eapi):
Lines 481-487 auxdbkeys = ( Link Here
481	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',	481	'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',
482	'KEYWORDS', 'INHERITED', 'IUSE', 'REQUIRED_USE',	482	'KEYWORDS', 'INHERITED', 'IUSE', 'REQUIRED_USE',
483	'PDEPEND', 'PROVIDE', 'EAPI',	483	'PDEPEND', 'PROVIDE', 'EAPI',
484	'PROPERTIES', 'DEFINED_PHASES', 'UNUSED_05', 'UNUSED_04',	484	'PROPERTIES', 'DEFINED_PHASES', 'HDEPEND', 'UNUSED_04',
485	'UNUSED_03', 'UNUSED_02', 'UNUSED_01',	485	'UNUSED_03', 'UNUSED_02', 'UNUSED_01',
486	)	486	)
487	auxdbkeylen=len(auxdbkeys)	487	auxdbkeylen=len(auxdbkeys)




			["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",
			"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",
			"RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",
			"REQUIRED_USE", "HDEPEND"])
		self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)
		self._aux_cache = {}


				["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",
				"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
				"PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
				"REQUIRED_USE", "HDEPEND"]
			self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
			self._pkgindex_use_evaluated_keys = \
				("LICENSE", "RDEPEND", "DEPEND",

				"SLOT"    : "0",
				"USE"     : "",
				"DEFINED_PHASES" : "",
				"REQUIRED_USE" : "",
				"HDEPEND"        : "",
			}
			self._pkgindex_inherited_keys = ["CHOST", "repository"]
			self._pkgindex_default_header_data = {

Lines 319-325 class portdbapi(dbapi): Link Here

(-)a/pym/portage/dbapi/porttree.py (-1 / +1 lines)
319	self._aux_cache_keys = set(	319	self._aux_cache_keys = set(
320	["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE",	320	["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE",
321	"PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository",	321	"PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository",
322	"RESTRICT", "SLOT", "DEFINED_PHASES", "REQUIRED_USE"])	322	"RESTRICT", "SLOT", "DEFINED_PHASES", "REQUIRED_USE", "HDEPEND"])
323		323
324	self._aux_cache = {}	324	self._aux_cache = {}
325	self._broken_ebuilds = set()	325	self._broken_ebuilds = set()

Lines 850-856 class vardbapi(dbapi): Link Here

(-)a/pym/portage/dbapi/vartree.py (-2 / +1 lines)
850	"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS",	850	"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS",
851	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND",	851	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND",
852	"repository", "RESTRICT" , "SLOT", "USE", "DEFINED_PHASES",	852	"repository", "RESTRICT" , "SLOT", "USE", "DEFINED_PHASES",
853	"REQUIRED_USE"])	853	"REQUIRED_USE", "HDEPEND"])
854	self._aux_cache_obj = None	854	self._aux_cache_obj = None
855	self._aux_cache_filename = os.path.join(self.root,	855	self._aux_cache_filename = os.path.join(self.root,
856	CACHE_PATH, "vdb_metadata.pickle")	856	CACHE_PATH, "vdb_metadata.pickle")
857	-

Return to bug 317337

Lines 1284-1289 inherit() { Link Here

(-)a/bin/ebuild.sh (-8 / +20 lines)
1284	local B_DEPEND	1284	local B_DEPEND
1285	local B_RDEPEND	1285	local B_RDEPEND
1286	local B_PDEPEND	1286	local B_PDEPEND
		1287	local B_HDEPEND
1287	while [ "$1" ]; do	1288	while [ "$1" ]; do
1288	location="${ECLASSDIR}/${1}.eclass"	1289	location="${ECLASSDIR}/${1}.eclass"
1289	olocation=""	1290	olocation=""
Lines 1322-1341 inherit() { Link Here
1322	EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"	1323	EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"
1323	fi	1324	fi
1324		1325
1325	#We need to back up the value of DEPEND and RDEPEND to B_DEPEND and B_RDEPEND	1326	#We need to back up the values of DEPEND to B_DEPEND
1326	#(if set).. and then restore them after the inherit call.	1327	#(if set).. and then restore them after the inherit call.
1327		1328
1328	#turn off glob expansion	1329	#turn off glob expansion
1329	set -f	1330	set -f
1330		1331
1331	# Retain the old data and restore it later.	1332	# Retain the old data and restore it later.
1332	unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND	1333	unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND B_HDEPEND
1333	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"	1334	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"
1334	[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"	1335	[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"
1335	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"	1336	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"
1336	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"	1337	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"
1337	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"	1338	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"
1338	unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND	1339	[ "${HDEPEND+set}" = set ] && B_HDEPEND="${HDEPEND}"
		1340	unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND HDEPEND
1339	#turn on glob expansion	1341	#turn on glob expansion
1340	set +f	1342	set +f
1341		1343
Lines 1351-1356 inherit() { Link Here
1351	[ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"	1353	[ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"
1352	[ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"	1354	[ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"
1353	[ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"	1355	[ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"
		1356	[ "${HDEPEND+set}" = set ] && export E_HDEPEND="${E_HDEPEND} ${HDEPEND}"
1354		1357
1355	[ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}"	1358	[ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}"
1356	[ "${B_IUSE+set}" = set ] \|\| unset IUSE	1359	[ "${B_IUSE+set}" = set ] \|\| unset IUSE
Lines 1367-1372 inherit() { Link Here
1367	[ "${B_PDEPEND+set}" = set ] && PDEPEND="${B_PDEPEND}"	1370	[ "${B_PDEPEND+set}" = set ] && PDEPEND="${B_PDEPEND}"
1368	[ "${B_PDEPEND+set}" = set ] \|\| unset PDEPEND	1371	[ "${B_PDEPEND+set}" = set ] \|\| unset PDEPEND
1369		1372
		1373	[ "${B_HDEPEND+set}" = set ] && HDEPEND="${B_HDEPEND}"
		1374	[ "${B_HDEPEND+set}" = set ] \|\| unset HDEPEND
		1375
1370	#turn on glob expansion	1376	#turn on glob expansion
1371	set +f	1377	set +f
1372		1378
Lines 1626-1632 source_all_bashrcs() { Link Here
1626	# when portage is upgrading itself.	1632	# when portage is upgrading itself.
1627		1633
1628	READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION	1634	READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
1629	EAPI HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE	1635	EAPI HDEPEND HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE
1630	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"	1636	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
1631		1637
1632	READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \	1638	READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \
Lines 1800-1806 preprocess_ebuild_env() { Link Here
1800	export SANDBOX_ON="1"	1806	export SANDBOX_ON="1"
1801	export S=${WORKDIR}/${P}	1807	export S=${WORKDIR}/${P}
1802		1808
1803	unset E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND	1809	unset E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_HDEPEND
1804		1810
1805	# Turn of extended glob matching so that g++ doesn't get incorrectly matched.	1811	# Turn of extended glob matching so that g++ doesn't get incorrectly matched.
1806	shopt -u extglob	1812	shopt -u extglob
Lines 1904-1910 if ! hasq "$EBUILD_PHASE" clean cleanrm ; then Link Here
1904	# In order to ensure correct interaction between ebuilds and	1910	# In order to ensure correct interaction between ebuilds and
1905	# eclasses, they need to be unset before this process of	1911	# eclasses, they need to be unset before this process of
1906	# interaction begins.	1912	# interaction begins.
1907	unset DEPEND RDEPEND PDEPEND IUSE REQUIRED_USE	1913	unset DEPEND RDEPEND PDEPEND HDEPEND IUSE REQUIRED_USE
1908		1914
1909	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then	1915	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then
1910	source "$EBUILD" \|\| die "error sourcing ebuild"	1916	source "$EBUILD" \|\| die "error sourcing ebuild"
Lines 1932-1940 if ! hasq "$EBUILD_PHASE" clean cleanrm ; then Link Here
1932	DEPEND="${DEPEND} ${E_DEPEND}"	1938	DEPEND="${DEPEND} ${E_DEPEND}"
1933	RDEPEND="${RDEPEND} ${E_RDEPEND}"	1939	RDEPEND="${RDEPEND} ${E_RDEPEND}"
1934	PDEPEND="${PDEPEND} ${E_PDEPEND}"	1940	PDEPEND="${PDEPEND} ${E_PDEPEND}"
		1941	HDEPEND="${HDEPEND} ${E_HDEPEND}"
1935	REQUIRED_USE="${REQUIRED_USE} ${E_REQUIRED_USE}"	1942	REQUIRED_USE="${REQUIRED_USE} ${E_REQUIRED_USE}"
1936		1943
1937	unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND	1944	unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_HDEPEND
1938		1945
1939	# alphabetically ordered by $EBUILD_PHASE value	1946	# alphabetically ordered by $EBUILD_PHASE value
1940	case "$EAPI" in	1947	case "$EAPI" in
Lines 2179-2189 ebuild_main() { Link Here
2179		2186
2180	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE	2187	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
2181	DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI	2188	DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI
2182	PROPERTIES DEFINED_PHASES UNUSED_05 UNUSED_04	2189	PROPERTIES DEFINED_PHASES HDEPEND UNUSED_04
2183	UNUSED_03 UNUSED_02 UNUSED_01"	2190	UNUSED_03 UNUSED_02 UNUSED_01"
2184		2191
2185	#the extra $(echo) commands remove newlines	2192	#the extra $(echo) commands remove newlines
2186	[ -n "${EAPI}" ] \|\| EAPI=0	2193	[ -n "${EAPI}" ] \|\| EAPI=0
		2194	case "$EAPI" in
		2195	0\|1\|2\|3)
		2196	unset HDEPEND
		2197	;;
		2198	esac
2187		2199
2188	if [ -n "${dbkey}" ] ; then	2200	if [ -n "${dbkey}" ] ; then
2189	> "${dbkey}"	2201	> "${dbkey}"

Lines 548-557 If no argument is given then build\-time dependencies of packages for Link Here

(-)a/man/emerge.1 (-4 / +11 lines)
548	\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard	548	\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard
549	all build\-time dependencies of packages for \fBROOT\fR. This option is	549	all build\-time dependencies of packages for \fBROOT\fR. This option is
550	only meaningful when used together with \fBROOT\fR and it should not	550	only meaningful when used together with \fBROOT\fR and it should not
551	be enabled under normal circumstances. For currently supported	551	be enabled under normal circumstances. For ebuilds that have \fBEAPI\fR
552	\fBEAPI\fR values, the build-time dependencies are specified in the	552	3 or earlier, the build\-time dependencies are specified in the
553	\fBDEPEND\fR variable. However, behavior may change for new	553	\fBDEPEND\fR variable. For ebuilds that have \fBEAPI 4\fR or later,
554	\fBEAPI\fRs when related extensions are added in the future.	554	the emerge \-\-root\-deps option has no effect
		555	since it is made obsolete by division
		556	between \fBDEPEND\fR and \fBHDEPEND\fR. If \fBEAPI 3\fR or
		557	earlier ebuilds are used in combination with
		558	\fBEAPI 4\fR or later ebuilds, the \-\-root\-deps
		559	behavior will still be applied to the \fBEAPI
		560	3\fR or earlier ebuilds (there is no behavior
		561	change for ebuilds having older \fBEAPI\fRs).
555	.TP	562	.TP
556	.BR "\-\-select"[=n]	563	.BR "\-\-select"[=n]
557	Add specified packages to the world set (inverse of	564	Add specified packages to the world set (inverse of

Lines 967-973 class depgraph(object): Link Here

(-)a/pym/_emerge/depgraph.py (-14 / +26 lines)
967	removal_action = "remove" in self._dynamic_config.myparams	967	removal_action = "remove" in self._dynamic_config.myparams
968		968
969	edepend={}	969	edepend={}
970	depkeys = ["DEPEND","RDEPEND","PDEPEND"]	970	depkeys = ["DEPEND","RDEPEND","PDEPEND","HDEPEND"]
971	for k in depkeys:	971	for k in depkeys:
972	edepend[k] = metadata[k]	972	edepend[k] = metadata[k]
973		973
Lines 977-983 class depgraph(object): Link Here
977	"empty" not in self._dynamic_config.myparams:	977	"empty" not in self._dynamic_config.myparams:
978	edepend["RDEPEND"] = ""	978	edepend["RDEPEND"] = ""
979	edepend["PDEPEND"] = ""	979	edepend["PDEPEND"] = ""
980	bdeps_optional = False
981		980
982	if pkg.built and not removal_action:	981	if pkg.built and not removal_action:
983	if self._frozen_config.myopts.get("--with-bdeps", "n") == "y":	982	if self._frozen_config.myopts.get("--with-bdeps", "n") == "y":
Lines 988-1016 class depgraph(object): Link Here
988	# could make --with-bdeps=y less effective if it is used to	987	# could make --with-bdeps=y less effective if it is used to
989	# adjust merge order to prevent built_with_use() calls from	988	# adjust merge order to prevent built_with_use() calls from
990	# failing.	989	# failing.
991	bdeps_optional = True	990	pass
992	else:	991	else:
993	# built packages do not have build time dependencies.	992	# built packages do not have build time dependencies.
994	edepend["DEPEND"] = ""	993	edepend["DEPEND"] = ""
		994	edepend["HDEPEND"] = ""
995		995
996	if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":	996	if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":
997	edepend["DEPEND"] = ""	997	edepend["DEPEND"] = ""
		998	edepend["HDEPEND"] = ""
998		999
999	if removal_action:	1000	if removal_action:
1000	bdeps_root = myroot	1001	depend_root = myroot
1001	else:	1002	else:
1002	bdeps_root = "/"	1003	if pkg.metadata['EAPI'] not in ('0', '1', '2', '3'):
1003	root_deps = self._frozen_config.myopts.get("--root-deps")	1004	# For ebuilds that have EAPI 4 or later, --root-deps
1004	if root_deps is not None:	1005	# has no effect, since DEPEND has been divided into two parts:
1005	if root_deps is True:	1006	# DEPEND for build-time target dependencies, and HDEPEND for
1006	bdeps_root = myroot	1007	# build-time host dependencies.
1007	elif root_deps == "rdeps":	1008	depend_root = myroot
1008	edepend["DEPEND"] = ""	1009	else:
		1010	depend_root = "/"
		1011	root_deps = self._frozen_config.myopts.get("--root-deps")
		1012	if root_deps is not None:
		1013	if root_deps is True:
		1014	depend_root = myroot
		1015	elif root_deps == "rdeps":
		1016	edepend["DEPEND"] = ""
1009		1017
1010	deps = (	1018	deps = (
1011	(bdeps_root, edepend["DEPEND"],	1019	("/", edepend["HDEPEND"],
1012	self._priority(buildtime=(not bdeps_optional),	1020	self._priority(buildtime=(not pkg.built),
1013	optional=bdeps_optional),	1021	optional=pkg.built),
		1022	pkg.built),
		1023	(depend_root, edepend["DEPEND"],
		1024	self._priority(buildtime=(not pkg.built),
		1025	optional=pkg.built),
1014	pkg.built),	1026	pkg.built),
1015	(myroot, edepend["RDEPEND"],	1027	(myroot, edepend["RDEPEND"],
1016	self._priority(runtime=True),	1028	self._priority(runtime=True),

Lines 601-610 def help(myopts, havecolor=1): Link Here

(-)a/pym/_emerge/help.py (-4 / +11 lines)
601	"ROOT instead of /. If the rdeps argument is given then discard " + \	601	"ROOT instead of /. If the rdeps argument is given then discard " + \
602	"all build-time dependencies of packages for ROOT. This option is " + \	602	"all build-time dependencies of packages for ROOT. This option is " + \
603	"only meaningful when used together with ROOT and it should not " + \	603	"only meaningful when used together with ROOT and it should not " + \
604	"be enabled under normal circumstances. For currently supported " + \	604	"be enabled under normal circumstances. For ebuilds that have EAPI " + \
605	"EAPI values, the build-time dependencies are specified in the " + \	605	"3 or earlier, the build-time dependencies are specified in the " + \
606	"DEPEND variable. However, behavior may change for new " + \	606	"DEPEND variable. For ebuilds that have EAPI 4 or later, " + \
607	"EAPIs when related extensions are added in the future."	607	"the emerge --root-deps option has no effect " + \
		608	"since it is made obsolete by division " + \
		609	"between DEPEND and HDEPEND. If EAPI 3 or " + \
		610	"earlier ebuilds are used in combination with " + \
		611	"EAPI 4 or later ebuilds, the --root-deps " + \
		612	"behavior will still be applied to the EAPI " + \
		613	"3 or earlier ebuilds (there is no behavior " + \
		614	"change for ebuilds having older EAPIs)."
608	for line in wrap(desc, desc_width):	615	for line in wrap(desc, desc_width):
609	print(desc_indent + line)	616	print(desc_indent + line)
610	print()	617	print()

Lines 17-22 The dodoc helper now has a -r option which enables recursion. Link Here

(-)a/doc/package/ebuild/eapi/4.docbook (+44 lines)
17	</section>	17	</section>
18	<section id='package-ebuild-eapi-4_pre1-metadata'>	18	<section id='package-ebuild-eapi-4_pre1-metadata'>
19	<title>Metadata</title>	19	<title>Metadata</title>
		20	<section id='package-ebuild-eapi-4_pre1-metadata-dependencies'>
		21	<title>Dependencies</title>
		22	<section id='package-ebuild-eapi-4_pre1-metadata-dependencies-tdepend'>
		23	<title>HDEPEND</title>
		24	<para>
		25	In EAPI 4 or later, DEPEND has been divided into two parts:
		26	DEPEND for build-time target dependencies, and HDEPEND for
		27	build-time host dependencies.
		28	<table><title>Build-Time Dependencies</title>
		29	<tgroup cols='2' align='left' >
		30	<colspec colname='variable'/>
		31	<colspec colname='description'/>
		32	<thead>
		33	<row>
		34	<entry>Variable</entry>
		35	<entry>Description</entry>
		36	</row>
		37	</thead>
		38	<tbody>
		39	<row>
		40	<entry>DEPEND</entry>
		41	<entry>build-time target dependencies</entry>
		42	</row>
		43	<row>
		44	<entry>HDEPEND</entry>
		45	<entry>build-time host dependencies</entry>
		46	</row>
		47	</tbody>
		48	</tgroup>
		49	</table>
		50	This division is designed
		51	specifically to minimize difficulty in the process of
		52	adapting ebuilds that were written for earlier EAPIs,
		53	and therefore it also minimizes the adjustments that
		54	ebuild developers will have to make to the thought
		55	processes involved when writing ebuilds from scratch. In
		56	an environment that does not involve cross-compilation,
		57	HDEPEND behaves the same as DEPEND. When an ebuild is
		58	converted from EAPI 3 or earlier to EAPI 4 or later,
		59	in order to support cross-compilation environments, some
		60	dependencies may need to be migrated to HDEPEND.
		61	</para>
		62	</section>
		63	</section>
20	<section id='package-ebuild-eapi-4_pre1-metadata-required-use'>	64	<section id='package-ebuild-eapi-4_pre1-metadata-required-use'>
21	<title>REQUIRED_USE</title>	65	<title>REQUIRED_USE</title>
22	<para>	66	<para>

Lines 415-420 will use that to consider the dependency satisfied. Link Here

(-)a/man/ebuild.5 (+18 lines)
415		415
416	.RE	416	.RE
417	.TP	417	.TP
		418	\fBHDEPEND\fR
		419	In EAPI 4 or later, \fBDEPEND\fR has been divided into two parts:
		420	\fBDEPEND\fR for build-time target dependencies, and
		421	\fBHDEPEND\fR for build-time host dependencies.
		422	This division is designed
		423	specifically to minimize difficulty in the process of
		424	adapting ebuilds that were written for earlier \fBEAPI\fRs, and
		425	therefore it also minimizes the adjustments that ebuild
		426	developers will have to make to the thought processes
		427	involved when writing ebuilds from scratch. In an
		428	environment that does not involve cross-compilation,
		429	\fBHDEPEND\fR behaves the same as \fBDEPEND\fR. When an ebuild is
		430	converted from \fBEAPI 3\fR or earlier to \fBEAPI 4\fR or later,
		431	in order to support cross-compilation environments, some
		432	dependencies may need to be migrated to \fBHDEPEND\fR.
		433	.br
		434	You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR.
		435	.TP
418	\fBRDEPEND\fR	436	\fBRDEPEND\fR
419	This should contain a list of all packages that are required for this	437	This should contain a list of all packages that are required for this
420	program to run (aka runtime depend). If this is not set in \fBEAPI\fR	438	program to run (aka runtime depend). If this is not set in \fBEAPI\fR

Lines 55-61 class bindbapi(fakedbapi): Link Here

(-)a/pym/portage/dbapi/bintree.py (-3 / +4 lines)
55	["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",	55	["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",
56	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",	56	"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",
57	"RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",	57	"RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",
58	"REQUIRED_USE"])	58	"REQUIRED_USE", "HDEPEND"])
59	self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)	59	self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)
60	self._aux_cache = {}	60	self._aux_cache = {}
61		61
Lines 226-232 class binarytree(object): Link Here
226	["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",	226	["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",
227	"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",	227	"IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
228	"PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",	228	"PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
229	"REQUIRED_USE"]	229	"REQUIRED_USE", "HDEPEND"]
230	self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)	230	self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
231	self._pkgindex_use_evaluated_keys = \	231	self._pkgindex_use_evaluated_keys = \
232	("LICENSE", "RDEPEND", "DEPEND",	232	("LICENSE", "RDEPEND", "DEPEND",
Lines 252-258 class binarytree(object): Link Here
252	"SLOT" : "0",	252	"SLOT" : "0",
253	"USE" : "",	253	"USE" : "",
254	"DEFINED_PHASES" : "",	254	"DEFINED_PHASES" : "",
255	"REQUIRED_USE" : ""	255	"REQUIRED_USE" : "",
		256	"HDEPEND" : "",
256	}	257	}
257	self._pkgindex_inherited_keys = ["CHOST", "repository"]	258	self._pkgindex_inherited_keys = ["CHOST", "repository"]
258	self._pkgindex_default_header_data = {	259	self._pkgindex_default_header_data = {