From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 26 Jul 2011 16:22:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cbbf2f3507bc425cc95c66b8d4451696370bcf30;p=portage.git

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
---

cbbf2f3507bc425cc95c66b8d4451696370bcf30
diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py
index abd0db97e,52670d98d..259f45b42
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@@ -220,9 -232,9 +233,9 @@@ class LinkageMapELF(object)
  					# already represented via the preserve_paths
  					# parameter.
  					continue
- 				plibs.update(items)
+ 				plibs.update((x, cpv) for x in items)
  		if plibs:
 -			args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
 +			args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
  			args.extend(os.path.join(root, x.lstrip("." + os.sep)) \
  				for x in plibs)
  			try: