Attachment #242403 for bug #317337




	local B_DEPEND
	local B_RDEPEND
	local B_PDEPEND
	local B_TDEPEND
	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_TDEPEND
		[ "${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}"
		[ "${TDEPEND+set}"    = set ] && B_TDEPEND="${TDEPEND}"
		unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND TDEPEND
		#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}"
		[ "${TDEPEND+set}"    = set ] && export E_TDEPEND="${E_TDEPEND} ${TDEPEND}"

		[ "${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_TDEPEND+set}"  = set ] && TDEPEND="${B_TDEPEND}"
		[ "${B_TDEPEND+set}"  = set ] || unset TDEPEND

		#turn on glob expansion
		set +f


# when portage is upgrading itself.

READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
	EAPI TDEPEND 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_TDEPEND

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

		# 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 TDEPEND 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 TDEPEND
				unset REQUIRED_USE
				;;
		esac




</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>TDEPEND</title>
<para>
In EAPI 4 or later, DEPEND has been divided into two parts:
DEPEND for build-time host dependencies, and TDEPEND for
build-time target 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 host dependencies</entry>
</row>
<row>
<entry>TDEPEND</entry>
<entry>build-time target 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,
TDEPEND 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 TDEPEND.
</para>
</section>
</section>
<section id='package-ebuild-eapi-4_pre1-metadata-required-use'>
<title>REQUIRED_USE</title>
<para>





.RE
.TP
\fBTDEPEND\fR
In EAPI 4 or later, \fBDEPEND\fR has been divided into two parts:
\fBDEPEND\fR for build-time host dependencies, and
\fBTDEPEND\fR for build-time target 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,
\fBTDEPEND\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 \fBTDEPEND\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 \fBTDEPEND\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", "TDEPEND"]
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","TDEPEND"]
		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["TDEPEND"] = ""

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

		if removal_action:
			depend_root = myroot
		else:
			depend_root = "/"
			if pkg.metadata['EAPI'] 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 host dependencies, and TDEPEND for
				# build-time target dependencies.

				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 = (
			(depend_root, edepend["DEPEND"],
				self._priority(buildtime=(not pkg.built),
				optional=pkg.built),
				pkg.built),
			(myroot, edepend["TDEPEND"],
				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 TDEPEND. 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 418-424 def abssymlink(symlink): Link Here

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




			["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",
			"LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",
			"RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",
			"REQUIRED_USE", "TDEPEND"])
		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", "TDEPEND"]
			self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
			self._pkgindex_use_evaluated_keys = \
				("LICENSE", "RDEPEND", "DEPEND",

				"SLOT"    : "0",
				"USE"     : "",
				"DEFINED_PHASES" : "",
				"REQUIRED_USE" : "",
				"TDEPEND"        : "",
			}
			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", "TDEPEND"])
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", "TDEPEND"])
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 1264-1269 inherit() { Link Here

(-)a/bin/ebuild.sh (-8 / +16 lines)
1264	local B_DEPEND	1264	local B_DEPEND
1265	local B_RDEPEND	1265	local B_RDEPEND
1266	local B_PDEPEND	1266	local B_PDEPEND
		1267	local B_TDEPEND
1267	while [ "$1" ]; do	1268	while [ "$1" ]; do
1268	location="${ECLASSDIR}/${1}.eclass"	1269	location="${ECLASSDIR}/${1}.eclass"
1269	olocation=""	1270	olocation=""
Lines 1302-1321 inherit() { Link Here
1302	EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"	1303	EBUILD_OVERLAY_ECLASSES="${EBUILD_OVERLAY_ECLASSES} ${location}"
1303	fi	1304	fi
1304		1305
1305	#We need to back up the value of DEPEND and RDEPEND to B_DEPEND and B_RDEPEND	1306	#We need to back up the values of DEPEND to B_DEPEND
1306	#(if set).. and then restore them after the inherit call.	1307	#(if set).. and then restore them after the inherit call.
1307		1308
1308	#turn off glob expansion	1309	#turn off glob expansion
1309	set -f	1310	set -f
1310		1311
1311	# Retain the old data and restore it later.	1312	# Retain the old data and restore it later.
1312	unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND	1313	unset B_IUSE B_REQUIRED_USE B_DEPEND B_RDEPEND B_PDEPEND B_TDEPEND
1313	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"	1314	[ "${IUSE+set}" = set ] && B_IUSE="${IUSE}"
1314	[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"	1315	[ "${REQUIRED_USE+set}" = set ] && B_REQUIRED_USE="${REQUIRED_USE}"
1315	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"	1316	[ "${DEPEND+set}" = set ] && B_DEPEND="${DEPEND}"
1316	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"	1317	[ "${RDEPEND+set}" = set ] && B_RDEPEND="${RDEPEND}"
1317	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"	1318	[ "${PDEPEND+set}" = set ] && B_PDEPEND="${PDEPEND}"
1318	unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND	1319	[ "${TDEPEND+set}" = set ] && B_TDEPEND="${TDEPEND}"
		1320	unset IUSE REQUIRED_USE DEPEND RDEPEND PDEPEND TDEPEND
1319	#turn on glob expansion	1321	#turn on glob expansion
1320	set +f	1322	set +f
1321		1323
Lines 1331-1336 inherit() { Link Here
1331	[ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"	1333	[ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"
1332	[ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"	1334	[ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"
1333	[ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"	1335	[ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"
		1336	[ "${TDEPEND+set}" = set ] && export E_TDEPEND="${E_TDEPEND} ${TDEPEND}"
1334		1337
1335	[ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}"	1338	[ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}"
1336	[ "${B_IUSE+set}" = set ] \|\| unset IUSE	1339	[ "${B_IUSE+set}" = set ] \|\| unset IUSE
Lines 1347-1352 inherit() { Link Here
1347	[ "${B_PDEPEND+set}" = set ] && PDEPEND="${B_PDEPEND}"	1350	[ "${B_PDEPEND+set}" = set ] && PDEPEND="${B_PDEPEND}"
1348	[ "${B_PDEPEND+set}" = set ] \|\| unset PDEPEND	1351	[ "${B_PDEPEND+set}" = set ] \|\| unset PDEPEND
1349		1352
		1353	[ "${B_TDEPEND+set}" = set ] && TDEPEND="${B_TDEPEND}"
		1354	[ "${B_TDEPEND+set}" = set ] \|\| unset TDEPEND
		1355
1350	#turn on glob expansion	1356	#turn on glob expansion
1351	set +f	1357	set +f
1352		1358
Lines 1606-1612 source_all_bashrcs() { Link Here
1606	# when portage is upgrading itself.	1612	# when portage is upgrading itself.
1607		1613
1608	READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION	1614	READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
1609	EAPI HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE	1615	EAPI TDEPEND HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE
1610	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"	1616	PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
1611		1617
1612	READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \	1618	READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \
Lines 1780-1786 preprocess_ebuild_env() { Link Here
1780	export SANDBOX_ON="1"	1786	export SANDBOX_ON="1"
1781	export S=${WORKDIR}/${P}	1787	export S=${WORKDIR}/${P}
1782		1788
1783	unset E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND	1789	unset E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_TDEPEND
1784		1790
1785	# Turn of extended glob matching so that g++ doesn't get incorrectly matched.	1791	# Turn of extended glob matching so that g++ doesn't get incorrectly matched.
1786	shopt -u extglob	1792	shopt -u extglob
Lines 1884-1890 if ! hasq "$EBUILD_PHASE" clean cleanrm ; then Link Here
1884	# In order to ensure correct interaction between ebuilds and	1890	# In order to ensure correct interaction between ebuilds and
1885	# eclasses, they need to be unset before this process of	1891	# eclasses, they need to be unset before this process of
1886	# interaction begins.	1892	# interaction begins.
1887	unset DEPEND RDEPEND PDEPEND IUSE REQUIRED_USE	1893	unset DEPEND RDEPEND PDEPEND TDEPEND IUSE REQUIRED_USE
1888		1894
1889	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then	1895	if [[ $PORTAGE_DEBUG != 1 \|\| ${-/x/} != $- ]] ; then
1890	source "$EBUILD" \|\| die "error sourcing ebuild"	1896	source "$EBUILD" \|\| die "error sourcing ebuild"
Lines 1912-1920 if ! hasq "$EBUILD_PHASE" clean cleanrm ; then Link Here
1912	DEPEND="${DEPEND} ${E_DEPEND}"	1918	DEPEND="${DEPEND} ${E_DEPEND}"
1913	RDEPEND="${RDEPEND} ${E_RDEPEND}"	1919	RDEPEND="${RDEPEND} ${E_RDEPEND}"
1914	PDEPEND="${PDEPEND} ${E_PDEPEND}"	1920	PDEPEND="${PDEPEND} ${E_PDEPEND}"
		1921	TDEPEND="${TDEPEND} ${E_TDEPEND}"
1915	REQUIRED_USE="${REQUIRED_USE} ${E_REQUIRED_USE}"	1922	REQUIRED_USE="${REQUIRED_USE} ${E_REQUIRED_USE}"
1916		1923
1917	unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND	1924	unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND E_TDEPEND
1918		1925
1919	# alphabetically ordered by $EBUILD_PHASE value	1926	# alphabetically ordered by $EBUILD_PHASE value
1920	case "$EAPI" in	1927	case "$EAPI" in
Lines 2159-2171 ebuild_main() { Link Here
2159		2166
2160	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE	2167	auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
2161	DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI	2168	DESCRIPTION KEYWORDS INHERITED IUSE REQUIRED_USE PDEPEND PROVIDE EAPI
2162	PROPERTIES DEFINED_PHASES UNUSED_05 UNUSED_04	2169	PROPERTIES DEFINED_PHASES TDEPEND UNUSED_04
2163	UNUSED_03 UNUSED_02 UNUSED_01"	2170	UNUSED_03 UNUSED_02 UNUSED_01"
2164		2171
2165	#the extra $(echo) commands remove newlines	2172	#the extra $(echo) commands remove newlines
2166	[ -n "${EAPI}" ] \|\| EAPI=0	2173	[ -n "${EAPI}" ] \|\| EAPI=0
2167	case "$EAPI" in	2174	case "$EAPI" in
2168	0\|1\|2\|3)	2175	0\|1\|2\|3)
		2176	unset TDEPEND
2169	unset REQUIRED_USE	2177	unset REQUIRED_USE
2170	;;	2178	;;
2171	esac	2179	esac

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 \fBTDEPEND\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 1137-1143 class depgraph(object): Link Here

(-)a/pym/_emerge/depgraph.py (-14 / +25 lines)
1137	removal_action = "remove" in self._dynamic_config.myparams	1137	removal_action = "remove" in self._dynamic_config.myparams
1138		1138
1139	edepend={}	1139	edepend={}
1140	depkeys = ["DEPEND","RDEPEND","PDEPEND"]	1140	depkeys = ["DEPEND","RDEPEND","PDEPEND","TDEPEND"]
1141	for k in depkeys:	1141	for k in depkeys:
1142	edepend[k] = metadata[k]	1142	edepend[k] = metadata[k]
1143		1143
Lines 1147-1153 class depgraph(object): Link Here
1147	"empty" not in self._dynamic_config.myparams:	1147	"empty" not in self._dynamic_config.myparams:
1148	edepend["RDEPEND"] = ""	1148	edepend["RDEPEND"] = ""
1149	edepend["PDEPEND"] = ""	1149	edepend["PDEPEND"] = ""
1150	bdeps_optional = False
1151		1150
1152	if pkg.built and not removal_action:	1151	if pkg.built and not removal_action:
1153	if self._frozen_config.myopts.get("--with-bdeps", "n") == "y":	1152	if self._frozen_config.myopts.get("--with-bdeps", "n") == "y":
Lines 1158-1186 class depgraph(object): Link Here
1158	# could make --with-bdeps=y less effective if it is used to	1157	# could make --with-bdeps=y less effective if it is used to
1159	# adjust merge order to prevent built_with_use() calls from	1158	# adjust merge order to prevent built_with_use() calls from
1160	# failing.	1159	# failing.
1161	bdeps_optional = True	1160	pass
1162	else:	1161	else:
1163	# built packages do not have build time dependencies.	1162	# built packages do not have build time dependencies.
1164	edepend["DEPEND"] = ""	1163	edepend["DEPEND"] = ""
		1164	edepend["TDEPEND"] = ""
1165		1165
1166	if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":	1166	if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n":
1167	edepend["DEPEND"] = ""	1167	edepend["DEPEND"] = ""
		1168	edepend["TDEPEND"] = ""
1168		1169
1169	if removal_action:	1170	if removal_action:
1170	bdeps_root = myroot	1171	depend_root = myroot
1171	else:	1172	else:
1172	bdeps_root = "/"	1173	depend_root = "/"
1173	root_deps = self._frozen_config.myopts.get("--root-deps")	1174	if pkg.metadata['EAPI'] in ('0', '1', '2', '3'):
1174	if root_deps is not None:	1175	# For ebuilds that have EAPI 4 or later, --root-deps
1175	if root_deps is True:	1176	# has no effect, since DEPEND has been divided into two parts:
1176	bdeps_root = myroot	1177	# DEPEND for build-time host dependencies, and TDEPEND for
1177	elif root_deps == "rdeps":	1178	# build-time target dependencies.
1178	edepend["DEPEND"] = ""	1179
		1180	root_deps = self._frozen_config.myopts.get("--root-deps")
		1181	if root_deps is not None:
		1182	if root_deps is True:
		1183	depend_root = myroot
		1184	elif root_deps == "rdeps":
		1185	edepend["DEPEND"] = ""
1179		1186
1180	deps = (	1187	deps = (
1181	(bdeps_root, edepend["DEPEND"],	1188	(depend_root, edepend["DEPEND"],
1182	self._priority(buildtime=(not bdeps_optional),	1189	self._priority(buildtime=(not pkg.built),
1183	optional=bdeps_optional),	1190	optional=pkg.built),
		1191	pkg.built),
		1192	(myroot, edepend["TDEPEND"],
		1193	self._priority(buildtime=(not pkg.built),
		1194	optional=pkg.built),
1184	pkg.built),	1195	pkg.built),
1185	(myroot, edepend["RDEPEND"],	1196	(myroot, edepend["RDEPEND"],
1186	self._priority(runtime=True),	1197	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 TDEPEND. 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>TDEPEND</title>
		24	<para>
		25	In EAPI 4 or later, DEPEND has been divided into two parts:
		26	DEPEND for build-time host dependencies, and TDEPEND for
		27	build-time target 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 host dependencies</entry>
		42	</row>
		43	<row>
		44	<entry>TDEPEND</entry>
		45	<entry>build-time target 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	TDEPEND 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 TDEPEND.
		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	\fBTDEPEND\fR
		419	In EAPI 4 or later, \fBDEPEND\fR has been divided into two parts:
		420	\fBDEPEND\fR for build-time host dependencies, and
		421	\fBTDEPEND\fR for build-time target 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	\fBTDEPEND\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 \fBTDEPEND\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", "TDEPEND"])
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", "TDEPEND"]
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	"TDEPEND" : "",
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 = {