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 1R7APF-00015O-0q for garchives@archives.gentoo.org; Fri, 23 Sep 2011 18:23:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDDAF21C095; Fri, 23 Sep 2011 18:23:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A6ED721C095 for ; Fri, 23 Sep 2011 18:23:11 +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 2E6C21B4005 for ; Fri, 23 Sep 2011 18:23:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8F57B80042 for ; Fri, 23 Sep 2011 18:23:10 +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: <0f77e9560148a3671e03e180af32c22a2636e09c.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: 0f77e9560148a3671e03e180af32c22a2636e09c Date: Fri, 23 Sep 2011 18:23:10 +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: 9afef8cb38653d35bb03f1452484aa8b commit: 0f77e9560148a3671e03e180af32c22a2636e09c Author: Fabian Groffen gentoo org> AuthorDate: Fri Sep 23 18:06:06 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Sep 23 18:06:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0f77e956 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix bin/misc-functions.sh | 15 + bin/portageq | 46 +- bin/repoman | 2 +- man/emerge.1 | 13 +- pym/_emerge/create_depgraph_params.py | 16 + pym/_emerge/depgraph.py | 100 ++- pym/_emerge/help.py | 814 +-------------= ------ pym/_emerge/main.py | 20 +- pym/portage/dbapi/porttree.py | 133 ++-- pym/portage/dep/__init__.py | 9 + pym/portage/package/ebuild/doebuild.py | 3 +- pym/portage/package/ebuild/fetch.py | 1 - .../tests/resolver/test_circular_choices.py | 61 ++ pym/portage/tests/resolver/test_complete_graph.py | 66 ++ 14 files changed, 385 insertions(+), 914 deletions(-) diff --cc bin/misc-functions.sh index c516520,a54ce2b..cf72dee mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh diff --cc pym/portage/package/ebuild/doebuild.py index 1133027,9939e9c..62750e6 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@@ -1433,10 -1393,10 +1433,11 @@@ _post_phase_cmds =3D=20 =20 "install" : [ "install_qa_check", - "install_symlink_html_docs"], + "install_symlink_html_docs", + "install_hooks"], =20 "preinst" : [ + "preinst_aix", "preinst_sfperms", "preinst_selinux_labels", "preinst_suid_scan",