From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B63F138334 for ; Mon, 1 Jul 2019 13:11:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 886B5E0896; Mon, 1 Jul 2019 13:11:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60E3DE0884 for ; Mon, 1 Jul 2019 13:11:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19D3B34665F for ; Mon, 1 Jul 2019 13:11:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A17A66B for ; Mon, 1 Jul 2019 13:11:45 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1561986668.9d65486e25c731330509fa29e8d92c776f70987e.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 9d65486e25c731330509fa29e8d92c776f70987e X-VCS-Branch: prefix Date: Mon, 1 Jul 2019 13:11:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1eb0f34-35b3-4bd3-b772-8763feefb33c X-Archives-Hash: b1756d317b4a0a8f02dfa433565abb00 commit: 9d65486e25c731330509fa29e8d92c776f70987e Author: Fabian Groffen gentoo org> AuthorDate: Mon Jul 1 13:11:08 2019 +0000 Commit: Fabian Groffen gentoo 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 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}\""