Attachment #219959 for bug #303567

Lines 71-76 Link Here

(-)pym/portage/const.py (+1 lines)
71	REPO_NAME_LOC = "profiles" + "/" + REPO_NAME_FILE	71	REPO_NAME_LOC = "profiles" + "/" + REPO_NAME_FILE
72		72
73	PORTAGE_PACKAGE_ATOM = "sys-apps/portage"	73	PORTAGE_PACKAGE_ATOM = "sys-apps/portage"
		74	LIBC_PACKAGE_ATOM = "virtual/libc"
74		75
75	INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN",	76	INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN",
76	"FEATURES", "ACCEPT_KEYWORDS",	77	"FEATURES", "ACCEPT_KEYWORDS",

Lines 3335-3340 Link Here

(-)pym/_emerge/depgraph.py (+9 lines)
3335	runtime_deps.update(atom for atom in atoms \	3335	runtime_deps.update(atom for atom in atoms \
3336	if not atom.blocker)	3336	if not atom.blocker)
3337		3337
		3338	# Merge libc asap, in order to account for implicit
		3339	# dependencies. See bug #303567.
		3340	libc_pkg = self._dynamic_config.mydbapi[running_root].match_pkgs(
		3341	portage.const.LIBC_PACKAGE_ATOM)
		3342	if libc_pkg:
		3343	libc_pkg = libc_pkg[0]
		3344	if libc_pkg.operation == 'merge':
		3345	asap_nodes.append(libc_pkg)
		3346
3338	def gather_deps(ignore_priority, mergeable_nodes,	3347	def gather_deps(ignore_priority, mergeable_nodes,
3339	selected_nodes, node):	3348	selected_nodes, node):
3340	"""	3349	"""

Return to bug 303567