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 9204F1381FA for ; Tue, 6 May 2014 19:32:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AE7CE07F4; Tue, 6 May 2014 19:32:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F26B2E07F4 for ; Tue, 6 May 2014 19:32:32 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23EA833FB37 for ; Tue, 6 May 2014 19:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C7D6C1818D for ; Tue, 6 May 2014 19:32:30 +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: <1399404728.46900b2cb1099c482740a4dd12d858fb735e1fc1.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: 46900b2cb1099c482740a4dd12d858fb735e1fc1 X-VCS-Branch: prefix Date: Tue, 6 May 2014 19:32:30 +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: 831fd396-e3c8-44c9-981a-e5adc920294f X-Archives-Hash: 0c051f161e576df83e52c0407c8c5dc7 commit: 46900b2cb1099c482740a4dd12d858fb735e1fc1 Author: Fabian Groffen gentoo org> AuthorDate: Tue May 6 19:32:08 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue May 6 19:32:08 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=46900b2c Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix DEVELOPING | 97 ++++++++++------ RELEASE-NOTES | 19 ++- bin/repoman | 9 ++ man/make.conf.5 | 127 ++++++++++----------- pym/_emerge/EbuildBuild.py | 9 +- pym/_emerge/TaskSequence.py | 25 +++- pym/_emerge/actions.py | 5 +- pym/_emerge/depgraph.py | 5 +- pym/_emerge/main.py | 4 + pym/_emerge/resolver/output.py | 5 +- pym/_emerge/resolver/output_helpers.py | 20 +--- pym/_emerge/search.py | 10 +- pym/portage/dbapi/vartree.py | 42 +++---- pym/portage/dep/dep_check.py | 14 --- pym/portage/glsa.py | 1 + pym/portage/localization.py | 12 ++ .../tests/resolver/test_slot_conflict_rebuild.py | 41 +++++++ pym/portage/util/writeable_check.py | 29 +++-- pym/repoman/checks.py | 10 -- pym/repoman/utilities.py | 2 +- 20 files changed, 296 insertions(+), 190 deletions(-)