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 1QPen2-0005f1-8l for garchives@archives.gentoo.org; Thu, 26 May 2011 17:56:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D064C1C199; Thu, 26 May 2011 17:56:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8BA9E1C199 for ; Thu, 26 May 2011 17:56:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 176071BC013 for ; Thu, 26 May 2011 17:56:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6BFC480505 for ; Thu, 26 May 2011 17:55:59 +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: <1a3d8d5a2faefc40233fcaffbbc82e6f5967f7c6.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: 1a3d8d5a2faefc40233fcaffbbc82e6f5967f7c6 Date: Thu, 26 May 2011 17:55:59 +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: 54f6751da6108a350e52e0f2790449a8 commit: 1a3d8d5a2faefc40233fcaffbbc82e6f5967f7c6 Author: Thomas Sachau gentoo org> AuthorDate: Thu May 26 17:55:15 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Thu May 26 17:55:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1a3d8d5a Merge commit 'v2.2.0_alpha36' into multilib bin/ebuild.sh | 7 + bin/regenworld | 6 +- bin/repoman | 2 +- man/make.conf.5 | 3 + pym/_emerge/Blocker.py | 12 +- pym/_emerge/DepPriority.py | 2 +- pym/_emerge/DepPrioritySatisfiedRange.py | 31 +-- pym/_emerge/EbuildMerge.py | 3 +- pym/_emerge/EbuildPhase.py | 2 +- pym/_emerge/FakeVartree.py | 13 +- pym/_emerge/Package.py | 59 +++- pym/_emerge/PackageUninstall.py | 102 +++++- pym/_emerge/Scheduler.py | 24 +- pym/_emerge/Task.py | 31 +- pym/_emerge/actions.py | 30 ++- pym/_emerge/depgraph.py | 129 +++++--- pym/_emerge/unmerge.py | 64 +++- pym/portage/const.py | 2 +- pym/portage/dbapi/_MergeProcess.py | 34 ++- pym/portage/dbapi/vartree.py | 84 +++-- pym/portage/package/ebuild/doebuild.py | 121 ++++--- pym/portage/tests/locks/test_asynchronous_lock.py | 6 +- pym/portage/tests/resolver/ResolverPlayground.py | 81 +++++- pym/portage/tests/resolver/test_depth.py | 8 +- pym/portage/tests/resolver/test_merge_order.py | 386 +++++++++++++++= ++++++ pym/portage/util/__init__.py | 29 +- 26 files changed, 968 insertions(+), 303 deletions(-) diff --cc bin/ebuild.sh index ec575b9,37a3084..0f95faa --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@@ -1144,17 -1071,17 +1144,24 @@@ dyn_compile()=20 =20 trap abort_compile SIGINT SIGQUIT =20 + if hasq distcc $FEATURES && hasq distcc-pump $FEATURES ; then + if [[ -z $INCLUDE_SERVER_PORT ]] || [[ ! -w $INCLUDE_SERVER_PORT ]] ;= then + eval $(/usr/bin/pump --startup) + trap "/usr/bin/pump --shutdown" EXIT + fi + fi +=20 ebuild_phase pre_src_compile =20 - vecho ">>> Compiling source in $PWD ..." + vecho ">>> Compiling source in ${PWD}$(_get_abi_string) ..." ebuild_phase src_compile + + if is_auto-multilib && is_ebuild; then + >> "$PORTAGE_BUILDDIR"/.compiled."${LOOP_ABI}" || die "IO Failure --= Failed to 'touch .compiled.${LOOP_ABI}'" + fi + is_ebuild && { unset_abi; source "${T}"/environment || die ; } + done + is_ebuild && { rm "${T}"/environment || die ; } >> "$PORTAGE_BUILDDIR/.compiled" || \ die "Failed to create $PORTAGE_BUILDDIR/.compiled" vecho ">>> Source compiled."