From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B21211381FB for ; Wed, 26 Dec 2012 14:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFFA2E0667; Wed, 26 Dec 2012 14:48:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E396E0667 for ; Wed, 26 Dec 2012 14:48:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 493FB33BF00 for ; Wed, 26 Dec 2012 14:48:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D7B16E543D for ; Wed, 26 Dec 2012 14:48:39 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1356532909.487202f9db043fc140df65f644bbb3d2ce8039db.grobian@gentoo> 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: 487202f9db043fc140df65f644bbb3d2ce8039db X-VCS-Branch: prefix Date: Wed, 26 Dec 2012 14:48:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bad3782c-55fc-4642-86b3-eca739e19e17 X-Archives-Hash: 51ad2d18ef8fc53b904580550a4f6459 commit: 487202f9db043fc140df65f644bbb3d2ce8039db Author: Fabian Groffen gentoo org> AuthorDate: Wed Dec 26 14:41:49 2012 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Dec 26 14:41:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=487202f9 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/_emerge/actions.py bin/dispatch-conf | 2 +- bin/ebuild-helpers/prepstrip | 48 +++++- bin/phase-functions.sh | 3 +- bin/repoman | 39 ++++- bin/xattr-helper.py | 176 ++++++++++++++++++++ man/ebuild.5 | 7 +- man/emerge.1 | 4 +- pym/_emerge/BinpkgFetcher.py | 2 +- pym/_emerge/EbuildMetadataPhase.py | 2 +- pym/_emerge/Package.py | 12 +- pym/_emerge/SpawnProcess.py | 2 +- pym/_emerge/actions.py | 56 ++++-- pym/_emerge/depgraph.py | 9 +- pym/_emerge/help.py | 2 +- pym/_emerge/is_valid_package_atom.py | 2 +- pym/_emerge/main.py | 17 ++- pym/_emerge/resolver/slot_collision.py | 3 + pym/portage/__init__.py | 11 ++ pym/portage/dbapi/_MergeProcess.py | 3 + pym/portage/dbapi/bintree.py | 10 +- pym/portage/dbapi/dep_expand.py | 4 +- pym/portage/dbapi/porttree.py | 9 +- pym/portage/dbapi/vartree.py | 14 +- pym/portage/dep/__init__.py | 2 +- pym/portage/getbinpkg.py | 2 +- .../{_eapi_invalid.py => _metadata_invalid.py} | 0 pym/portage/package/ebuild/config.py | 3 +- pym/portage/package/ebuild/doebuild.py | 39 ++++- pym/portage/package/ebuild/fetch.py | 2 +- pym/portage/package/ebuild/getmaskingstatus.py | 7 + pym/portage/process.py | 2 +- pym/repoman/checks.py | 10 +- runtests.sh | 2 +- 33 files changed, 424 insertions(+), 82 deletions(-)