commit: 84cf376dc22ed7e23c3a684182d9604a8860819c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 09:19:43 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 30 09:19:43 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=84cf376d
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
NEWS | 9 +
RELEASE-NOTES | 46 +++++
bin/eapi.sh | 4 +
bin/ebuild.sh | 4 +-
bin/estrip | 41 ++--
bin/install-qa-check.d/10ignored-flags | 2 +-
bin/install-qa-check.d/80libraries | 21 +-
bin/install-qa-check.d/95empty-dirs | 4 +-
bin/isolated-functions.sh | 10 +
bin/phase-functions.sh | 16 +-
bin/phase-helpers.sh | 14 +-
cnf/make.conf.example | 21 +-
cnf/make.globals | 4 +-
cnf/repos.conf | 2 +-
lib/_emerge/BinpkgVerifier.py | 4 +-
lib/_emerge/PollScheduler.py | 6 +-
lib/_emerge/actions.py | 2 +-
lib/_emerge/depgraph.py | 10 +-
lib/_emerge/emergelog.py | 2 +-
lib/portage/__init__.py | 29 ++-
.../{sync/modules => _compat_upgrade}/__init__.py | 0
lib/portage/_compat_upgrade/default_locations.py | 82 ++++++++
lib/portage/cache/flat_hash.py | 4 +-
lib/portage/cache/mappings.py | 30 +--
lib/portage/dbapi/__init__.py | 4 +-
lib/portage/dbapi/porttree.py | 15 +-
lib/portage/dbapi/vartree.py | 19 +-
lib/portage/dep/__init__.py | 92 +++++----
lib/portage/dep/soname/multilib_category.py | 51 ++++-
lib/portage/emaint/modules/sync/sync.py | 6 +-
lib/portage/news.py | 5 +-
lib/portage/package/ebuild/_config/helper.py | 4 +-
.../package/ebuild/_config/special_env_vars.py | 7 +-
lib/portage/package/ebuild/_spawn_nofetch.py | 6 +-
lib/portage/package/ebuild/config.py | 20 +-
lib/portage/package/ebuild/doebuild.py | 19 +-
lib/portage/package/ebuild/fetch.py | 111 ++++++----
lib/portage/process.py | 2 +-
lib/portage/repository/config.py | 15 +-
lib/portage/sync/__init__.py | 5 +-
lib/portage/sync/controller.py | 5 +-
lib/portage/sync/syncbase.py | 6 +-
lib/portage/tests/dep/testAtom.py | 16 +-
lib/portage/tests/ebuild/test_fetch.py | 230 +++++++++++++++++++++
lib/portage/tests/emerge/test_emerge_slot_abi.py | 14 +-
lib/portage/tests/news/test_NewsItem.py | 4 +-
lib/portage/tests/process/test_poll.py | 20 +-
lib/portage/tests/resolver/ResolverPlayground.py | 4 +-
lib/portage/tests/resolver/test_slot_abi.py | 42 ++--
.../tests/resolver/test_slot_abi_downgrade.py | 32 +--
lib/portage/tests/resolver/test_slot_collisions.py | 6 +-
.../resolver/test_slot_operator_autounmask.py | 18 +-
lib/portage/tests/resolver/test_targetroot.py | 24 ++-
lib/portage/tests/update/test_move_slot_ent.py | 18 +-
.../util/futures/asyncio/test_wakeup_fd_sigchld.py | 10 +-
lib/portage/util/_eventloop/asyncio_event_loop.py | 5 +
lib/portage/util/_get_vm_info.py | 9 +-
lib/portage/util/elf/constants.py | 10 +-
lib/portage/util/futures/_asyncio/__init__.py | 18 ++
lib/portage/util/socks5.py | 10 +-
lib/portage/xml/metadata.py | 16 +-
man/ebuild.5 | 111 ++++------
man/emerge.1 | 8 +-
man/make.conf.5 | 27 +--
man/portage.5 | 37 ++--
man/quickpkg.1 | 4 +-
repoman/RELEASE-NOTES | 5 +
repoman/lib/repoman/__init__.py | 4 +-
repoman/lib/repoman/argparser.py | 33 +--
repoman/setup.py | 2 +-
setup.py | 4 +-
71 files changed, 1002 insertions(+), 498 deletions(-)
diff --cc bin/phase-functions.sh
index 1352a16cc,e6380f554..0a8b5eda9
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -1,5 -1,5 +1,5 @@@
-#!/bin/bash
+#!@PORTAGE_BASH@
- # Copyright 1999-2018 Gentoo Foundation
+ # Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Hardcoded bash lists are needed for backward compatibility with
diff --cc cnf/make.conf.example
index 34957eddd,a309a5c43..c1d060c7c
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@@ -107,28 -107,21 +107,21 @@@
# this, you must update your /etc/portage/make.profile symlink
accordingly.
# ***Warning***
# Data stored inside PORTDIR is in peril of being overwritten or deleted
by
- # the emerge --sync command. The default value of PORTAGE_RSYNC_OPTS
- # will protect the default locations of DISTDIR and PKGDIR, but users are
- # warned that any other locations inside PORTDIR are not necessarily safe
- # for data storage.
- #PORTDIR=@PORTAGE_EPREFIX@/usr/portage
+ # the emerge --sync command.
-#PORTDIR=/var/db/repos/gentoo
++#PORTDIR=@PORTAGE_EPREFIX@/var/db/repos/gentoo
#
# DISTDIR is where all of the source code tarballs will be placed for
# emerges. After packages are built, it is safe to remove any and
# all files from this directory since they will be automatically
# fetched on demand for a given build. If you would like to
# selectively prune obsolete files from this directory, see
- # eclean from the gentoolkit package. Note that locations under
- # /usr/portage are not necessarily safe for data storage. See the
- # PORTDIR documentation for more information.
- #DISTDIR=@PORTAGE_EPREFIX@/usr/portage/distfiles
+ # eclean from the gentoolkit package.
-#DISTDIR=/var/cache/distfiles
++#DISTDIR=@PORTAGE_EPREFIX@/var/cache/distfiles
#
# PKGDIR is the location of binary packages that you can have created
# with '--buildpkg' or '-b' while emerging a package. This can get
- # up to several hundred megs, or even a few gigs. Note that
- # locations under /usr/portage are not necessarily safe for data
- # storage. See the PORTDIR documentation for more information.
- #PKGDIR=@PORTAGE_EPREFIX@/usr/portage/packages
+ # up to several hundred megs, or even a few gigs.
-#PKGDIR=/var/cache/binpkgs
++#PKGDIR=@PORTAGE_EPREFIX@/var/cache/binpkgs
#
# PORTAGE_LOGDIR is the location where portage will store all the logs it
# creates from each individual merge. They are stored as
diff --cc cnf/make.globals
index e71325c91,b01cca599..6a1d3b952
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@@ -27,12 -27,12 +27,12 @@@ ACCEPT_PROPERTIES="*
ACCEPT_RESTRICT="*"
# Miscellaneous paths
- DISTDIR="@PORTAGE_EPREFIX@/usr/portage/distfiles"
- PKGDIR="@PORTAGE_EPREFIX@/usr/portage/packages"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-RPMDIR="/usr/portage/rpm"
++DISTDIR="@PORTAGE_EPREFIX@/var/cache/distfiles"
++PKGDIR="@PORTAGE_EPREFIX@/var/cache/binpkgs"
+RPMDIR="@PORTAGE_EPREFIX@/usr/portage/rpm"
# Temporary build directory
-PORTAGE_TMPDIR="/var/tmp"
+PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp"
# Fetching command (3 tries, passive ftp for firewall compatibility)
FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\"
\"\${URI}\""
diff --cc cnf/repos.conf
index 3b4b94209,e84840bf2..95ce7645f
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@@ -1,10 -1,10 +1,10 @@@
[DEFAULT]
-main-repo = gentoo
+main-repo = gentoo_prefix
-[gentoo]
-location = /var/db/repos/gentoo
+[gentoo_prefix]
- location = @PORTAGE_EPREFIX@/usr/portage
++location = @PORTAGE_EPREFIX@/var/db/repos/gentoo
sync-type = rsync
-sync-uri = rsync://rsync.gentoo.org/gentoo-portage
+sync-uri = rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix
auto-sync = yes
sync-rsync-verify-jobs = 1
sync-rsync-verify-metamanifest = yes
