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 1QhiNk-0007EX-W8 for garchives@archives.gentoo.org; Fri, 15 Jul 2011 13:24:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDD0921C293; Fri, 15 Jul 2011 13:24:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9FCC421C293 for ; Fri, 15 Jul 2011 13:24:32 +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 145D62AC323 for ; Fri, 15 Jul 2011 13:24:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4332D8003D for ; Fri, 15 Jul 2011 13:24:31 +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: 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: da552fc0c4f609e87df0fefb4d3e953b814d0a43 Date: Fri, 15 Jul 2011 13:24:31 +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: 581ca365b56a21ba234d147e1003b1b0 commit: da552fc0c4f609e87df0fefb4d3e953b814d0a43 Author: Thomas Sachau gentoo org> AuthorDate: Fri Jul 15 13:23:43 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Fri Jul 15 13:23:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dda552fc0 Merge v2.2.0_alpha45 bin/binhost-snapshot | 6 +- bin/ebuild-helpers/doman | 8 +- bin/ebuild-helpers/prepall | 6 +- bin/ebuild-helpers/prepallman | 4 +- bin/ebuild-helpers/prepinfo | 4 +- bin/ebuild-helpers/prepman | 4 +- bin/ebuild-helpers/prepstrip | 24 ++-- bin/ebuild.sh | 131 ++++++++++----= ------ bin/egencache | 41 ++++--- bin/emerge-webrsync | 4 +- bin/filter-bash-environment.py | 12 +- bin/isolated-functions.sh | 22 +++- bin/misc-functions.sh | 22 ++-- bin/repoman | 15 +-- cnf/logrotate.d/elog-save-summary | 3 +- man/ebuild.5 | 8 +- man/make.conf.5 | 6 +- pym/_emerge/AbstractEbuildProcess.py | 10 +- pym/_emerge/Binpkg.py | 15 ++- pym/_emerge/BinpkgVerifier.py | 8 +- pym/_emerge/EbuildFetcher.py | 21 ++-- pym/_emerge/EbuildMetadataPhase.py | 4 +- pym/_emerge/EbuildPhase.py | 38 +++--- pym/_emerge/JobStatusDisplay.py | 8 +- pym/_emerge/Scheduler.py | 1 - pym/_emerge/UseFlagDisplay.py | 7 +- pym/_emerge/actions.py | 26 +++-- pym/_emerge/depgraph.py | 103 ++++++++++----= -- pym/_emerge/emergelog.py | 18 ++-- pym/_emerge/is_valid_package_atom.py | 18 ++- pym/_emerge/main.py | 8 +- pym/_emerge/resolver/circular_dependency.py | 48 ++++---- pym/_emerge/resolver/output_helpers.py | 4 +- pym/_emerge/resolver/slot_collision.py | 44 ++++++- pym/portage/__init__.py | 37 +----- pym/portage/_ensure_encodings.py | 132 --------------= ------ pym/portage/cache/flat_hash.py | 19 ++- pym/portage/cache/flat_list.py | 18 ++- pym/portage/checksum.py | 9 +- pym/portage/const.py | 1 + pym/portage/cvstree.py | 6 +- pym/portage/dbapi/_MergeProcess.py | 6 +- pym/portage/dbapi/bintree.py | 5 +- pym/portage/dbapi/cpv_expand.py | 6 +- pym/portage/dbapi/porttree.py | 5 +- pym/portage/dbapi/vartree.py | 39 +++--- pym/portage/dispatch_conf.py | 6 +- pym/portage/elog/messages.py | 7 +- pym/portage/elog/mod_save.py | 38 ++++--- pym/portage/elog/mod_save_summary.py | 48 +++++-- pym/portage/env/loaders.py | 6 +- pym/portage/glsa.py | 8 +- pym/portage/manifest.py | 11 +- pym/portage/news.py | 6 +- pym/portage/output.py | 10 +- .../package/ebuild/_config/LocationsManager.py | 6 +- .../package/ebuild/_config/special_env_vars.py | 3 +- pym/portage/package/ebuild/_ipc/QueryCommand.py | 11 +- .../package/ebuild/deprecated_profile_check.py | 6 +- pym/portage/package/ebuild/digestcheck.py | 18 ++- pym/portage/package/ebuild/doebuild.py | 46 +++++--- pym/portage/package/ebuild/fetch.py | 10 +- pym/portage/package/ebuild/prepare_build_dirs.py | 55 +++++++-- pym/portage/repository/config.py | 10 +- pym/portage/tests/ebuild/test_spawn.py | 6 +- .../test_lazy_import_portage_baseline.py | 2 +- pym/portage/tests/resolver/test_slot_collisions.py | 18 +++ pym/portage/update.py | 12 +- pym/portage/util/ExtractKernelVersion.py | 6 +- pym/portage/util/__init__.py | 39 +++++-- pym/portage/util/env_update.py | 4 +- pym/repoman/checks.py | 34 ++++-- pym/repoman/errors.py | 2 + pym/repoman/utilities.py | 6 +- 74 files changed, 753 insertions(+), 665 deletions(-) diff --cc bin/ebuild.sh index 18c88d5,2ef40cb..b5b6a79 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@@ -162,14 -162,12 +163,14 @@@ use()=20 =20 # Make sure we have this USE flag in IUSE elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then - [[ $u =3D~ $PORTAGE_IUSE ]] || \ - eqawarn "QA Notice: USE Flag '${u}' not" \ - "in IUSE for ${CATEGORY}/${PF}" + if [[ $u !=3D multilib ]]; then + [[ $u =3D~ $PORTAGE_IUSE ]] || \ + eqawarn "QA Notice: USE Flag '${u}' not" \ + "in IUSE for ${CATEGORY}/${PF}" + fi fi =20 - if hasq ${u} ${USE} ; then + if has ${u} ${USE} ; then return ${found} else return $((!found)) @@@ -766,13 -742,12 +767,13 @@@ dyn_unpack()=20 fi if [ "${newstuff}" =3D=3D "yes" ]; then # We don't necessarily have privileges to do a full dyn_clean here. - rm -rf "${PORTAGE_BUILDDIR}"/{.setuped,.unpacked,.prepared,.configure= d,.compiled,.tested,.installed,.packaged,build-info} + rm -rf "${PORTAGE_BUILDDIR}"/{.setuped*,.unpacked*,.prepared*,.config= ured*,.compiled*,.tested*,.installed*,.packaged*,build-info} - if ! hasq keepwork $FEATURES ; then + if ! has keepwork $FEATURES ; then rm -rf "${WORKDIR}" fi + rm -rf "${D}".* if [ -d "${T}" ] && \ - ! hasq keeptemp $FEATURES ; then + ! has keeptemp $FEATURES ; then rm -rf "${T}" && mkdir "${T}" fi fi @@@ -816,18 -783,18 +817,18 @@@ dyn_clean()=20 chflags -R nosunlnk,nouunlnk "${PORTAGE_BUILDDIR}" 2>/dev/null fi =20 - rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir" - rm -f "${PORTAGE_BUILDDIR}/.installed" + rm -rf "${PORTAGE_BUILDDIR}"/image* "${PORTAGE_BUILDDIR}/homedir" + rm -f "${PORTAGE_BUILDDIR}"/.installed* =20 if [[ $EMERGE_FROM =3D binary ]] || \ - ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then + ! has keeptemp $FEATURES && ! has keepwork $FEATURES ; then rm -rf "${T}" fi =20 - if [[ $EMERGE_FROM =3D binary ]] || ! hasq keepwork $FEATURES; then + if [[ $EMERGE_FROM =3D binary ]] || ! has keepwork $FEATURES; then - rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended,setuped,un= packed,prepared} \ - "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \ - "$PORTAGE_BUILDDIR"/.die_hooks \ + rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended*,setuped*,= unpacked*,prepared*} \ + "$PORTAGE_BUILDDIR"/.{configured*,compiled*,tested*,packaged*} \ + "$PORTAGE_BUILDDIR"/.{die_hooks,abi} \ "$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \ "$PORTAGE_BUILDDIR"/.exit_status =20 @@@ -1029,17 -996,9 +1030,17 @@@ dyn_prepare()=20 return 0 fi =20 + for LOOP_ABI in $(get_abi_list); do + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die = ; } + + if [ "${PORTAGE_BUILDDIR}"/.prepared.${LOOP_ABI} -nt "${WORKDIR}" ]; t= hen + echo ">>> It appears that ${PN} is already prepared for ABI=3D${LOOP_= ABI}; skipping." + echo ">>> Remove '$PORTAGE_BUILDDIR/.prepared.${LOOP_ABI}' to force p= repare." + continue + fi if [[ -d $S ]] ; then cd "${S}" - elif hasq $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 3_pre2 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to prepare; then cd "${WORKDIR}" @@@ -1076,17 -1027,9 +1077,17 @@@ dyn_configure()=20 return 0 fi =20 + for LOOP_ABI in $(get_abi_list); do + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die = ; } + + if [ ${PORTAGE_BUILDDIR}/.configured.${LOOP_ABI} -nt "${WORKDIR}" ]; t= hen + echo ">>> It appears that ${PN} is already configured for ABI=3D${LO= OP_ABI}; skipping." + echo ">>> Remove '$PORTAGE_BUILDDIR/.configured.${LOOP_ABI}' to forc= e configuration." + continue + fi if [[ -d $S ]] ; then cd "${S}" - elif hasq $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 3_pre2 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to configure; then cd "${WORKDIR}" @@@ -1124,17 -1060,9 +1125,17 @@@ dyn_compile()=20 return 0 fi =20 + for LOOP_ABI in $(get_abi_list); do + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die = ; } + + if [ ${PORTAGE_BUILDDIR}/.compiled.${LOOP_ABI} -nt "${WORKDIR}" ]; the= n + echo ">>> It appears that ${PN} is already compiled for ABI=3D${LOOP_= ABI}; skipping." + echo ">>> Remove '$PORTAGE_BUILDDIR/.compiled.${LOOP_ABI}' to force c= ompilation." + continue + fi if [[ -d $S ]] ; then cd "${S}" - elif hasq $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 3_pre2 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to compile; then cd "${WORKDIR}" @@@ -1240,14 -1144,10 +1241,14 @@@ dyn_install()=20 trap "abort_install" SIGINT SIGQUIT ebuild_phase pre_src_install rm -rf "${PORTAGE_BUILDDIR}/image" + is_auto-multilib && rm -rf "${PORTAGE_BUILDDIR}"/image.${ABI} mkdir "${PORTAGE_BUILDDIR}/image" + for LOOP_ABI in $(get_abi_list); do + is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die = ; } + if [[ -d $S ]] ; then cd "${S}" - elif hasq $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 3_pre2 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to install; then cd "${WORKDIR}" @@@ -1341,23 -1212,6 +1342,23 @@@ then >> DEBUGBUILD fi + + else + cd "${PORTAGE_BUILDDIR}" - if [[ $EMERGE_FROM =3D binary ]] || ! hasq keepwork $FEATURES; then ++ if [[ $EMERGE_FROM =3D binary ]] || ! has keepwork $FEATURES; then + rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacke= d,prepared} \ + "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \ + "$PORTAGE_BUILDDIR"/.die_hooks + +# rm -rf "${PORTAGE_BUILDDIR}/build-info" + rm -rf "${WORKDIR}" + fi + + if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then + find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r = | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null + fi + fi + trap - SIGINT SIGQUIT } =20 @@@ -2009,9 -1857,6 +2010,9 @@@ filter_readonly_variables()=20 ${PORTAGE_MUTABLE_FILTERED_VARS} " fi - if hasq --filter-metadata $* ; then ++ if has --filter-metadata $* ; then + filtered_vars+=3D" ${PORTAGE_READONLY_METADATA} filter_opts" + fi =20 "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash= -environment.py "${filtered_vars}" || die "filter-bash-environment.py fai= led" } @@@ -2377,8 -2222,8 +2378,8 @@@ ebuild_main()=20 nofetch) ebuild_phase_with_hooks pkg_nofetch ;; - prerm|postrm|postinst|config|info) + config|info) - if hasq "$EBUILD_SH_ARGS" config info && \ + if has "$EBUILD_SH_ARGS" config info && \ ! declare -F "pkg_$EBUILD_SH_ARGS" >/dev/null ; then ewarn "pkg_${EBUILD_SH_ARGS}() is not defined: '${EBUILD##*/}'" fi