From 361706c50ca591c22ac3ca5fca6450a7cbe510d2 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Apr 2013 21:00:52 -0700
Subject: [PATCH] Use non-greedy findConsumers for bug #467896.

This fixes the preserve-libs display and @preserved-rebuild to omit
library consumers that are satisfied by alternative providers.
---
 pym/portage/_sets/libs.py                      |  9 +++++----
 pym/portage/util/_dyn_libs/LinkageMapELF.py    | 18 ++++++++++++------
 .../util/_dyn_libs/display_preserved_libs.py   |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/pym/portage/_sets/libs.py b/pym/portage/_sets/libs.py
index a6433e855..022e076f5 100644
--- a/pym/portage/_sets/libs.py
+++ b/pym/portage/_sets/libs.py
@@ -1,4 +1,4 @@
-# Copyright 2007-2012 Gentoo Foundation
+# Copyright 2007-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -49,7 +49,8 @@ class LibraryFileConsumerSet(LibraryConsumerSet):
 	def load(self):
 		consumers = set()
 		for lib in self.files:
-			consumers.update(self.dbapi._linkmap.findConsumers(lib))
+			consumers.update(
+				self.dbapi._linkmap.findConsumers(lib, greedy=False))
 
 		if not consumers:
 			return
@@ -77,10 +78,10 @@ class PreservedLibraryConsumerSet(LibraryConsumerSet):
 				for lib in libs:
 					if self.debug:
 						print(lib)
-						for x in sorted(self.dbapi._linkmap.findConsumers(lib)):
+						for x in sorted(self.dbapi._linkmap.findConsumers(lib, greedy=False)):
 							print("    ", x)
 						print("-"*40)
-					consumers.update(self.dbapi._linkmap.findConsumers(lib))
+					consumers.update(self.dbapi._linkmap.findConsumers(lib, greedy=False))
 			# Don't rebuild packages just because they contain preserved
 			# libs that happen to be consumers of other preserved libs.
 			for libs in plib_dict.values():
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index 8d0c09dec..3920f9487 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -678,7 +678,7 @@ class LinkageMapELF(object):
 						rValue[soname].add(provider)
 		return rValue
 
-	def findConsumers(self, obj, exclude_providers=None):
+	def findConsumers(self, obj, exclude_providers=None, greedy=True):
 		"""
 		Find consumers of an object or object key.
 
@@ -715,6 +715,9 @@ class LinkageMapELF(object):
 			'/usr/lib/libssl.so.0.9.8'), and return True if the library is
 			owned by a provider which is planned for removal.
 		@type exclude_providers: collection
+		@param greedy: If True, then include consumers that are satisfied
+		by alternative providers, otherwise omit them. Default is True.
+		@type greedy: Boolean
 		@rtype: set of strings (example: set(['/bin/foo', '/usr/bin/bar']))
 		@return: The return value is a soname -> set-of-library-paths, where
 		set-of-library-paths satisfy soname.
@@ -769,16 +772,19 @@ class LinkageMapELF(object):
 		defpath_keys = set(self._path_key(x) for x in self._defpath)
 		satisfied_consumer_keys = set()
 		if soname_node is not None:
-			if exclude_providers is not None:
+			if exclude_providers is not None or not greedy:
 				relevant_dir_keys = set()
 				for provider_key in soname_node.providers:
+					if not greedy and provider_key == obj_key:
+						continue
 					provider_objs = self._obj_properties[provider_key].alt_paths
 					for p in provider_objs:
 						provider_excluded = False
-						for excluded_provider_isowner in exclude_providers:
-							if excluded_provider_isowner(p):
-								provider_excluded = True
-								break
+						if exclude_providers is not None:
+							for excluded_provider_isowner in exclude_providers:
+								if excluded_provider_isowner(p):
+									provider_excluded = True
+									break
 						if not provider_excluded:
 							# This provider is not excluded. It will
 							# satisfy a consumer of this soname if it
diff --git a/pym/portage/util/_dyn_libs/display_preserved_libs.py b/pym/portage/util/_dyn_libs/display_preserved_libs.py
index 238274f2a..b16478d2b 100644
--- a/pym/portage/util/_dyn_libs/display_preserved_libs.py
+++ b/pym/portage/util/_dyn_libs/display_preserved_libs.py
@@ -31,7 +31,7 @@ def display_preserved_libs(vardb):
 				if f in consumer_map:
 					continue
 				consumers = []
-				for c in linkmap.findConsumers(f):
+				for c in linkmap.findConsumers(f, greedy=False):
 					# Filter out any consumers that are also preserved libs
 					# belonging to the same package as the provider.
 					if linkmap._obj_key(c) not in internal_plib_keys:
-- 
2.26.2