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 0F0641381F3 for ; Sun, 4 Nov 2012 10:48:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EFBFE0508; Sun, 4 Nov 2012 10:48:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DA677E0508 for ; Sun, 4 Nov 2012 10: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 29E6F33D73B for ; Sun, 4 Nov 2012 10:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C4806E5440 for ; Sun, 4 Nov 2012 10:48:40 +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: <1352026071.9d0d6b98cb2f0287d460f120d18cb9bfa8b6f005.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: 9d0d6b98cb2f0287d460f120d18cb9bfa8b6f005 X-VCS-Branch: prefix Date: Sun, 4 Nov 2012 10:48:40 +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: 29f3fd1e-6357-40b2-97a7-034a0ab3594b X-Archives-Hash: cf8afd352bcbafa342857dfbefb475a1 commit: 9d0d6b98cb2f0287d460f120d18cb9bfa8b6f005 Author: Fabian Groffen gentoo org> AuthorDate: Sun Nov 4 10:47:51 2012 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Nov 4 10:47:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9d0d6b98 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix .gitignore | 1 + bin/isolated-functions.sh | 2 + bin/misc-functions.sh | 19 +++- bin/repoman | 12 ++ cnf/make.globals | 2 +- man/make.conf.5 | 5 + man/repoman.1 | 5 +- pym/_emerge/actions.py | 18 +++ pym/_emerge/depgraph.py | 37 ++++- pym/_emerge/resolver/backtracking.py | 26 +++- pym/portage/const.py | 1 + pym/portage/dbapi/_MergeProcess.py | 6 + pym/portage/dbapi/vartree.py | 162 ++++++++++++++++++-- .../tests/resolver/test_slot_conflict_rebuild.py | 107 +++++++++++++ .../resolver/test_slot_operator_unsatisfied.py | 70 +++++++++ pym/portage/util/_ctypes.py | 47 ++++++ pym/portage/util/_desktop_entry.py | 4 +- pym/repoman/checks.py | 1 + 18 files changed, 496 insertions(+), 29 deletions(-) diff --cc bin/misc-functions.sh index 6d9d1e4,db023e4..d64a61f mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh diff --cc pym/portage/dbapi/vartree.py index 07aac3d,8d908fc..8b71a6e --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@@ -30,11 -30,9 +30,12 @@@ portage.proxy.lazyimport.lazyimport(glo 'portage.util.env_update:env_update', 'portage.util.listdir:dircache,listdir', 'portage.util.movefile:movefile', + 'portage.util._ctypes:find_library,LoadLibrary', 'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry', 'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap', + 'portage.util._dyn_libs.LinkageMapMachO:LinkageMapMachO', + 'portage.util._dyn_libs.LinkageMapPeCoff:LinkageMapPeCoff', + 'portage.util._dyn_libs.LinkageMapXCoff:LinkageMapXCoff', 'portage.util._async.SchedulerInterface:SchedulerInterface', 'portage.util._eventloop.EventLoop:EventLoop', 'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,vercmp,' + \