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 288DE138010 for ; Sat, 8 Sep 2012 12:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACD0921C03A; Sat, 8 Sep 2012 12:55:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6DA1921C03A for ; Sat, 8 Sep 2012 12:55:34 +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 A390433C9F6 for ; Sat, 8 Sep 2012 12:55:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 086CBE544B for ; Sat, 8 Sep 2012 12:55:32 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1347107705.08bd5f74925f499b840afcfd68181905ea226b49.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: 08bd5f74925f499b840afcfd68181905ea226b49 X-VCS-Branch: multilib Date: Sat, 8 Sep 2012 12:55:32 +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: c659c176-19dd-46bc-994e-d2148a58ae22 X-Archives-Hash: 07b733e55614f3498f386b0adfdad01f commit: 08bd5f74925f499b840afcfd68181905ea226b49 Author: Thomas Sachau gentoo org> AuthorDate: Sat Sep 8 12:35:05 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sat Sep 8 12:35:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=08bd5f74 Merge tag 'v2.2.0_alpha122' into multilib bin/dispatch-conf | 10 +- bin/ebuild-helpers/doins | 4 +- bin/ebuild-helpers/newins | 4 +- bin/ebuild.sh | 4 +- bin/egencache | 2 +- bin/emerge-webrsync | 114 +++-- bin/isolated-functions.sh | 4 +- bin/phase-functions.sh | 12 +- bin/phase-helpers.sh | 4 +- cnf/metadata.dtd | 7 +- man/make.conf.5 | 24 +- misc/emerge-delta-webrsync | 613 ++++++++++++++++++++ mkrelease.sh | 2 +- pym/_emerge/BinpkgFetcher.py | 10 +- pym/_emerge/EbuildFetcher.py | 6 +- pym/_emerge/EbuildMetadataPhase.py | 13 +- pym/_emerge/PollScheduler.py | 18 +- pym/_emerge/Scheduler.py | 9 +- pym/_emerge/SpawnProcess.py | 17 +- pym/portage/checksum.py | 58 ++ pym/portage/dbapi/bintree.py | 7 +- pym/portage/getbinpkg.py | 8 +- pym/portage/manifest.py | 15 +- .../package/ebuild/_config/special_env_vars.py | 1 + pym/portage/package/ebuild/digestcheck.py | 15 +- pym/portage/package/ebuild/doebuild.py | 18 +- pym/portage/package/ebuild/fetch.py | 23 +- pym/portage/process.py | 6 +- pym/portage/tests/lint/test_bash_syntax.py | 12 +- pym/portage/util/_eventloop/EventLoop.py | 65 ++- 30 files changed, 967 insertions(+), 138 deletions(-) diff --cc bin/phase-functions.sh index 43e5ef8,3520199..8db6048 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@@ -401,19 -362,9 +401,19 @@@ dyn_prepare() return 0 fi + for LOOP_ABI in $(get_abi_list); do + if [[ " ${FEATURES} " == *" force-multilib "* ]]; then + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } + + if [ "${PORTAGE_BUILDDIR}"/.prepared.${LOOP_ABI} -nt "${WORKDIR}" ]; then + echo ">>> It appears that ${PN} is already prepared for ABI=${LOOP_ABI}; skipping." + echo ">>> Remove '$PORTAGE_BUILDDIR/.prepared.${LOOP_ABI}' to force prepare." + continue + fi + fi if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to prepare; then cd "${WORKDIR}" @@@ -452,19 -393,9 +452,19 @@@ dyn_configure() return 0 fi + for LOOP_ABI in $(get_abi_list); do + if [[ " ${FEATURES} " == *" force-multilib "* ]]; then + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } + + if [ ${PORTAGE_BUILDDIR}/.configured.${LOOP_ABI} -nt "${WORKDIR}" ]; then + echo ">>> It appears that ${PN} is already configured for ABI=${LOOP_ABI}; skipping." + echo ">>> Remove '$PORTAGE_BUILDDIR/.configured.${LOOP_ABI}' to force configuration." + continue + fi + fi if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to configure; then cd "${WORKDIR}" @@@ -504,19 -426,9 +504,19 @@@ dyn_compile() return 0 fi + for LOOP_ABI in $(get_abi_list); do + if [[ " ${FEATURES} " == *" force-multilib "* ]]; then + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } + + if [ ${PORTAGE_BUILDDIR}/.compiled.${LOOP_ABI} -nt "${WORKDIR}" ]; then + echo ">>> It appears that ${PN} is already compiled for ABI=${LOOP_ABI}; skipping." + echo ">>> Remove '$PORTAGE_BUILDDIR/.compiled.${LOOP_ABI}' to force compilation." + continue + fi + fi if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to compile; then cd "${WORKDIR}"