commit: aa18688b2ff79a1d2c6b2036a3beb79781363051
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 19:59:31 2014 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 19:59:31 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aa18688b
Merge v2.2.10
doc/fragment/date => .portage_not_installed | 0
DEVELOPING | 32 +-
README | 49 +
RELEASE-NOTES | 28 +-
bin/archive-conf | 4 +-
bin/binhost-snapshot | 6 +-
bin/check-implicit-pointer-usage.py | 2 +-
bin/chpathtool.py | 65 +-
bin/clean_locks | 10 +-
bin/dispatch-conf | 4 +-
bin/dohtml.py | 4 +-
bin/ebuild | 10 +-
bin/ebuild-helpers/prepstrip | 15 +-
bin/ebuild-ipc.py | 6 +-
bin/ebuild.sh | 2 +-
bin/egencache | 142 +--
bin/emaint | 8 +-
bin/emerge | 8 +-
bin/emerge-webrsync | 6 +-
bin/emirrordist | 4 +-
bin/env-update | 4 +-
bin/filter-bash-environment.py | 4 +-
bin/fixpackages | 4 +-
bin/glsa-check | 6 +-
bin/helper-functions.sh | 57 +-
bin/install.py | 6 +-
bin/isolated-functions.sh | 13 +-
bin/lock-helper.py | 4 +-
bin/misc-functions.sh | 22 +-
bin/phase-functions.sh | 4 +-
bin/phase-helpers.sh | 19 +-
bin/portageq | 62 +-
bin/quickpkg | 4 +-
bin/regenworld | 4 +-
bin/repoman | 300 +++---
bin/save-ebuild-env.sh | 7 +-
bin/xattr-helper.py | 116 ++-
bin/xpak-helper.py | 4 +-
cnf/sets/portage.conf | 2 +-
doc/config/sets.docbook | 5 +-
man/ebuild.5 | 30 +-
man/emerge.1 | 31 +-
man/make.conf.5 | 30 +-
man/portage.5 | 134 ++-
man/ru/ebuild.1 | 16 +-
misc/emerge-delta-webrsync | 4 +-
mkrelease.sh | 89 +-
pym/_emerge/Binpkg.py | 1 +
pym/_emerge/BinpkgExtractorAsync.py | 15 +-
pym/_emerge/BlockerCache.py | 6 +-
pym/_emerge/EbuildExecuter.py | 11 +-
pym/_emerge/MergeListItem.py | 14 +-
pym/_emerge/Package.py | 5 +-
pym/_emerge/Scheduler.py | 7 +-
pym/_emerge/SpawnProcess.py | 8 +-
pym/_emerge/actions.py | 31 +-
pym/_emerge/countdown.py | 18 +-
pym/_emerge/create_depgraph_params.py | 3 +-
pym/_emerge/depgraph.py | 1067 ++++++++++++++------
pym/_emerge/help.py | 4 +-
pym/_emerge/main.py | 17 +-
pym/_emerge/resolver/output.py | 109 +-
pym/_emerge/resolver/output_helpers.py | 7 +-
pym/_emerge/resolver/package_tracker.py | 301 ++++++
pym/_emerge/resolver/slot_collision.py | 149 ++-
pym/_emerge/unmerge.py | 5 +-
pym/portage/__init__.py | 20 +-
pym/portage/_emirrordist/MirrorDistTask.py | 3 +-
pym/portage/_emirrordist/main.py | 20 +-
pym/portage/_global_updates.py | 224 ++--
pym/portage/_selinux.py | 4 +-
pym/portage/_sets/__init__.py | 2 +-
pym/portage/_sets/base.py | 3 +-
pym/portage/cache/flat_hash.py | 3 +-
pym/portage/cache/fs_template.py | 3 +-
pym/portage/cache/metadata.py | 3 +-
pym/portage/cache/sqlite.py | 3 +-
pym/portage/cache/template.py | 3 +-
pym/portage/checksum.py | 12 +-
pym/portage/const.py | 169 +++-
pym/portage/cvstree.py | 274 ++---
pym/portage/data.py | 15 +-
pym/portage/dbapi/bintree.py | 15 +-
pym/portage/dbapi/porttree.py | 9 +-
pym/portage/dbapi/vartree.py | 54 +-
pym/portage/debug.py | 10 +-
pym/portage/dep/__init__.py | 3 +-
pym/portage/dispatch_conf.py | 334 +++---
pym/portage/eclass_cache.py | 14 +-
pym/portage/elog/__init__.py | 3 +-
pym/portage/elog/mod_echo.py | 3 +-
pym/portage/elog/mod_syslog.py | 13 +-
pym/portage/emaint/main.py | 23 +-
pym/portage/emaint/module.py | 8 +-
pym/portage/emaint/modules/binhost/binhost.py | 4 +-
pym/portage/env/loaders.py | 26 +-
pym/portage/exception.py | 54 +-
pym/portage/getbinpkg.py | 172 ++--
pym/portage/glsa.py | 4 +-
pym/portage/localization.py | 7 +-
pym/portage/locks.py | 44 +-
pym/portage/mail.py | 7 +-
pym/portage/manifest.py | 3 +-
pym/portage/output.py | 32 +-
.../package/ebuild/_config/LocationsManager.py | 4 +-
pym/portage/package/ebuild/_config/MaskManager.py | 4 +-
pym/portage/package/ebuild/_config/UseManager.py | 2 +-
pym/portage/package/ebuild/config.py | 18 +-
pym/portage/package/ebuild/fetch.py | 7 +-
pym/portage/package/ebuild/getmaskingreason.py | 2 +-
pym/portage/package/ebuild/getmaskingstatus.py | 3 +-
pym/portage/process.py | 7 +-
pym/portage/proxy/lazyimport.py | 3 +-
pym/portage/repository/config.py | 35 +-
pym/portage/tests/__init__.py | 54 +-
pym/portage/tests/dbapi/test_portdb_cache.py | 12 +-
pym/portage/tests/dep/test_match_from_list.py | 3 +-
pym/portage/tests/ebuild/test_config.py | 5 +-
pym/portage/tests/emerge/test_emerge_slot_abi.py | 6 +-
pym/portage/tests/emerge/test_simple.py | 23 +-
pym/portage/tests/lint/test_compile_modules.py | 22 +-
pym/portage/tests/repoman/test_simple.py | 7 +-
pym/portage/tests/resolver/ResolverPlayground.py | 113 +--
pym/portage/tests/resolver/test_backtracking.py | 13 +-
pym/portage/tests/resolver/test_blocker.py | 48 +
pym/portage/tests/resolver/test_multirepo.py | 84 +-
pym/portage/tests/resolver/test_onlydeps.py | 34 +
pym/portage/tests/resolver/test_package_tracker.py | 261 +++++
pym/portage/tests/resolver/test_slot_collisions.py | 106 +-
.../tests/resolver/test_slot_conflict_rebuild.py | 303 +++++-
pym/portage/tests/resolver/test_useflags.py | 78 ++
pym/portage/tests/runTests | 4 +-
pym/portage/tests/unicode/test_string_format.py | 3 +-
pym/portage/tests/util/test_getconfig.py | 27 +-
pym/portage/tests/util/test_whirlpool.py | 4 +-
pym/portage/update.py | 3 +-
pym/portage/util/ExtractKernelVersion.py | 6 +-
pym/portage/util/SlotObject.py | 1 -
pym/portage/util/__init__.py | 123 +--
.../util/_dyn_libs/PreservedLibsRegistry.py | 3 +-
pym/portage/util/_info_files.py | 20 +-
pym/portage/util/_urlopen.py | 5 +-
pym/portage/util/digraph.py | 36 +-
pym/portage/util/env_update.py | 11 +-
pym/portage/util/lafilefixer.py | 10 +-
pym/portage/util/movefile.py | 34 +-
pym/portage/util/writeable_check.py | 79 ++
pym/portage/versions.py | 14 +-
pym/portage/xpak.py | 8 +-
pym/repoman/checks.py | 33 +-
pym/repoman/utilities.py | 44 +
runtests.sh | 17 +-
tabcheck.py | 2 +-
153 files changed, 4585 insertions(+), 1926 deletions(-)
diff --cc pym/portage/const.py
index b6aac96,1785bff..d71bbf2
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -83,42 -84,117 +84,119 @@@ CVS_PACKAGE_ATOM = "dev-vcs/cvs
GIT_PACKAGE_ATOM = "dev-vcs/git"
RSYNC_PACKAGE_ATOM = "net-misc/rsync"
- 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",
- "NO_AUTO_FLAG", "RESTRICT_MULTILIB_BINARIES")
- EBUILD_PHASES = ("pretend", "setup", "unpack", "prepare",
"configure",
- "compile", "test", "install",
- "package", "preinst", "postinst","prerm", "postrm",
- "nofetch", "config", "info", "other")
+ INCREMENTALS = (
+ "ACCEPT_KEYWORDS",
+ "CONFIG_PROTECT",
+ "CONFIG_PROTECT_MASK",
+ "FEATURES",
+ "IUSE_IMPLICIT",
+ "PRELINK_PATH",
+ "PRELINK_PATH_MASK",
+ "PROFILE_ONLY_VARIABLES",
+ "USE",
+ "USE_EXPAND",
+ "USE_EXPAND_HIDDEN",
+ "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",
+ "nofetch",
+ "config",
+ "info",
+ "other",
+ )
SUPPORTED_FEATURES = frozenset([
- "assume-digests", "binpkg-logs", "buildpkg",
"buildsyspkg", "candy",
- "ccache", "cgroup", "chflags", "clean-logs",
- "collision-protect", "compress-build-logs",
"compressdebug",
- "compress-index", "config-protect-if-modified",
- "digest", "distcc", "distcc-pump", "distlocks",
- "downgrade-backup", "ebuild-locks", "fakeroot",
- "fail-clean", "force-mirror", "force-multilib",
"force-prefix", "getbinpkg",
- "installsources", "ipc-sandbox",
- "keeptemp", "keepwork", "fixlafiles", "lmirror",
- "merge-sync",
- "metadata-transfer", "mirror", "multilib-strict",
- "network-sandbox", "news",
- "noauto", "noclean", "nodoc", "noinfo", "noman",
- "nostrip", "notitles", "parallel-fetch",
"parallel-install",
- "prelink-checksums", "preserve-libs",
- "protect-owned", "python-trace", "sandbox",
- "selinux", "sesandbox", "sfperms",
- "sign", "skiprocheck", "split-elog", "split-log",
"splitdebug",
- "strict", "stricter", "suidctl", "test",
"test-fail-continue",
- "unknown-features-filter", "unknown-features-warn",
- "unmerge-backup",
- "unmerge-logs", "unmerge-orphans", "userfetch",
"userpriv",
- "usersandbox", "usersync", "webrsync-gpg",
"xattr"])
+ "assume-digests",
+ "binpkg-logs",
+ "buildpkg",
+ "buildsyspkg",
+ "candy",
+ "ccache",
+ "cgroup",
+ "chflags",
+ "clean-logs",
+ "collision-protect",
+ "compress-build-logs",
+ "compressdebug",
+ "compress-index",
+ "config-protect-if-modified",
+ "digest",
+ "distcc",
+ "distcc-pump",
+ "distlocks",
+ "downgrade-backup",
+ "ebuild-locks",
+ "fail-clean",
+ "fakeroot",
+ "fixlafiles",
+ "force-mirror",
++ "force-multilib",
+ "force-prefix",
+ "getbinpkg",
+ "installsources",
+ "ipc-sandbox",
+ "keeptemp",
+ "keepwork",
+ "lmirror",
+ "merge-sync",
+ "metadata-transfer",
+ "mirror",
+ "multilib-strict",
+ "network-sandbox",
+ "news",
+ "noauto",
+ "noclean",
+ "nodoc",
+ "noinfo",
+ "noman",
+ "nostrip",
+ "notitles",
+ "parallel-fetch",
+ "parallel-install",
+ "prelink-checksums",
+ "preserve-libs",
+ "protect-owned",
+ "python-trace",
+ "sandbox",
+ "selinux",
+ "sesandbox",
+ "sfperms",
+ "sign",
+ "skiprocheck",
+ "splitdebug",
+ "split-elog",
+ "split-log",
+ "strict",
+ "stricter",
+ "suidctl",
+ "test",
+ "test-fail-continue",
+ "unknown-features-filter",
+ "unknown-features-warn",
+ "unmerge-backup",
+ "unmerge-logs",
+ "unmerge-orphans",
+ "userfetch",
+ "userpriv",
+ "usersandbox",
+ "usersync",
+ "webrsync-gpg",
+ "xattr",
+ ])
EAPI = 5
