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 1SG7gK-0006De-Qi for garchives@archives.gentoo.org; Fri, 06 Apr 2012 11:50:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20E73E0AA2; Fri, 6 Apr 2012 11:50:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E96EDE0AA2 for ; Fri, 6 Apr 2012 11:50:13 +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 59BCF1B403C for ; Fri, 6 Apr 2012 11:50:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2464EE5403 for ; Fri, 6 Apr 2012 11:50:12 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1333712981.2aee99c23f5917605b86ff28b0c395916fe99ea1.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 2aee99c23f5917605b86ff28b0c395916fe99ea1 X-VCS-Branch: multilib Date: Fri, 6 Apr 2012 11:50:12 +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: fac89698-ba63-4115-a599-e70b577fcd09 X-Archives-Hash: 44429b8d34442b0f1d1e9b460939f3b0 commit: 2aee99c23f5917605b86ff28b0c395916fe99ea1 Author: Thomas Sachau gentoo org> AuthorDate: Fri Apr 6 11:49:41 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Fri Apr 6 11:49:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2aee99c2 Merge commit 'v2.2.0_alpha100' into multilib bin/misc-functions.sh | 6 ++++-- pym/_emerge/Scheduler.py | 6 +++++- pym/_emerge/actions.py | 2 +- pym/_emerge/depgraph.py | 12 +++++++++++- pym/_emerge/resolver/slot_collision.py | 18 +++++++++++++++--- pym/_emerge/unmerge.py | 15 ++++++++++++++- pym/portage/package/ebuild/config.py | 8 ++++---- pym/portage/package/ebuild/doebuild.py | 3 +-- pym/portage/tests/util/test_getconfig.py | 26 ++++++++++++++++++++++++= +- 9 files changed, 80 insertions(+), 16 deletions(-)