Attachment #94397: Rewrite of || () handling in dep_zapdeps for bug #143908

	# We're at a ( || atom ... ) type level

	# We're at a ( || atom ... ) type level and need to make a choice

	target = None

	# Our preference order is for an the first item that:

	# a) contains all unmasked packages with the same key as installed packages

	# b) contains all unmasked packages

	# c) contains masked installed packages

	# d) is the first item

	preferred = []

	other = []

	# Alias the tree we'll be checking availability against

	if use_binaries:

		mydbapi = trees[myroot]["bintree"].dbapi

	else:

		mydbapi = trees[myroot]["porttree"].dbapi

	# Sort the deps into preferred (installed) and other

	# with values of [[required_atom], availablility]

		if not missing_atoms:

		all_installed = True

			if isinstance(dep, list):

		for atom in atoms:

				return atoms  # Sorted out by the recursed dep_zapdeps call

			if not trees[myroot]["vartree"].dbapi.match(dep_getkey(atom)):

			else:

				all_installed = False

				target = dep_getkey(dep) # An installed package that's not yet in the graph

		if not target:

		all_available = True

			if use_binaries:

		for atom in atoms:

				missing_atoms = [atom for atom in atoms if not trees[myroot]["bintree"].dbapi.match(atom)]

			if not mydbapi.match(atom):

			else:

				all_available = False

				missing_atoms = [atom for atom in atoms if not trees[myroot]["porttree"].dbapi.xmatch("match-visible", atom)]

				break

			if not missing_atoms:

				target = (dep, satisfied)

		if all_installed:

			preferred.append([atoms, all_available])

	if not target:

		if isinstance(deps[0], list):

			return dep_zapdeps(deps[0], satisfieds[0], myroot,

				use_binaries=use_binaries, trees=trees)

			return [deps[0]]

			other.append([atoms, all_available])

	if isinstance(target, tuple): # Nothing matching installed

	# preferred now contains a) and c) from the order above with

		if isinstance(target[0], list): # ... and the first available was a sublist

	# the masked flag differentiating the two. other contains b)

			return dep_zapdeps(target[0], target[1], myroot,

	# and d) so adding other to preferred will give us a suitable

				use_binaries=use_binaries, trees=trees)

	# list to iterate over.

		else: # ... and the first available was a single atom

	preferred.extend(other)

			target = dep_getkey(target[0])

	for allow_masked in (False, True):

		for (atoms, all_available) in preferred:

			if all_available or allow_masked:

				return atoms

	relevant_atoms = [dep for dep in deps if not isinstance(dep, list) and dep_getkey(dep) == target]

	assert(False) # This point should not be reachable