| 1 |
commit: aa18688b2ff79a1d2c6b2036a3beb79781363051 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 2 19:59:31 2014 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 2 19:59:31 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aa18688b |
| 7 |
|
| 8 |
Merge v2.2.10 |
| 9 |
|
| 10 |
|
| 11 |
doc/fragment/date => .portage_not_installed | 0 |
| 12 |
DEVELOPING | 32 +- |
| 13 |
README | 49 + |
| 14 |
RELEASE-NOTES | 28 +- |
| 15 |
bin/archive-conf | 4 +- |
| 16 |
bin/binhost-snapshot | 6 +- |
| 17 |
bin/check-implicit-pointer-usage.py | 2 +- |
| 18 |
bin/chpathtool.py | 65 +- |
| 19 |
bin/clean_locks | 10 +- |
| 20 |
bin/dispatch-conf | 4 +- |
| 21 |
bin/dohtml.py | 4 +- |
| 22 |
bin/ebuild | 10 +- |
| 23 |
bin/ebuild-helpers/prepstrip | 15 +- |
| 24 |
bin/ebuild-ipc.py | 6 +- |
| 25 |
bin/ebuild.sh | 2 +- |
| 26 |
bin/egencache | 142 +-- |
| 27 |
bin/emaint | 8 +- |
| 28 |
bin/emerge | 8 +- |
| 29 |
bin/emerge-webrsync | 6 +- |
| 30 |
bin/emirrordist | 4 +- |
| 31 |
bin/env-update | 4 +- |
| 32 |
bin/filter-bash-environment.py | 4 +- |
| 33 |
bin/fixpackages | 4 +- |
| 34 |
bin/glsa-check | 6 +- |
| 35 |
bin/helper-functions.sh | 57 +- |
| 36 |
bin/install.py | 6 +- |
| 37 |
bin/isolated-functions.sh | 13 +- |
| 38 |
bin/lock-helper.py | 4 +- |
| 39 |
bin/misc-functions.sh | 22 +- |
| 40 |
bin/phase-functions.sh | 4 +- |
| 41 |
bin/phase-helpers.sh | 19 +- |
| 42 |
bin/portageq | 62 +- |
| 43 |
bin/quickpkg | 4 +- |
| 44 |
bin/regenworld | 4 +- |
| 45 |
bin/repoman | 300 +++--- |
| 46 |
bin/save-ebuild-env.sh | 7 +- |
| 47 |
bin/xattr-helper.py | 116 ++- |
| 48 |
bin/xpak-helper.py | 4 +- |
| 49 |
cnf/sets/portage.conf | 2 +- |
| 50 |
doc/config/sets.docbook | 5 +- |
| 51 |
man/ebuild.5 | 30 +- |
| 52 |
man/emerge.1 | 31 +- |
| 53 |
man/make.conf.5 | 30 +- |
| 54 |
man/portage.5 | 134 ++- |
| 55 |
man/ru/ebuild.1 | 16 +- |
| 56 |
misc/emerge-delta-webrsync | 4 +- |
| 57 |
mkrelease.sh | 89 +- |
| 58 |
pym/_emerge/Binpkg.py | 1 + |
| 59 |
pym/_emerge/BinpkgExtractorAsync.py | 15 +- |
| 60 |
pym/_emerge/BlockerCache.py | 6 +- |
| 61 |
pym/_emerge/EbuildExecuter.py | 11 +- |
| 62 |
pym/_emerge/MergeListItem.py | 14 +- |
| 63 |
pym/_emerge/Package.py | 5 +- |
| 64 |
pym/_emerge/Scheduler.py | 7 +- |
| 65 |
pym/_emerge/SpawnProcess.py | 8 +- |
| 66 |
pym/_emerge/actions.py | 31 +- |
| 67 |
pym/_emerge/countdown.py | 18 +- |
| 68 |
pym/_emerge/create_depgraph_params.py | 3 +- |
| 69 |
pym/_emerge/depgraph.py | 1067 ++++++++++++++------ |
| 70 |
pym/_emerge/help.py | 4 +- |
| 71 |
pym/_emerge/main.py | 17 +- |
| 72 |
pym/_emerge/resolver/output.py | 109 +- |
| 73 |
pym/_emerge/resolver/output_helpers.py | 7 +- |
| 74 |
pym/_emerge/resolver/package_tracker.py | 301 ++++++ |
| 75 |
pym/_emerge/resolver/slot_collision.py | 149 ++- |
| 76 |
pym/_emerge/unmerge.py | 5 +- |
| 77 |
pym/portage/__init__.py | 20 +- |
| 78 |
pym/portage/_emirrordist/MirrorDistTask.py | 3 +- |
| 79 |
pym/portage/_emirrordist/main.py | 20 +- |
| 80 |
pym/portage/_global_updates.py | 224 ++-- |
| 81 |
pym/portage/_selinux.py | 4 +- |
| 82 |
pym/portage/_sets/__init__.py | 2 +- |
| 83 |
pym/portage/_sets/base.py | 3 +- |
| 84 |
pym/portage/cache/flat_hash.py | 3 +- |
| 85 |
pym/portage/cache/fs_template.py | 3 +- |
| 86 |
pym/portage/cache/metadata.py | 3 +- |
| 87 |
pym/portage/cache/sqlite.py | 3 +- |
| 88 |
pym/portage/cache/template.py | 3 +- |
| 89 |
pym/portage/checksum.py | 12 +- |
| 90 |
pym/portage/const.py | 169 +++- |
| 91 |
pym/portage/cvstree.py | 274 ++--- |
| 92 |
pym/portage/data.py | 15 +- |
| 93 |
pym/portage/dbapi/bintree.py | 15 +- |
| 94 |
pym/portage/dbapi/porttree.py | 9 +- |
| 95 |
pym/portage/dbapi/vartree.py | 54 +- |
| 96 |
pym/portage/debug.py | 10 +- |
| 97 |
pym/portage/dep/__init__.py | 3 +- |
| 98 |
pym/portage/dispatch_conf.py | 334 +++--- |
| 99 |
pym/portage/eclass_cache.py | 14 +- |
| 100 |
pym/portage/elog/__init__.py | 3 +- |
| 101 |
pym/portage/elog/mod_echo.py | 3 +- |
| 102 |
pym/portage/elog/mod_syslog.py | 13 +- |
| 103 |
pym/portage/emaint/main.py | 23 +- |
| 104 |
pym/portage/emaint/module.py | 8 +- |
| 105 |
pym/portage/emaint/modules/binhost/binhost.py | 4 +- |
| 106 |
pym/portage/env/loaders.py | 26 +- |
| 107 |
pym/portage/exception.py | 54 +- |
| 108 |
pym/portage/getbinpkg.py | 172 ++-- |
| 109 |
pym/portage/glsa.py | 4 +- |
| 110 |
pym/portage/localization.py | 7 +- |
| 111 |
pym/portage/locks.py | 44 +- |
| 112 |
pym/portage/mail.py | 7 +- |
| 113 |
pym/portage/manifest.py | 3 +- |
| 114 |
pym/portage/output.py | 32 +- |
| 115 |
.../package/ebuild/_config/LocationsManager.py | 4 +- |
| 116 |
pym/portage/package/ebuild/_config/MaskManager.py | 4 +- |
| 117 |
pym/portage/package/ebuild/_config/UseManager.py | 2 +- |
| 118 |
pym/portage/package/ebuild/config.py | 18 +- |
| 119 |
pym/portage/package/ebuild/fetch.py | 7 +- |
| 120 |
pym/portage/package/ebuild/getmaskingreason.py | 2 +- |
| 121 |
pym/portage/package/ebuild/getmaskingstatus.py | 3 +- |
| 122 |
pym/portage/process.py | 7 +- |
| 123 |
pym/portage/proxy/lazyimport.py | 3 +- |
| 124 |
pym/portage/repository/config.py | 35 +- |
| 125 |
pym/portage/tests/__init__.py | 54 +- |
| 126 |
pym/portage/tests/dbapi/test_portdb_cache.py | 12 +- |
| 127 |
pym/portage/tests/dep/test_match_from_list.py | 3 +- |
| 128 |
pym/portage/tests/ebuild/test_config.py | 5 +- |
| 129 |
pym/portage/tests/emerge/test_emerge_slot_abi.py | 6 +- |
| 130 |
pym/portage/tests/emerge/test_simple.py | 23 +- |
| 131 |
pym/portage/tests/lint/test_compile_modules.py | 22 +- |
| 132 |
pym/portage/tests/repoman/test_simple.py | 7 +- |
| 133 |
pym/portage/tests/resolver/ResolverPlayground.py | 113 +-- |
| 134 |
pym/portage/tests/resolver/test_backtracking.py | 13 +- |
| 135 |
pym/portage/tests/resolver/test_blocker.py | 48 + |
| 136 |
pym/portage/tests/resolver/test_multirepo.py | 84 +- |
| 137 |
pym/portage/tests/resolver/test_onlydeps.py | 34 + |
| 138 |
pym/portage/tests/resolver/test_package_tracker.py | 261 +++++ |
| 139 |
pym/portage/tests/resolver/test_slot_collisions.py | 106 +- |
| 140 |
.../tests/resolver/test_slot_conflict_rebuild.py | 303 +++++- |
| 141 |
pym/portage/tests/resolver/test_useflags.py | 78 ++ |
| 142 |
pym/portage/tests/runTests | 4 +- |
| 143 |
pym/portage/tests/unicode/test_string_format.py | 3 +- |
| 144 |
pym/portage/tests/util/test_getconfig.py | 27 +- |
| 145 |
pym/portage/tests/util/test_whirlpool.py | 4 +- |
| 146 |
pym/portage/update.py | 3 +- |
| 147 |
pym/portage/util/ExtractKernelVersion.py | 6 +- |
| 148 |
pym/portage/util/SlotObject.py | 1 - |
| 149 |
pym/portage/util/__init__.py | 123 +-- |
| 150 |
.../util/_dyn_libs/PreservedLibsRegistry.py | 3 +- |
| 151 |
pym/portage/util/_info_files.py | 20 +- |
| 152 |
pym/portage/util/_urlopen.py | 5 +- |
| 153 |
pym/portage/util/digraph.py | 36 +- |
| 154 |
pym/portage/util/env_update.py | 11 +- |
| 155 |
pym/portage/util/lafilefixer.py | 10 +- |
| 156 |
pym/portage/util/movefile.py | 34 +- |
| 157 |
pym/portage/util/writeable_check.py | 79 ++ |
| 158 |
pym/portage/versions.py | 14 +- |
| 159 |
pym/portage/xpak.py | 8 +- |
| 160 |
pym/repoman/checks.py | 33 +- |
| 161 |
pym/repoman/utilities.py | 44 + |
| 162 |
runtests.sh | 17 +- |
| 163 |
tabcheck.py | 2 +- |
| 164 |
153 files changed, 4585 insertions(+), 1926 deletions(-) |
| 165 |
|
| 166 |
diff --cc pym/portage/const.py |
| 167 |
index b6aac96,1785bff..d71bbf2 |
| 168 |
--- a/pym/portage/const.py |
| 169 |
+++ b/pym/portage/const.py |
| 170 |
@@@ -83,42 -84,117 +84,119 @@@ CVS_PACKAGE_ATOM = "dev-vcs/cvs |
| 171 |
GIT_PACKAGE_ATOM = "dev-vcs/git" |
| 172 |
RSYNC_PACKAGE_ATOM = "net-misc/rsync" |
| 173 |
|
| 174 |
- INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", |
| 175 |
- "FEATURES", "ACCEPT_KEYWORDS", |
| 176 |
- "CONFIG_PROTECT_MASK", "CONFIG_PROTECT", |
| 177 |
- "IUSE_IMPLICIT", |
| 178 |
- "PRELINK_PATH", "PRELINK_PATH_MASK", |
| 179 |
- "PROFILE_ONLY_VARIABLES", |
| 180 |
- "USE_EXPAND_IMPLICIT", "USE_EXPAND_UNPREFIXED", |
| 181 |
- "NO_AUTO_FLAG", "RESTRICT_MULTILIB_BINARIES") |
| 182 |
- EBUILD_PHASES = ("pretend", "setup", "unpack", "prepare", "configure", |
| 183 |
- "compile", "test", "install", |
| 184 |
- "package", "preinst", "postinst","prerm", "postrm", |
| 185 |
- "nofetch", "config", "info", "other") |
| 186 |
+ INCREMENTALS = ( |
| 187 |
+ "ACCEPT_KEYWORDS", |
| 188 |
+ "CONFIG_PROTECT", |
| 189 |
+ "CONFIG_PROTECT_MASK", |
| 190 |
+ "FEATURES", |
| 191 |
+ "IUSE_IMPLICIT", |
| 192 |
+ "PRELINK_PATH", |
| 193 |
+ "PRELINK_PATH_MASK", |
| 194 |
+ "PROFILE_ONLY_VARIABLES", |
| 195 |
+ "USE", |
| 196 |
+ "USE_EXPAND", |
| 197 |
+ "USE_EXPAND_HIDDEN", |
| 198 |
+ "USE_EXPAND_IMPLICIT", |
| 199 |
+ "USE_EXPAND_UNPREFIXED", |
| 200 |
++ "NO_AUTO_FLAG", "RESTRICT_MULTILIB_BINARIES" |
| 201 |
+ ) |
| 202 |
+ EBUILD_PHASES = ( |
| 203 |
+ "pretend", |
| 204 |
+ "setup", |
| 205 |
+ "unpack", |
| 206 |
+ "prepare", |
| 207 |
+ "configure", |
| 208 |
+ "compile", |
| 209 |
+ "test", |
| 210 |
+ "install", |
| 211 |
+ "package", |
| 212 |
+ "preinst", |
| 213 |
+ "postinst", |
| 214 |
+ "prerm", |
| 215 |
+ "postrm", |
| 216 |
+ "nofetch", |
| 217 |
+ "config", |
| 218 |
+ "info", |
| 219 |
+ "other", |
| 220 |
+ ) |
| 221 |
SUPPORTED_FEATURES = frozenset([ |
| 222 |
- "assume-digests", "binpkg-logs", "buildpkg", "buildsyspkg", "candy", |
| 223 |
- "ccache", "cgroup", "chflags", "clean-logs", |
| 224 |
- "collision-protect", "compress-build-logs", "compressdebug", |
| 225 |
- "compress-index", "config-protect-if-modified", |
| 226 |
- "digest", "distcc", "distcc-pump", "distlocks", |
| 227 |
- "downgrade-backup", "ebuild-locks", "fakeroot", |
| 228 |
- "fail-clean", "force-mirror", "force-multilib", "force-prefix", "getbinpkg", |
| 229 |
- "installsources", "ipc-sandbox", |
| 230 |
- "keeptemp", "keepwork", "fixlafiles", "lmirror", |
| 231 |
- "merge-sync", |
| 232 |
- "metadata-transfer", "mirror", "multilib-strict", |
| 233 |
- "network-sandbox", "news", |
| 234 |
- "noauto", "noclean", "nodoc", "noinfo", "noman", |
| 235 |
- "nostrip", "notitles", "parallel-fetch", "parallel-install", |
| 236 |
- "prelink-checksums", "preserve-libs", |
| 237 |
- "protect-owned", "python-trace", "sandbox", |
| 238 |
- "selinux", "sesandbox", "sfperms", |
| 239 |
- "sign", "skiprocheck", "split-elog", "split-log", "splitdebug", |
| 240 |
- "strict", "stricter", "suidctl", "test", "test-fail-continue", |
| 241 |
- "unknown-features-filter", "unknown-features-warn", |
| 242 |
- "unmerge-backup", |
| 243 |
- "unmerge-logs", "unmerge-orphans", "userfetch", "userpriv", |
| 244 |
- "usersandbox", "usersync", "webrsync-gpg", "xattr"]) |
| 245 |
+ "assume-digests", |
| 246 |
+ "binpkg-logs", |
| 247 |
+ "buildpkg", |
| 248 |
+ "buildsyspkg", |
| 249 |
+ "candy", |
| 250 |
+ "ccache", |
| 251 |
+ "cgroup", |
| 252 |
+ "chflags", |
| 253 |
+ "clean-logs", |
| 254 |
+ "collision-protect", |
| 255 |
+ "compress-build-logs", |
| 256 |
+ "compressdebug", |
| 257 |
+ "compress-index", |
| 258 |
+ "config-protect-if-modified", |
| 259 |
+ "digest", |
| 260 |
+ "distcc", |
| 261 |
+ "distcc-pump", |
| 262 |
+ "distlocks", |
| 263 |
+ "downgrade-backup", |
| 264 |
+ "ebuild-locks", |
| 265 |
+ "fail-clean", |
| 266 |
+ "fakeroot", |
| 267 |
+ "fixlafiles", |
| 268 |
+ "force-mirror", |
| 269 |
++ "force-multilib", |
| 270 |
+ "force-prefix", |
| 271 |
+ "getbinpkg", |
| 272 |
+ "installsources", |
| 273 |
+ "ipc-sandbox", |
| 274 |
+ "keeptemp", |
| 275 |
+ "keepwork", |
| 276 |
+ "lmirror", |
| 277 |
+ "merge-sync", |
| 278 |
+ "metadata-transfer", |
| 279 |
+ "mirror", |
| 280 |
+ "multilib-strict", |
| 281 |
+ "network-sandbox", |
| 282 |
+ "news", |
| 283 |
+ "noauto", |
| 284 |
+ "noclean", |
| 285 |
+ "nodoc", |
| 286 |
+ "noinfo", |
| 287 |
+ "noman", |
| 288 |
+ "nostrip", |
| 289 |
+ "notitles", |
| 290 |
+ "parallel-fetch", |
| 291 |
+ "parallel-install", |
| 292 |
+ "prelink-checksums", |
| 293 |
+ "preserve-libs", |
| 294 |
+ "protect-owned", |
| 295 |
+ "python-trace", |
| 296 |
+ "sandbox", |
| 297 |
+ "selinux", |
| 298 |
+ "sesandbox", |
| 299 |
+ "sfperms", |
| 300 |
+ "sign", |
| 301 |
+ "skiprocheck", |
| 302 |
+ "splitdebug", |
| 303 |
+ "split-elog", |
| 304 |
+ "split-log", |
| 305 |
+ "strict", |
| 306 |
+ "stricter", |
| 307 |
+ "suidctl", |
| 308 |
+ "test", |
| 309 |
+ "test-fail-continue", |
| 310 |
+ "unknown-features-filter", |
| 311 |
+ "unknown-features-warn", |
| 312 |
+ "unmerge-backup", |
| 313 |
+ "unmerge-logs", |
| 314 |
+ "unmerge-orphans", |
| 315 |
+ "userfetch", |
| 316 |
+ "userpriv", |
| 317 |
+ "usersandbox", |
| 318 |
+ "usersync", |
| 319 |
+ "webrsync-gpg", |
| 320 |
+ "xattr", |
| 321 |
+ ]) |
| 322 |
|
| 323 |
EAPI = 5 |
Archives