| 1 |
commit: 9d65486e25c731330509fa29e8d92c776f70987e |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 1 13:11:08 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 1 13:11:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9d65486e |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
RELEASE-NOTES | 8 ++++ |
| 13 |
bin/ebuild.sh | 1 + |
| 14 |
cnf/make.globals | 2 +- |
| 15 |
lib/portage/_compat_upgrade/default_locations.py | 13 +++++- |
| 16 |
lib/portage/dbapi/porttree.py | 12 +++++ |
| 17 |
lib/portage/package/ebuild/config.py | 7 ++- |
| 18 |
lib/portage/package/ebuild/doebuild.py | 18 ++++---- |
| 19 |
lib/portage/sync/syncbase.py | 3 +- |
| 20 |
lib/portage/util/install_mask.py | 8 +++- |
| 21 |
man/emerge.1 | 3 +- |
| 22 |
man/make.conf.5 | 4 +- |
| 23 |
repoman/RELEASE-NOTES | 18 ++++++++ |
| 24 |
repoman/cnf/linechecks/linechecks.yaml | 1 - |
| 25 |
.../modules/linechecks/gentoo_header/header.py | 51 +++++++++------------- |
| 26 |
.../modules/scan/metadata/ebuild_metadata.py | 4 +- |
| 27 |
repoman/setup.py | 2 +- |
| 28 |
setup.py | 2 +- |
| 29 |
17 files changed, 102 insertions(+), 55 deletions(-) |
| 30 |
|
| 31 |
diff --cc cnf/make.globals |
| 32 |
index 6a1d3b952,9eeb7a01e..d16f14636 |
| 33 |
--- a/cnf/make.globals |
| 34 |
+++ b/cnf/make.globals |
| 35 |
@@@ -27,12 -27,12 +27,12 @@@ ACCEPT_PROPERTIES="* |
| 36 |
ACCEPT_RESTRICT="*" |
| 37 |
|
| 38 |
# Miscellaneous paths |
| 39 |
-DISTDIR="/var/cache/distfiles" |
| 40 |
-PKGDIR="/var/cache/binpkgs" |
| 41 |
-RPMDIR="/var/cache/rpm" |
| 42 |
+DISTDIR="@PORTAGE_EPREFIX@/var/cache/distfiles" |
| 43 |
+PKGDIR="@PORTAGE_EPREFIX@/var/cache/binpkgs" |
| 44 |
- RPMDIR="@PORTAGE_EPREFIX@/usr/portage/rpm" |
| 45 |
++RPMDIR="@PORTAGE_EPREFIX@/var/cache/rpm" |
| 46 |
|
| 47 |
# Temporary build directory |
| 48 |
-PORTAGE_TMPDIR="/var/tmp" |
| 49 |
+PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp" |
| 50 |
|
| 51 |
# Fetching command (3 tries, passive ftp for firewall compatibility) |
| 52 |
FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" |
Archives