| 1 |
commit: 3c689a5900519c178b860bfefbb93967231785df |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 15:07:09 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 15:07:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3c689a59 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
.gitignore | 2 + |
| 11 |
.travis.yml | 14 +- |
| 12 |
MANIFEST.in | 1 - |
| 13 |
NEWS | 26 + |
| 14 |
README | 19 + |
| 15 |
RELEASE-NOTES | 97 ++- |
| 16 |
bin/chpathtool.py | 2 +- |
| 17 |
bin/dispatch-conf | 15 +- |
| 18 |
bin/eapi.sh | 4 - |
| 19 |
bin/ebuild | 25 +- |
| 20 |
bin/ebuild.sh | 41 +- |
| 21 |
bin/egencache | 87 +-- |
| 22 |
bin/glsa-check | 19 +- |
| 23 |
bin/helper-functions.sh | 9 +- |
| 24 |
bin/install-qa-check.d/10executable-issues | 24 +- |
| 25 |
bin/install-qa-check.d/60openrc | 8 +- |
| 26 |
bin/install-qa-check.d/80libraries | 2 +- |
| 27 |
bin/install-qa-check.d/90gcc-warnings | 14 +- |
| 28 |
bin/phase-functions.sh | 8 +- |
| 29 |
bin/phase-helpers.sh | 18 +- |
| 30 |
bin/portageq | 13 +- |
| 31 |
bin/save-ebuild-env.sh | 2 +- |
| 32 |
bin/socks5-server.py | 5 + |
| 33 |
cnf/make.conf.example | 20 +- |
| 34 |
cnf/make.conf.example.alpha.diff | 2 +- |
| 35 |
cnf/make.conf.example.amd64-fbsd.diff | 2 +- |
| 36 |
cnf/make.conf.example.amd64.diff | 2 +- |
| 37 |
cnf/make.conf.example.arm.diff | 4 +- |
| 38 |
cnf/make.conf.example.hppa.diff | 2 +- |
| 39 |
cnf/make.conf.example.ia64.diff | 2 +- |
| 40 |
cnf/make.conf.example.m68k.diff | 2 +- |
| 41 |
cnf/make.conf.example.mips.diff | 2 +- |
| 42 |
cnf/make.conf.example.ppc.diff | 2 +- |
| 43 |
cnf/make.conf.example.ppc64.diff | 2 +- |
| 44 |
cnf/make.conf.example.s390.diff | 2 +- |
| 45 |
cnf/make.conf.example.sh.diff | 4 +- |
| 46 |
cnf/make.conf.example.sparc-fbsd.diff | 2 +- |
| 47 |
cnf/make.conf.example.sparc.diff | 8 +- |
| 48 |
cnf/make.conf.example.x86-fbsd.diff | 2 +- |
| 49 |
cnf/make.conf.example.x86.diff | 2 +- |
| 50 |
cnf/make.globals | 4 +- |
| 51 |
cnf/metadata.dtd | 102 --- |
| 52 |
doc/config/sets.docbook | 4 +- |
| 53 |
doc/package/ebuild/eapi/4-python.docbook | 2 +- |
| 54 |
doc/package/ebuild/eapi/5-progress.docbook | 2 +- |
| 55 |
doc/qa.docbook | 12 +- |
| 56 |
man/color.map.5 | 2 +- |
| 57 |
man/dispatch-conf.1 | 2 +- |
| 58 |
man/ebuild.1 | 2 +- |
| 59 |
man/ebuild.5 | 10 +- |
| 60 |
man/egencache.1 | 2 +- |
| 61 |
man/emaint.1 | 10 +- |
| 62 |
man/emerge.1 | 32 +- |
| 63 |
man/emirrordist.1 | 2 +- |
| 64 |
man/env-update.1 | 2 +- |
| 65 |
man/etc-update.1 | 2 +- |
| 66 |
man/fixpackages.1 | 2 +- |
| 67 |
man/make.conf.5 | 20 +- |
| 68 |
man/portage.5 | 23 +- |
| 69 |
man/quickpkg.1 | 2 +- |
| 70 |
man/ru/color.map.5 | 2 +- |
| 71 |
man/ru/dispatch-conf.1 | 2 +- |
| 72 |
man/ru/ebuild.1 | 2 +- |
| 73 |
man/ru/env-update.1 | 2 +- |
| 74 |
man/ru/etc-update.1 | 2 +- |
| 75 |
man/ru/fixpackages.1 | 2 +- |
| 76 |
pym/_emerge/EbuildBuild.py | 22 +- |
| 77 |
pym/_emerge/EbuildPhase.py | 2 +- |
| 78 |
pym/_emerge/MiscFunctionsProcess.py | 3 +- |
| 79 |
pym/_emerge/Scheduler.py | 24 +- |
| 80 |
pym/_emerge/actions.py | 51 +- |
| 81 |
pym/_emerge/depgraph.py | 178 +++-- |
| 82 |
pym/_emerge/main.py | 41 +- |
| 83 |
pym/_emerge/post_emerge.py | 6 +- |
| 84 |
pym/_emerge/resolver/output.py | 5 +- |
| 85 |
pym/_emerge/resolver/output_helpers.py | 11 + |
| 86 |
pym/_emerge/resolver/slot_collision.py | 37 +- |
| 87 |
pym/_emerge/search.py | 26 +- |
| 88 |
pym/portage/__init__.py | 23 +- |
| 89 |
pym/portage/_emirrordist/FetchTask.py | 2 +- |
| 90 |
pym/portage/_selinux.py | 24 +- |
| 91 |
pym/portage/_sets/__init__.py | 37 +- |
| 92 |
pym/portage/cache/anydbm.py | 4 +- |
| 93 |
pym/portage/cache/ebuild_xattr.py | 2 +- |
| 94 |
pym/portage/cache/flat_hash.py | 53 +- |
| 95 |
pym/portage/cache/fs_template.py | 2 +- |
| 96 |
pym/portage/cache/mappings.py | 4 +- |
| 97 |
pym/portage/cache/sqlite.py | 4 +- |
| 98 |
pym/portage/cache/template.py | 36 +- |
| 99 |
pym/portage/const.py | 2 +- |
| 100 |
pym/portage/data.py | 2 +- |
| 101 |
pym/portage/dbapi/_SyncfsProcess.py | 2 +- |
| 102 |
pym/portage/dbapi/bintree.py | 40 +- |
| 103 |
pym/portage/dbapi/porttree.py | 4 +- |
| 104 |
pym/portage/dbapi/vartree.py | 135 +++- |
| 105 |
pym/portage/dep/__init__.py | 16 +- |
| 106 |
pym/portage/dep/dep_check.py | 41 +- |
| 107 |
pym/portage/dispatch_conf.py | 2 +- |
| 108 |
pym/portage/emaint/main.py | 12 +- |
| 109 |
pym/portage/emaint/modules/binhost/__init__.py | 1 + |
| 110 |
pym/portage/emaint/modules/binhost/binhost.py | 6 +- |
| 111 |
pym/portage/emaint/modules/config/__init__.py | 1 + |
| 112 |
pym/portage/emaint/modules/config/config.py | 6 +- |
| 113 |
pym/portage/emaint/modules/logs/__init__.py | 1 + |
| 114 |
pym/portage/emaint/modules/logs/logs.py | 27 +- |
| 115 |
pym/portage/emaint/modules/merges/__init__.py | 1 + |
| 116 |
pym/portage/emaint/modules/merges/merges.py | 18 +- |
| 117 |
pym/portage/emaint/modules/move/__init__.py | 2 + |
| 118 |
pym/portage/emaint/modules/move/move.py | 9 +- |
| 119 |
pym/portage/emaint/modules/resume/__init__.py | 1 + |
| 120 |
pym/portage/emaint/modules/resume/resume.py | 3 +- |
| 121 |
pym/portage/emaint/modules/sync/__init__.py | 1 + |
| 122 |
pym/portage/emaint/modules/sync/sync.py | 19 +- |
| 123 |
pym/portage/emaint/modules/world/__init__.py | 1 + |
| 124 |
pym/portage/emaint/modules/world/world.py | 8 +- |
| 125 |
pym/portage/glsa.py | 8 +- |
| 126 |
pym/portage/localization.py | 6 +- |
| 127 |
pym/portage/locks.py | 59 +- |
| 128 |
pym/portage/manifest.py | 23 +- |
| 129 |
pym/portage/metadata.py | 2 +- |
| 130 |
pym/portage/module.py | 15 +- |
| 131 |
pym/portage/news.py | 79 ++- |
| 132 |
pym/portage/output.py | 2 +- |
| 133 |
pym/portage/package/ebuild/config.py | 25 +- |
| 134 |
pym/portage/package/ebuild/digestcheck.py | 2 +- |
| 135 |
pym/portage/package/ebuild/doebuild.py | 28 +- |
| 136 |
pym/portage/package/ebuild/prepare_build_dirs.py | 6 - |
| 137 |
pym/portage/process.py | 4 + |
| 138 |
pym/portage/repository/config.py | 65 +- |
| 139 |
pym/portage/sync/modules/cvs/__init__.py | 1 + |
| 140 |
pym/portage/sync/modules/cvs/cvs.py | 4 +- |
| 141 |
pym/portage/sync/modules/git/__init__.py | 1 + |
| 142 |
pym/portage/sync/modules/git/git.py | 4 +- |
| 143 |
pym/portage/sync/modules/rsync/__init__.py | 1 + |
| 144 |
pym/portage/sync/modules/rsync/rsync.py | 4 +- |
| 145 |
pym/portage/sync/modules/svn/__init__.py | 1 + |
| 146 |
pym/portage/sync/modules/svn/svn.py | 6 +- |
| 147 |
pym/portage/sync/modules/webrsync/__init__.py | 1 + |
| 148 |
pym/portage/sync/modules/webrsync/webrsync.py | 2 +- |
| 149 |
.../tests/ebuild/test_array_fromfile_eof.py | 2 +- |
| 150 |
pym/portage/tests/ebuild/test_ipc_daemon.py | 23 +- |
| 151 |
...bi.py => test_emerge_blocker_file_collision.py} | 101 ++- |
| 152 |
pym/portage/tests/emerge/test_simple.py | 18 +- |
| 153 |
pym/portage/tests/news/test_NewsItem.py | 1 + |
| 154 |
pym/portage/tests/process/test_poll.py | 2 +- |
| 155 |
pym/portage/tests/resolver/ResolverPlayground.py | 24 +- |
| 156 |
.../soname/test_slot_conflict_reinstall.py | 1 + |
| 157 |
.../resolver/test_imagemagick_graphicsmagick.py | 104 +++ |
| 158 |
.../resolver/test_runtime_cycle_merge_order.py | 72 ++ |
| 159 |
.../tests/resolver/test_slot_conflict_rebuild.py | 2 +- |
| 160 |
.../resolver/test_slot_operator_reverse_deps.py | 113 +++ |
| 161 |
pym/portage/tests/util/test_getconfig.py | 4 +- |
| 162 |
pym/portage/util/__init__.py | 8 +- |
| 163 |
pym/portage/util/_desktop_entry.py | 27 +- |
| 164 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 38 +- |
| 165 |
pym/portage/util/_dyn_libs/LinkageMapMachO.py | 4 +- |
| 166 |
pym/portage/util/_eventloop/EventLoop.py | 17 +- |
| 167 |
pym/portage/util/changelog.py | 69 ++ |
| 168 |
pym/portage/util/configparser.py | 76 +++ |
| 169 |
pym/portage/util/env_update.py | 6 +- |
| 170 |
pym/{repoman => portage/util/futures}/__init__.py | 0 |
| 171 |
pym/portage/util/futures/extendedfutures.py | 73 ++ |
| 172 |
pym/portage/util/futures/futures.py | 118 ++++ |
| 173 |
pym/portage/util/locale.py | 20 +- |
| 174 |
pym/portage/util/writeable_check.py | 28 +- |
| 175 |
pym/portage/versions.py | 31 +- |
| 176 |
pym/portage/xml/metadata.py | 89 ++- |
| 177 |
pym/portage/xpak.py | 2 +- |
| 178 |
pym/repoman/_xml.py | 106 --- |
| 179 |
pym/repoman/checks/ebuilds/eclasses/live.py | 39 -- |
| 180 |
pym/repoman/checks/ebuilds/isebuild.py | 71 -- |
| 181 |
pym/repoman/checks/ebuilds/manifests.py | 102 --- |
| 182 |
pym/repoman/checks/ebuilds/misc.py | 57 -- |
| 183 |
pym/repoman/checks/ebuilds/pkgmetadata.py | 177 ----- |
| 184 |
pym/repoman/checks/ebuilds/thirdpartymirrors.py | 39 -- |
| 185 |
pym/repoman/checks/ebuilds/variables/eapi.py | 44 -- |
| 186 |
pym/repoman/checks/ebuilds/variables/license.py | 47 -- |
| 187 |
pym/repoman/checks/herds/__init__.py | 0 |
| 188 |
pym/repoman/ebuild.py | 29 - |
| 189 |
pym/repoman/metadata.py | 153 ----- |
| 190 |
pym/repoman/modules/__init__.py | 0 |
| 191 |
pym/repoman/modules/commit/__init__.py | 0 |
| 192 |
pym/repoman/modules/fix/__init__.py | 0 |
| 193 |
pym/repoman/modules/full/__init__.py | 0 |
| 194 |
pym/repoman/modules/manifest/__init__.py | 0 |
| 195 |
pym/repoman/modules/scan/__init__.py | 0 |
| 196 |
pym/repoman/scan.py | 172 ----- |
| 197 |
pym/repoman/scanner.py | 755 --------------------- |
| 198 |
pym/repoman/vcs/__init__.py | 0 |
| 199 |
pym/repoman/vcs/vcs.py | 287 -------- |
| 200 |
pym/repoman/vcs/vcsstatus.py | 114 ---- |
| 201 |
.../__test__.py => repoman/.repoman_not_installed | 0 |
| 202 |
repoman/MANIFEST.in | 3 + |
| 203 |
repoman/NEWS | 9 + |
| 204 |
README => repoman/README | 9 - |
| 205 |
repoman/RELEASE-NOTES | 39 ++ |
| 206 |
TEST-NOTES => repoman/TEST-NOTES | 0 |
| 207 |
{bin => repoman/bin}/repoman | 11 +- |
| 208 |
repoman/cnf/metadata.xsd | 548 +++++++++++++++ |
| 209 |
{man => repoman/man}/repoman.1 | 13 +- |
| 210 |
repoman/pym/repoman/__init__.py | 79 +++ |
| 211 |
{pym => repoman/pym}/repoman/_portage.py | 0 |
| 212 |
{pym => repoman/pym}/repoman/_subprocess.py | 4 +- |
| 213 |
{pym => repoman/pym}/repoman/actions.py | 471 +++---------- |
| 214 |
{pym => repoman/pym}/repoman/argparser.py | 0 |
| 215 |
{pym => repoman/pym}/repoman/check_missingslot.py | 0 |
| 216 |
{pym => repoman/pym}/repoman/checks/__init__.py | 0 |
| 217 |
.../pym/repoman/checks/herds}/__init__.py | 0 |
| 218 |
.../pym}/repoman/checks/herds/herdbase.py | 2 +- |
| 219 |
.../pym}/repoman/checks/herds/metadata.py | 0 |
| 220 |
{pym => repoman/pym}/repoman/copyrights.py | 0 |
| 221 |
{pym => repoman/pym}/repoman/errors.py | 0 |
| 222 |
{pym => repoman/pym}/repoman/gpg.py | 2 +- |
| 223 |
{pym => repoman/pym}/repoman/main.py | 49 +- |
| 224 |
repoman/pym/repoman/metadata.py | 128 ++++ |
| 225 |
.../pym/repoman/modules}/__init__.py | 0 |
| 226 |
.../pym/repoman/modules/commit}/__init__.py | 0 |
| 227 |
repoman/pym/repoman/modules/commit/manifest.py | 115 ++++ |
| 228 |
.../pym}/repoman/modules/commit/repochecks.py | 4 +- |
| 229 |
.../pym/repoman/modules/scan}/__init__.py | 0 |
| 230 |
.../pym/repoman/modules/scan/depend/__init__.py | 32 + |
| 231 |
.../repoman/modules/scan/depend/_depend_checks.py | 194 ++++++ |
| 232 |
.../pym/repoman/modules/scan/depend/_gen_arches.py | 57 ++ |
| 233 |
repoman/pym/repoman/modules/scan/depend/profile.py | 256 +++++++ |
| 234 |
.../repoman/modules/scan/directories/__init__.py | 48 ++ |
| 235 |
.../pym/repoman/modules/scan}/directories/files.py | 43 +- |
| 236 |
.../pym/repoman/modules/scan/directories/mtime.py | 30 + |
| 237 |
repoman/pym/repoman/modules/scan/eapi/__init__.py | 29 + |
| 238 |
repoman/pym/repoman/modules/scan/eapi/eapi.py | 49 ++ |
| 239 |
.../pym/repoman/modules/scan/ebuild/__init__.py | 58 ++ |
| 240 |
.../pym/repoman/modules/scan/ebuild}/checks.py | 8 +- |
| 241 |
repoman/pym/repoman/modules/scan/ebuild/ebuild.py | 238 +++++++ |
| 242 |
.../pym/repoman/modules/scan/ebuild}/errors.py | 0 |
| 243 |
.../pym/repoman/modules/scan/ebuild/multicheck.py | 56 ++ |
| 244 |
.../pym/repoman/modules/scan/eclasses/__init__.py | 47 ++ |
| 245 |
repoman/pym/repoman/modules/scan/eclasses/live.py | 76 +++ |
| 246 |
.../pym/repoman/modules/scan}/eclasses/ruby.py | 26 +- |
| 247 |
repoman/pym/repoman/modules/scan/fetch/__init__.py | 33 + |
| 248 |
.../pym/repoman/modules/scan/fetch}/fetches.py | 103 ++- |
| 249 |
.../pym/repoman/modules/scan/keywords/__init__.py | 33 + |
| 250 |
.../pym/repoman/modules/scan/keywords}/keywords.py | 95 +-- |
| 251 |
.../pym/repoman/modules/scan/manifest/__init__.py | 30 + |
| 252 |
.../pym/repoman/modules/scan/manifest/manifests.py | 56 ++ |
| 253 |
.../pym/repoman/modules/scan/metadata/__init__.py | 85 +++ |
| 254 |
.../repoman/modules/scan/metadata}/description.py | 23 +- |
| 255 |
.../modules/scan/metadata/ebuild_metadata.py | 84 +++ |
| 256 |
.../repoman/modules/scan/metadata/pkgmetadata.py | 198 ++++++ |
| 257 |
.../pym/repoman/modules/scan/metadata}/restrict.py | 32 +- |
| 258 |
.../repoman/modules/scan/metadata}/use_flags.py | 28 +- |
| 259 |
.../pym/repoman/modules/scan/options/__init__.py | 28 + |
| 260 |
.../pym/repoman/modules/scan/options/options.py | 29 + |
| 261 |
repoman/pym/repoman/modules/scan/scan.py | 66 ++ |
| 262 |
repoman/pym/repoman/modules/scan/scanbase.py | 79 +++ |
| 263 |
repoman/pym/repoman/modules/vcs/None/__init__.py | 34 + |
| 264 |
repoman/pym/repoman/modules/vcs/None/changes.py | 50 ++ |
| 265 |
repoman/pym/repoman/modules/vcs/None/status.py | 53 ++ |
| 266 |
repoman/pym/repoman/modules/vcs/__init__.py | 14 + |
| 267 |
repoman/pym/repoman/modules/vcs/bzr/__init__.py | 34 + |
| 268 |
repoman/pym/repoman/modules/vcs/bzr/changes.py | 68 ++ |
| 269 |
repoman/pym/repoman/modules/vcs/bzr/status.py | 70 ++ |
| 270 |
repoman/pym/repoman/modules/vcs/changes.py | 169 +++++ |
| 271 |
repoman/pym/repoman/modules/vcs/cvs/__init__.py | 34 + |
| 272 |
repoman/pym/repoman/modules/vcs/cvs/changes.py | 118 ++++ |
| 273 |
repoman/pym/repoman/modules/vcs/cvs/status.py | 131 ++++ |
| 274 |
repoman/pym/repoman/modules/vcs/git/__init__.py | 34 + |
| 275 |
repoman/pym/repoman/modules/vcs/git/changes.py | 120 ++++ |
| 276 |
repoman/pym/repoman/modules/vcs/git/status.py | 79 +++ |
| 277 |
repoman/pym/repoman/modules/vcs/hg/__init__.py | 34 + |
| 278 |
repoman/pym/repoman/modules/vcs/hg/changes.py | 105 +++ |
| 279 |
repoman/pym/repoman/modules/vcs/hg/status.py | 65 ++ |
| 280 |
repoman/pym/repoman/modules/vcs/settings.py | 108 +++ |
| 281 |
repoman/pym/repoman/modules/vcs/svn/__init__.py | 34 + |
| 282 |
repoman/pym/repoman/modules/vcs/svn/changes.py | 142 ++++ |
| 283 |
repoman/pym/repoman/modules/vcs/svn/status.py | 150 ++++ |
| 284 |
repoman/pym/repoman/modules/vcs/vcs.py | 161 +++++ |
| 285 |
{pym => repoman/pym}/repoman/profile.py | 0 |
| 286 |
{pym => repoman/pym}/repoman/qa_data.py | 9 +- |
| 287 |
{pym => repoman/pym}/repoman/qa_tracker.py | 0 |
| 288 |
{pym => repoman/pym}/repoman/repos.py | 13 +- |
| 289 |
repoman/pym/repoman/scanner.py | 436 ++++++++++++ |
| 290 |
.../pym/repoman}/tests/__init__.py | 17 +- |
| 291 |
.../bin => repoman/pym/repoman/tests}/__test__.py | 0 |
| 292 |
.../pym/repoman/tests/changelog}/__init__.py | 0 |
| 293 |
.../repoman/tests/changelog}/test_echangelog.py | 0 |
| 294 |
.../pym/repoman}/tests/runTests.py | 24 +- |
| 295 |
.../pym/repoman/tests/simple}/__init__.py | 0 |
| 296 |
repoman/pym/repoman/tests/simple/__test__.py | 1 + |
| 297 |
.../pym/repoman/tests/simple}/test_simple.py | 25 +- |
| 298 |
{pym => repoman/pym}/repoman/utilities.py | 7 - |
| 299 |
runtests => repoman/runtests | 22 +- |
| 300 |
setup.py => repoman/setup.py | 205 +----- |
| 301 |
runtests | 16 +- |
| 302 |
setup.py | 42 +- |
| 303 |
src/portage_util_libc.c | 68 ++ |
| 304 |
testpath | 9 +- |
| 305 |
295 files changed, 7876 insertions(+), 3900 deletions(-) |
| 306 |
|
| 307 |
diff --cc bin/dispatch-conf |
| 308 |
index 4215e5b,fdf564e..befc8dc |
| 309 |
--- a/bin/dispatch-conf |
| 310 |
+++ b/bin/dispatch-conf |
| 311 |
@@@ -1,5 -1,5 +1,5 @@@ |
| 312 |
-#!/usr/bin/python -bO |
| 313 |
+#!@PREFIX_PORTAGE_PYTHON@ -bO |
| 314 |
- # Copyright 1999-2014 Gentoo Foundation |
| 315 |
+ # Copyright 1999-2016 Gentoo Foundation |
| 316 |
# Distributed under the terms of the GNU General Public License v2 |
| 317 |
|
| 318 |
# |
| 319 |
diff --cc bin/egencache |
| 320 |
index cf503a3,e994b4a..bb7e7a9 |
| 321 |
--- a/bin/egencache |
| 322 |
+++ b/bin/egencache |
| 323 |
@@@ -59,10 -58,10 +58,11 @@@ from portage.util._async.AsyncFunction |
| 324 |
from portage.util._async.run_main_scheduler import run_main_scheduler |
| 325 |
from portage.util._async.TaskScheduler import TaskScheduler |
| 326 |
from portage.util._eventloop.global_event_loop import global_event_loop |
| 327 |
+ from portage.util.changelog import ChangeLogTypeSort |
| 328 |
from portage import cpv_getkey |
| 329 |
from portage.dep import Atom, isjustname |
| 330 |
- from portage.versions import pkgsplit, vercmp, _pkg_str |
| 331 |
+ from portage.versions import vercmp |
| 332 |
+from portage.const import EPREFIX |
| 333 |
|
| 334 |
try: |
| 335 |
from xml.etree import ElementTree |
| 336 |
diff --cc bin/portageq |
| 337 |
index ef2c7fb,06c8e0e..616aee0 |
| 338 |
--- a/bin/portageq |
| 339 |
+++ b/bin/portageq |
| 340 |
@@@ -1,5 -1,5 +1,5 @@@ |
| 341 |
-#!/usr/bin/python -bO |
| 342 |
+#!@PREFIX_PORTAGE_PYTHON@ -bO |
| 343 |
- # Copyright 1999-2015 Gentoo Foundation |
| 344 |
+ # Copyright 1999-2016 Gentoo Foundation |
| 345 |
# Distributed under the terms of the GNU General Public License v2 |
| 346 |
|
| 347 |
from __future__ import print_function, unicode_literals |
| 348 |
diff --cc cnf/make.conf.example |
| 349 |
index 85a851d,04f3a02..6de7a90 |
| 350 |
--- a/cnf/make.conf.example |
| 351 |
+++ b/cnf/make.conf.example |
| 352 |
@@@ -141,9 -141,9 +141,9 @@@ |
| 353 |
# PORTDIR_OVERLAY is a directory where local ebuilds may be stored without |
| 354 |
# concern that they will be deleted by rsync updates. Default is not |
| 355 |
# defined. |
| 356 |
-#PORTDIR_OVERLAY=/usr/local/portage |
| 357 |
+#PORTDIR_OVERLAY=@PORTAGE_EPREFIX@/usr/local/portage |
| 358 |
|
| 359 |
- # Fetching files |
| 360 |
+ # Fetching files |
| 361 |
# ============== |
| 362 |
# |
| 363 |
# If you need to set a proxy for wget or lukemftp, add the appropriate "export |
| 364 |
@@@ -215,12 -215,8 +215,12 @@@ |
| 365 |
# one of them sync from the rotations above. The other boxes can then rsync |
| 366 |
# from the local rsync server, reducing the load on the mirrors. |
| 367 |
# Instructions for setting up a local rsync server are available here: |
| 368 |
- # http://www.gentoo.org/doc/en/rsync.xml |
| 369 |
+ # https://wiki.gentoo.org/wiki/Local_Mirror |
| 370 |
# |
| 371 |
+# For Gentoo Prefix, use the following URL: |
| 372 |
+# |
| 373 |
+# Default: "rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix |
| 374 |
+# |
| 375 |
#SYNC="rsync://rsync.gentoo.org/gentoo-portage" |
| 376 |
# |
| 377 |
# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve |
| 378 |
diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 379 |
index b32ee81,a063621..54a25e0 |
| 380 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 381 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 382 |
@@@ -19,8 -22,13 +22,14 @@@ from portage.util import normalize_pat |
| 383 |
from portage.util import varexpand |
| 384 |
from portage.util import writemsg_level |
| 385 |
from portage.util._dyn_libs.NeededEntry import NeededEntry |
| 386 |
+ from portage.util.elf.header import ELFHeader |
| 387 |
+from portage.const import EPREFIX |
| 388 |
|
| 389 |
+ if sys.hexversion >= 0x3000000: |
| 390 |
+ _unicode = str |
| 391 |
+ else: |
| 392 |
+ _unicode = unicode |
| 393 |
+ |
| 394 |
# Map ELF e_machine values from NEEDED.ELF.2 to approximate multilib |
| 395 |
# categories. This approximation will produce incorrect results on x32 |
| 396 |
# and mips systems, but the result is not worse than using the raw |
| 397 |
diff --cc pym/portage/util/_dyn_libs/LinkageMapMachO.py |
| 398 |
index 7cfb18e,a063621..5cfbadb |
| 399 |
--- a/pym/portage/util/_dyn_libs/LinkageMapMachO.py |
| 400 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapMachO.py |
| 401 |
@@@ -1,4 -1,4 +1,4 @@@ |
| 402 |
- # Copyright 1998-2011 Gentoo Foundation |
| 403 |
-# Copyright 1998-2016 Gentoo Foundation |
| 404 |
++# Copyright 1998-2017 Gentoo Foundation |
| 405 |
# Distributed under the terms of the GNU General Public License v2 |
| 406 |
|
| 407 |
import errno |
| 408 |
@@@ -231,7 -268,7 +231,7 @@@ class LinkageMapMachO(object) |
| 409 |
continue |
| 410 |
plibs.update((x, cpv) for x in items) |
| 411 |
if plibs: |
| 412 |
- args = [EPREFIX + "/usr/bin/scanmacho", "-qF", "%a;%F;%S;%n"] |
| 413 |
- args = [os.path.join(EPREFIX or "/", "usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"] |
| 414 |
++ args = [os.path.join(EPREFIX or "/", "usr/bin/scanmacho"), "-qF", "%a;%F;%S;%n"] |
| 415 |
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ |
| 416 |
for x in plibs) |
| 417 |
try: |
| 418 |
diff --cc pym/portage/versions.py |
| 419 |
index fc7af27,adfb1c3..fb49967 |
| 420 |
--- a/pym/portage/versions.py |
| 421 |
+++ b/pym/portage/versions.py |
| 422 |
@@@ -257,42 -256,18 +257,42 @@@ def vercmp(ver1, ver2, silent=1) |
| 423 |
if rval: |
| 424 |
return rval |
| 425 |
|
| 426 |
- # the suffix part is equal to, so finally check the revision |
| 427 |
+ # The suffix part is equal too, so finally check the revision |
| 428 |
+ # PREFIX hack: a revision starting with 0 is an 'inter-revision', |
| 429 |
+ # which means that it is possible to create revisions on revisions. |
| 430 |
+ # An example is -r01.1 which is the first revision of -r1. Note |
| 431 |
+ # that a period (.) is used to separate the real revision and the |
| 432 |
+ # secondary revision number. This trick is in use to allow revision |
| 433 |
+ # bumps in ebuilds synced from the main tree for Prefix changes, |
| 434 |
+ # while still staying in the main tree versioning scheme. |
| 435 |
if match1.group(10): |
| 436 |
- r1 = int(match1.group(10)) |
| 437 |
+ if match1.group(10)[0] == '0' and '.' in match1.group(10): |
| 438 |
+ t = match1.group(10)[1:].split(".") |
| 439 |
+ r1 = int(t[0]) |
| 440 |
+ r3 = int(t[1]) |
| 441 |
+ else: |
| 442 |
+ r1 = int(match1.group(10)) |
| 443 |
+ r3 = 0 |
| 444 |
else: |
| 445 |
r1 = 0 |
| 446 |
+ r3 = 0 |
| 447 |
if match2.group(10): |
| 448 |
- r2 = int(match2.group(10)) |
| 449 |
+ if match2.group(10)[0] == '0' and '.' in match2.group(10): |
| 450 |
+ t = match2.group(10)[1:].split(".") |
| 451 |
+ r2 = int(t[0]) |
| 452 |
+ r4 = int(t[1]) |
| 453 |
+ else: |
| 454 |
+ r2 = int(match2.group(10)) |
| 455 |
+ r4 = 0 |
| 456 |
else: |
| 457 |
r2 = 0 |
| 458 |
+ r4 = 0 |
| 459 |
+ if r1 == r2 and (r3 != 0 or r4 != 0): |
| 460 |
+ r1 = r3 |
| 461 |
+ r2 = r4 |
| 462 |
rval = (r1 > r2) - (r1 < r2) |
| 463 |
return rval |
| 464 |
- |
| 465 |
+ |
| 466 |
def pkgcmp(pkg1, pkg2): |
| 467 |
""" |
| 468 |
Compare 2 package versions created in pkgsplit format. |
Archives