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 1AB6E138010 for ; Sat, 8 Sep 2012 12:57:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0B6921C03B; Sat, 8 Sep 2012 12:55:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 72D2821C03B for ; Sat, 8 Sep 2012 12:55:35 +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 E28EA33D297 for ; Sat, 8 Sep 2012 12:55:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AA8D5E5443 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: <1347108805.142c475fa532b191b254f325c9b48f54fb21dfeb.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: 142c475fa532b191b254f325c9b48f54fb21dfeb 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: 7e4031ad-12e5-4664-aaa4-836c200b3f4a X-Archives-Hash: 934027b313ea0015b279c213eedf7e85 commit: 142c475fa532b191b254f325c9b48f54fb21dfeb Author: Thomas Sachau gentoo org> AuthorDate: Sat Sep 8 12:53:25 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sat Sep 8 12:53:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=142c475f Merge v2.2.0_alpha124 NEWS | 4 +- bin/archive-conf | 13 +- bin/banned-helper | 6 - bin/binhost-snapshot | 13 +- bin/clean_locks | 13 +- bin/dispatch-conf | 12 +- bin/ebuild | 11 +- bin/ebuild-helpers/4/dodoc | 1 - bin/ebuild-helpers/4/dohard | 1 - bin/ebuild-helpers/4/dosed | 1 - bin/ebuild-helpers/4/prepalldocs | 1 - bin/ebuild-helpers/{ => bsd}/sed | 14 +- bin/ebuild-helpers/dodoc | 13 +- bin/ebuild-helpers/dohard | 11 +- bin/ebuild-helpers/doheader | 21 ++ bin/ebuild-helpers/doins | 16 +- bin/ebuild-helpers/dosed | 11 +- bin/ebuild-helpers/{newbin => newheader} | 0 bin/ebuild-helpers/newins | 2 +- bin/ebuild-helpers/prepalldocs | 11 +- bin/ebuild.sh | 2 +- bin/egencache | 11 +- bin/emaint | 11 +- bin/emerge | 11 +- bin/env-update | 13 +- bin/fixpackages | 13 +- bin/glsa-check | 13 +- bin/phase-functions.sh | 34 ++- bin/phase-helpers.sh | 141 +++++++++-- bin/portageq | 58 +++-- bin/quickpkg | 11 +- bin/regenworld | 13 +- bin/repoman | 12 +- bin/save-ebuild-env.sh | 11 +- cnf/make.globals | 2 +- doc/package/ebuild.docbook | 1 + doc/package/ebuild/eapi/4-slot-abi.docbook | 12 +- doc/package/ebuild/eapi/5.docbook | 260 ++++++++++++++++++++ doc/portage.docbook | 1 + man/emerge.1 | 16 +- man/make.conf.5 | 5 - pym/_emerge/EbuildMetadataPhase.py | 6 +- pym/_emerge/FakeVartree.py | 20 +- pym/_emerge/Package.py | 26 +- pym/_emerge/Scheduler.py | 19 +- pym/_emerge/create_depgraph_params.py | 20 +- pym/_emerge/depgraph.py | 131 ++++++----- pym/_emerge/main.py | 16 +- pym/_emerge/resolver/backtracking.py | 16 +- pym/_emerge/resolver/circular_dependency.py | 9 +- pym/_emerge/resolver/slot_collision.py | 4 +- pym/portage/__init__.py | 2 +- pym/portage/_sets/__init__.py | 5 + pym/portage/_sets/dbapi.py | 72 ++++++ pym/portage/const.py | 3 +- pym/portage/dbapi/__init__.py | 15 +- pym/portage/dbapi/_expand_new_virt.py | 10 +- pym/portage/dep/__init__.py | 141 ++++++----- .../dep/{_slot_abi.py => _slot_operator.py} | 24 +- pym/portage/eapi.py | 23 ++- pym/portage/emaint/modules/config/config.py | 66 ++---- pym/portage/glsa.py | 3 +- .../package/ebuild/_config/special_env_vars.py | 8 +- pym/portage/package/ebuild/_eapi_invalid.py | 13 - pym/portage/package/ebuild/config.py | 104 ++++++++- pym/portage/package/ebuild/doebuild.py | 49 +++-- pym/portage/tests/dep/testAtom.py | 16 +- pym/portage/tests/dep/testCheckRequiredUse.py | 16 ++- .../tests/dep/test_get_required_use_flags.py | 4 +- pym/portage/tests/dep/test_match_from_list.py | 6 +- pym/portage/tests/emerge/test_simple.py | 2 +- pym/portage/tests/resolver/test_complete_graph.py | 4 +- pym/portage/tests/resolver/test_slot_abi.py | 26 +- .../tests/resolver/test_slot_abi_downgrade.py | 8 +- pym/portage/util/_desktop_entry.py | 14 + pym/portage/versions.py | 10 +- 76 files changed, 1185 insertions(+), 552 deletions(-) diff --cc bin/phase-functions.sh index 8db6048,68a33a8..66418c2 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@@ -311,15 -273,15 +311,16 @@@ dyn_clean() fi if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then - rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended,setuped,unpacked,prepared} \ - "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \ + rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended*,setuped*,unpacked*,prepared*} \ + "$PORTAGE_BUILDDIR"/.{configured*,compiled*,tested*,packaged*} \ + "$PORTAGE_BUILDDIR"/.abi \ "$PORTAGE_BUILDDIR"/.die_hooks \ "$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \ - "$PORTAGE_BUILDDIR"/.exit_status + "$PORTAGE_BUILDDIR"/.exit_status \ + "$PORTAGE_BUILDDIR"/.apply_user_patches - rm -rf "${PORTAGE_BUILDDIR}/build-info" - rm -rf "${WORKDIR}" + rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code} + rm -rf "${WORKDIR}"* fi if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then diff --cc pym/portage/const.py index 65f4625,3b8e350..a002c98 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@@ -79,9 -79,10 +79,11 @@@ OS_HEADERS_PACKAGE_ATOM = "virtual/os- INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", "FEATURES", "ACCEPT_KEYWORDS", "CONFIG_PROTECT_MASK", "CONFIG_PROTECT", + "IUSE_IMPLICIT", "PRELINK_PATH", "PRELINK_PATH_MASK", "PROFILE_ONLY_VARIABLES", - "USE_EXPAND_IMPLICIT", "USE_EXPAND_UNPREFIXED") ++ "USE_EXPAND_IMPLICIT", "USE_EXPAND_UNPREFIXED", + "NO_AUTO_FLAG", "RESTRICT_MULTILIB_BINARIES") EBUILD_PHASES = ("pretend", "setup", "unpack", "prepare", "configure", "compile", "test", "install", "package", "preinst", "postinst","prerm", "postrm", diff --cc pym/portage/package/ebuild/doebuild.py index 8d118c4,471a5da..254911a --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@@ -1638,12 -1656,12 +1656,16 @@@ def _post_src_install_write_metadata(se build_info_dir = os.path.join(settings['PORTAGE_BUILDDIR'], 'build-info') - for k in ('IUSE',): - v = settings.get(k) + metadata_keys = ['IUSE'] + if eapi_attrs.iuse_effective: + metadata_keys.append('IUSE_EFFECTIVE') + + for k in metadata_keys: + v = settings.configdict['pkg'].get(k) + if "force-multilib" in settings.features: + v = v + " abiwrapper" + for i in settings.get('MULTILIB_ABIS').split(): + v = v + " multilib_abi_" + i if v is not None: write_atomic(os.path.join(build_info_dir, k), v + '\n')