From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QllXW-00077T-T4 for garchives@archives.gentoo.org; Tue, 26 Jul 2011 17:35:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4C5C21C166; Tue, 26 Jul 2011 17:35:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A1F8021C166 for ; Tue, 26 Jul 2011 17:35:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBD7E1B402C for ; Tue, 26 Jul 2011 17:35:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 37E0B8003D for ; Tue, 26 Jul 2011 17:35:11 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: cbbf2f3507bc425cc95c66b8d4451696370bcf30 Date: Tue, 26 Jul 2011 17:35:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a37cff9c5bdaf35a146fe765d9bf8a68 commit: cbbf2f3507bc425cc95c66b8d4451696370bcf30 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jul 26 16:22:12 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jul 26 16:22:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcbbf2f35 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix NEWS | 6 + man/emerge.1 | 8 +- pym/_emerge/BinpkgFetcher.py | 2 + pym/_emerge/EbuildBuild.py | 1 + pym/_emerge/Scheduler.py | 44 +++--- pym/_emerge/SpawnProcess.py | 14 ++- pym/_emerge/actions.py | 18 ++- pym/_emerge/depgraph.py | 19 +-- pym/_emerge/help.py | 9 +- pym/_emerge/main.py | 13 ++- pym/portage/_sets/dbapi.py | 20 +-- pym/portage/_sets/libs.py | 21 ++- pym/portage/dbapi/vartree.py | 23 ++- pym/portage/util/_dyn_libs/LinkageMapELF.py | 198 +++++++++++++++++++++= ------ 14 files changed, 269 insertions(+), 127 deletions(-) diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py index abd0db9,52670d9..259f45b --- 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 =3D ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] + args =3D [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: