commit: 9d65486e25c731330509fa29e8d92c776f70987e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 1 13:11:08 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 13:11:08 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9d65486e
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
RELEASE-NOTES | 8 ++++
bin/ebuild.sh | 1 +
cnf/make.globals | 2 +-
lib/portage/_compat_upgrade/default_locations.py | 13 +++++-
lib/portage/dbapi/porttree.py | 12 +++++
lib/portage/package/ebuild/config.py | 7 ++-
lib/portage/package/ebuild/doebuild.py | 18 ++++----
lib/portage/sync/syncbase.py | 3 +-
lib/portage/util/install_mask.py | 8 +++-
man/emerge.1 | 3 +-
man/make.conf.5 | 4 +-
repoman/RELEASE-NOTES | 18 ++++++++
repoman/cnf/linechecks/linechecks.yaml | 1 -
.../modules/linechecks/gentoo_header/header.py | 51 +++++++++-------------
.../modules/scan/metadata/ebuild_metadata.py | 4 +-
repoman/setup.py | 2 +-
setup.py | 2 +-
17 files changed, 102 insertions(+), 55 deletions(-)
diff --cc cnf/make.globals
index 6a1d3b952,9eeb7a01e..d16f14636
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@@ -27,12 -27,12 +27,12 @@@ ACCEPT_PROPERTIES="*
ACCEPT_RESTRICT="*"
# Miscellaneous paths
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-RPMDIR="/var/cache/rpm"
+DISTDIR="@PORTAGE_EPREFIX@/var/cache/distfiles"
+PKGDIR="@PORTAGE_EPREFIX@/var/cache/binpkgs"
- RPMDIR="@PORTAGE_EPREFIX@/usr/portage/rpm"
++RPMDIR="@PORTAGE_EPREFIX@/var/cache/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}\""
