| 1 |
commit: 84cf376dc22ed7e23c3a684182d9604a8860819c |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 30 09:19:43 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 30 09:19:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=84cf376d |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
NEWS | 9 + |
| 11 |
RELEASE-NOTES | 46 +++++ |
| 12 |
bin/eapi.sh | 4 + |
| 13 |
bin/ebuild.sh | 4 +- |
| 14 |
bin/estrip | 41 ++-- |
| 15 |
bin/install-qa-check.d/10ignored-flags | 2 +- |
| 16 |
bin/install-qa-check.d/80libraries | 21 +- |
| 17 |
bin/install-qa-check.d/95empty-dirs | 4 +- |
| 18 |
bin/isolated-functions.sh | 10 + |
| 19 |
bin/phase-functions.sh | 16 +- |
| 20 |
bin/phase-helpers.sh | 14 +- |
| 21 |
cnf/make.conf.example | 21 +- |
| 22 |
cnf/make.globals | 4 +- |
| 23 |
cnf/repos.conf | 2 +- |
| 24 |
lib/_emerge/BinpkgVerifier.py | 4 +- |
| 25 |
lib/_emerge/PollScheduler.py | 6 +- |
| 26 |
lib/_emerge/actions.py | 2 +- |
| 27 |
lib/_emerge/depgraph.py | 10 +- |
| 28 |
lib/_emerge/emergelog.py | 2 +- |
| 29 |
lib/portage/__init__.py | 29 ++- |
| 30 |
.../{sync/modules => _compat_upgrade}/__init__.py | 0 |
| 31 |
lib/portage/_compat_upgrade/default_locations.py | 82 ++++++++ |
| 32 |
lib/portage/cache/flat_hash.py | 4 +- |
| 33 |
lib/portage/cache/mappings.py | 30 +-- |
| 34 |
lib/portage/dbapi/__init__.py | 4 +- |
| 35 |
lib/portage/dbapi/porttree.py | 15 +- |
| 36 |
lib/portage/dbapi/vartree.py | 19 +- |
| 37 |
lib/portage/dep/__init__.py | 92 +++++---- |
| 38 |
lib/portage/dep/soname/multilib_category.py | 51 ++++- |
| 39 |
lib/portage/emaint/modules/sync/sync.py | 6 +- |
| 40 |
lib/portage/news.py | 5 +- |
| 41 |
lib/portage/package/ebuild/_config/helper.py | 4 +- |
| 42 |
.../package/ebuild/_config/special_env_vars.py | 7 +- |
| 43 |
lib/portage/package/ebuild/_spawn_nofetch.py | 6 +- |
| 44 |
lib/portage/package/ebuild/config.py | 20 +- |
| 45 |
lib/portage/package/ebuild/doebuild.py | 19 +- |
| 46 |
lib/portage/package/ebuild/fetch.py | 111 ++++++---- |
| 47 |
lib/portage/process.py | 2 +- |
| 48 |
lib/portage/repository/config.py | 15 +- |
| 49 |
lib/portage/sync/__init__.py | 5 +- |
| 50 |
lib/portage/sync/controller.py | 5 +- |
| 51 |
lib/portage/sync/syncbase.py | 6 +- |
| 52 |
lib/portage/tests/dep/testAtom.py | 16 +- |
| 53 |
lib/portage/tests/ebuild/test_fetch.py | 230 +++++++++++++++++++++ |
| 54 |
lib/portage/tests/emerge/test_emerge_slot_abi.py | 14 +- |
| 55 |
lib/portage/tests/news/test_NewsItem.py | 4 +- |
| 56 |
lib/portage/tests/process/test_poll.py | 20 +- |
| 57 |
lib/portage/tests/resolver/ResolverPlayground.py | 4 +- |
| 58 |
lib/portage/tests/resolver/test_slot_abi.py | 42 ++-- |
| 59 |
.../tests/resolver/test_slot_abi_downgrade.py | 32 +-- |
| 60 |
lib/portage/tests/resolver/test_slot_collisions.py | 6 +- |
| 61 |
.../resolver/test_slot_operator_autounmask.py | 18 +- |
| 62 |
lib/portage/tests/resolver/test_targetroot.py | 24 ++- |
| 63 |
lib/portage/tests/update/test_move_slot_ent.py | 18 +- |
| 64 |
.../util/futures/asyncio/test_wakeup_fd_sigchld.py | 10 +- |
| 65 |
lib/portage/util/_eventloop/asyncio_event_loop.py | 5 + |
| 66 |
lib/portage/util/_get_vm_info.py | 9 +- |
| 67 |
lib/portage/util/elf/constants.py | 10 +- |
| 68 |
lib/portage/util/futures/_asyncio/__init__.py | 18 ++ |
| 69 |
lib/portage/util/socks5.py | 10 +- |
| 70 |
lib/portage/xml/metadata.py | 16 +- |
| 71 |
man/ebuild.5 | 111 ++++------ |
| 72 |
man/emerge.1 | 8 +- |
| 73 |
man/make.conf.5 | 27 +-- |
| 74 |
man/portage.5 | 37 ++-- |
| 75 |
man/quickpkg.1 | 4 +- |
| 76 |
repoman/RELEASE-NOTES | 5 + |
| 77 |
repoman/lib/repoman/__init__.py | 4 +- |
| 78 |
repoman/lib/repoman/argparser.py | 33 +-- |
| 79 |
repoman/setup.py | 2 +- |
| 80 |
setup.py | 4 +- |
| 81 |
71 files changed, 1002 insertions(+), 498 deletions(-) |
| 82 |
|
| 83 |
diff --cc bin/phase-functions.sh |
| 84 |
index 1352a16cc,e6380f554..0a8b5eda9 |
| 85 |
--- a/bin/phase-functions.sh |
| 86 |
+++ b/bin/phase-functions.sh |
| 87 |
@@@ -1,5 -1,5 +1,5 @@@ |
| 88 |
-#!/bin/bash |
| 89 |
+#!@PORTAGE_BASH@ |
| 90 |
- # Copyright 1999-2018 Gentoo Foundation |
| 91 |
+ # Copyright 1999-2019 Gentoo Authors |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
|
| 94 |
# Hardcoded bash lists are needed for backward compatibility with |
| 95 |
diff --cc cnf/make.conf.example |
| 96 |
index 34957eddd,a309a5c43..c1d060c7c |
| 97 |
--- a/cnf/make.conf.example |
| 98 |
+++ b/cnf/make.conf.example |
| 99 |
@@@ -107,28 -107,21 +107,21 @@@ |
| 100 |
# this, you must update your /etc/portage/make.profile symlink accordingly. |
| 101 |
# ***Warning*** |
| 102 |
# Data stored inside PORTDIR is in peril of being overwritten or deleted by |
| 103 |
- # the emerge --sync command. The default value of PORTAGE_RSYNC_OPTS |
| 104 |
- # will protect the default locations of DISTDIR and PKGDIR, but users are |
| 105 |
- # warned that any other locations inside PORTDIR are not necessarily safe |
| 106 |
- # for data storage. |
| 107 |
- #PORTDIR=@PORTAGE_EPREFIX@/usr/portage |
| 108 |
+ # the emerge --sync command. |
| 109 |
-#PORTDIR=/var/db/repos/gentoo |
| 110 |
++#PORTDIR=@PORTAGE_EPREFIX@/var/db/repos/gentoo |
| 111 |
# |
| 112 |
# DISTDIR is where all of the source code tarballs will be placed for |
| 113 |
# emerges. After packages are built, it is safe to remove any and |
| 114 |
# all files from this directory since they will be automatically |
| 115 |
# fetched on demand for a given build. If you would like to |
| 116 |
# selectively prune obsolete files from this directory, see |
| 117 |
- # eclean from the gentoolkit package. Note that locations under |
| 118 |
- # /usr/portage are not necessarily safe for data storage. See the |
| 119 |
- # PORTDIR documentation for more information. |
| 120 |
- #DISTDIR=@PORTAGE_EPREFIX@/usr/portage/distfiles |
| 121 |
+ # eclean from the gentoolkit package. |
| 122 |
-#DISTDIR=/var/cache/distfiles |
| 123 |
++#DISTDIR=@PORTAGE_EPREFIX@/var/cache/distfiles |
| 124 |
# |
| 125 |
# PKGDIR is the location of binary packages that you can have created |
| 126 |
# with '--buildpkg' or '-b' while emerging a package. This can get |
| 127 |
- # up to several hundred megs, or even a few gigs. Note that |
| 128 |
- # locations under /usr/portage are not necessarily safe for data |
| 129 |
- # storage. See the PORTDIR documentation for more information. |
| 130 |
- #PKGDIR=@PORTAGE_EPREFIX@/usr/portage/packages |
| 131 |
+ # up to several hundred megs, or even a few gigs. |
| 132 |
-#PKGDIR=/var/cache/binpkgs |
| 133 |
++#PKGDIR=@PORTAGE_EPREFIX@/var/cache/binpkgs |
| 134 |
# |
| 135 |
# PORTAGE_LOGDIR is the location where portage will store all the logs it |
| 136 |
# creates from each individual merge. They are stored as |
| 137 |
diff --cc cnf/make.globals |
| 138 |
index e71325c91,b01cca599..6a1d3b952 |
| 139 |
--- a/cnf/make.globals |
| 140 |
+++ b/cnf/make.globals |
| 141 |
@@@ -27,12 -27,12 +27,12 @@@ ACCEPT_PROPERTIES="* |
| 142 |
ACCEPT_RESTRICT="*" |
| 143 |
|
| 144 |
# Miscellaneous paths |
| 145 |
- DISTDIR="@PORTAGE_EPREFIX@/usr/portage/distfiles" |
| 146 |
- PKGDIR="@PORTAGE_EPREFIX@/usr/portage/packages" |
| 147 |
-DISTDIR="/var/cache/distfiles" |
| 148 |
-PKGDIR="/var/cache/binpkgs" |
| 149 |
-RPMDIR="/usr/portage/rpm" |
| 150 |
++DISTDIR="@PORTAGE_EPREFIX@/var/cache/distfiles" |
| 151 |
++PKGDIR="@PORTAGE_EPREFIX@/var/cache/binpkgs" |
| 152 |
+RPMDIR="@PORTAGE_EPREFIX@/usr/portage/rpm" |
| 153 |
|
| 154 |
# Temporary build directory |
| 155 |
-PORTAGE_TMPDIR="/var/tmp" |
| 156 |
+PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp" |
| 157 |
|
| 158 |
# Fetching command (3 tries, passive ftp for firewall compatibility) |
| 159 |
FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" |
| 160 |
diff --cc cnf/repos.conf |
| 161 |
index 3b4b94209,e84840bf2..95ce7645f |
| 162 |
--- a/cnf/repos.conf |
| 163 |
+++ b/cnf/repos.conf |
| 164 |
@@@ -1,10 -1,10 +1,10 @@@ |
| 165 |
[DEFAULT] |
| 166 |
-main-repo = gentoo |
| 167 |
+main-repo = gentoo_prefix |
| 168 |
|
| 169 |
-[gentoo] |
| 170 |
-location = /var/db/repos/gentoo |
| 171 |
+[gentoo_prefix] |
| 172 |
- location = @PORTAGE_EPREFIX@/usr/portage |
| 173 |
++location = @PORTAGE_EPREFIX@/var/db/repos/gentoo |
| 174 |
sync-type = rsync |
| 175 |
-sync-uri = rsync://rsync.gentoo.org/gentoo-portage |
| 176 |
+sync-uri = rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix |
| 177 |
auto-sync = yes |
| 178 |
sync-rsync-verify-jobs = 1 |
| 179 |
sync-rsync-verify-metamanifest = yes |
Archives