From: "Thomas Sachau" <tommy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:multilib commit in: /
Date: Sat, 8 Sep 2012 12:55:32 +0000 (UTC) [thread overview]
Message-ID: <1347108805.142c475fa532b191b254f325c9b48f54fb21dfeb.tommy@gentoo> (raw)
commit: 142c475fa532b191b254f325c9b48f54fb21dfeb
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 12:53:25 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> 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')
next reply other threads:[~2012-09-08 12:57 UTC|newest]
Thread overview: 192+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-08 12:55 Thomas Sachau [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 11:57 [gentoo-commits] proj/portage:multilib commit in: / Thomas Sachau
2022-03-21 11:43 Thomas Sachau
2022-03-21 11:34 Thomas Sachau
2022-03-21 11:33 Thomas Sachau
2022-03-21 11:27 Thomas Sachau
2022-03-21 11:26 Thomas Sachau
2022-03-21 10:01 Thomas Sachau
2021-10-30 9:44 Thomas Sachau
2021-10-30 9:44 Thomas Sachau
2021-07-25 11:43 Thomas Sachau
2021-07-25 11:43 Thomas Sachau
2021-07-25 11:43 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-01-23 9:52 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2020-10-30 10:29 Thomas Sachau
2020-08-23 12:22 Thomas Sachau
2020-07-05 17:57 Thomas Sachau
2019-12-26 11:56 Thomas Sachau
2019-03-17 11:35 Thomas Sachau
2019-03-09 9:56 Thomas Sachau
2018-09-01 11:03 Thomas Sachau
2018-05-23 12:23 Thomas Sachau
2018-04-14 12:16 Thomas Sachau
2018-03-03 15:18 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:38 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:30 Thomas Sachau
2018-01-07 10:09 Thomas Sachau
2018-01-07 9:50 Thomas Sachau
2018-01-07 9:39 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-05-05 11:29 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-06-02 20:00 Thomas Sachau
2013-09-15 20:54 Thomas Sachau
2013-09-15 11:39 Thomas Sachau
2013-09-15 11:06 Thomas Sachau
2013-09-10 16:53 Thomas Sachau
2013-08-25 19:50 Thomas Sachau
2013-08-18 20:55 Thomas Sachau
2013-08-04 11:19 Thomas Sachau
2013-08-04 11:19 Thomas Sachau
2013-05-31 12:16 Thomas Sachau
2013-05-20 10:41 Thomas Sachau
2013-05-10 8:01 Thomas Sachau
2013-04-14 13:20 Thomas Sachau
2013-04-03 11:51 Thomas Sachau
2013-03-28 19:31 Thomas Sachau
2013-03-23 16:24 Thomas Sachau
2013-03-08 17:46 Thomas Sachau
2013-03-03 13:44 Thomas Sachau
2013-02-16 18:47 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-12 11:21 Thomas Sachau
2012-12-16 10:49 Thomas Sachau
2012-12-14 20:16 Thomas Sachau
2012-12-14 20:14 Thomas Sachau
2012-12-09 10:54 Thomas Sachau
2012-12-07 22:24 Thomas Sachau
2012-11-30 16:44 Thomas Sachau
2012-10-29 12:23 Thomas Sachau
2012-10-22 8:57 Thomas Sachau
2012-10-14 9:35 Thomas Sachau
2012-10-06 11:34 Thomas Sachau
2012-09-29 12:51 Thomas Sachau
2012-09-24 20:38 Thomas Sachau
2012-09-22 15:33 Thomas Sachau
2012-09-22 15:23 Thomas Sachau
2012-09-17 17:07 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-07-08 10:03 Thomas Sachau
2012-07-01 12:01 Thomas Sachau
2012-06-10 12:42 Thomas Sachau
2012-06-03 12:33 Thomas Sachau
2012-05-28 10:19 Thomas Sachau
2012-05-17 10:00 Thomas Sachau
2012-05-12 7:57 Thomas Sachau
2012-05-11 20:38 Thomas Sachau
2012-04-24 21:26 Thomas Sachau
2012-04-06 11:50 Thomas Sachau
2012-04-04 12:42 Thomas Sachau
2012-04-01 22:00 Thomas Sachau
2012-03-30 18:55 Thomas Sachau
2012-03-24 10:51 Thomas Sachau
2012-03-23 14:42 Thomas Sachau
2012-03-21 18:50 Thomas Sachau
2012-03-18 15:29 Thomas Sachau
2012-03-06 18:21 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2012-02-25 12:04 Thomas Sachau
2012-02-23 19:08 Thomas Sachau
2012-02-18 15:52 Thomas Sachau
2012-02-06 19:38 Thomas Sachau
2011-12-28 13:33 Thomas Sachau
2011-12-24 14:16 Thomas Sachau
2011-12-16 16:30 Thomas Sachau
2011-12-07 21:31 Thomas Sachau
2011-11-26 14:03 Thomas Sachau
2011-11-19 14:25 Thomas Sachau
2011-11-18 23:27 Thomas Sachau
2011-11-11 22:52 Thomas Sachau
2011-10-31 19:53 Thomas Sachau
2011-10-24 18:54 Thomas Sachau
2011-10-23 11:05 Thomas Sachau
2011-10-23 11:05 Thomas Sachau
2011-10-21 13:57 Thomas Sachau
2011-10-12 16:28 Thomas Sachau
2011-10-09 10:33 Thomas Sachau
2011-10-08 8:34 Thomas Sachau
2011-10-07 12:41 Thomas Sachau
2011-10-01 13:56 Thomas Sachau
2011-10-01 13:56 Thomas Sachau
2011-09-11 14:33 Thomas Sachau
2011-09-09 13:03 Thomas Sachau
2011-08-16 12:20 Thomas Sachau
2011-08-05 12:29 Thomas Sachau
2011-08-01 16:53 Thomas Sachau
2011-07-28 17:07 Thomas Sachau
2011-07-21 19:18 Thomas Sachau
2011-07-15 13:24 Thomas Sachau
2011-07-05 17:34 Thomas Sachau
2011-06-16 16:54 Thomas Sachau
2011-06-07 15:44 Thomas Sachau
2011-05-28 13:14 Thomas Sachau
2011-05-26 17:55 Thomas Sachau
2011-05-22 9:42 Thomas Sachau
2011-05-14 9:59 Thomas Sachau
2011-05-07 18:38 Thomas Sachau
2011-04-16 10:17 Thomas Sachau
2011-04-16 10:17 Thomas Sachau
2011-03-28 17:24 Thomas Sachau
2011-03-19 19:39 Thomas Sachau
2011-03-17 17:58 Thomas Sachau
2011-03-03 19:53 Thomas Sachau
2011-02-25 13:45 Thomas Sachau
2011-02-16 20:15 Thomas Sachau
2011-02-10 18:12 Thomas Sachau
2011-02-08 18:12 Thomas Sachau
2011-02-06 13:10 Thomas Sachau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347108805.142c475fa532b191b254f325c9b48f54fb21dfeb.tommy@gentoo \
--to=tommy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox