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 13BF91382C5 for ; Sun, 7 Mar 2021 16:18:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6560EE0891; Sun, 7 Mar 2021 16:18:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 49CECE0891 for ; Sun, 7 Mar 2021 16:18:08 +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 52CB033BF1A for ; Sun, 7 Mar 2021 16:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC4E9567 for ; Sun, 7 Mar 2021 16:18:05 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1615133658.6ca34493df931d858ee1e568d9c7cf3a15ec6ab7.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6ca34493df931d858ee1e568d9c7cf3a15ec6ab7 X-VCS-Branch: master Date: Sun, 7 Mar 2021 16:18:05 +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: 8c30e728-3511-448a-bed0-91c06166951e X-Archives-Hash: a2b894adc598cd2e5971850fdad11fd9 commit: 6ca34493df931d858ee1e568d9c7cf3a15ec6ab7 Author: Zac Medico gentoo org> AuthorDate: Sun Mar 7 16:09:01 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Mar 7 16:14:18 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6ca34493 setup.py: prefix paths in repos.conf and make.globals for pip venv install Prefix paths in repos.conf and make.globals for pip venv install so that that default paths will all be located inside the venv. The EPREFIX value must be symbolic, since it cannot be known until runtime. Fixes: c495b6f67453 ("setup.py: prefix repos.conf paths for venv") Signed-off-by: Zac Medico gentoo.org> setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 6be01e863..20ebc2fce 100755 --- a/setup.py +++ b/setup.py @@ -429,6 +429,10 @@ class x_install_data(install_data): with codecs.open(path, 'w', 'utf-8') as f: f.write(data) + if create_entry_points: + re_sub_file('cnf/repos.conf', r'= /', '= %(EPREFIX)s/') + re_sub_file('cnf/make.globals', r'DIR="/', 'DIR="${EPREFIX}/') + self.run_command('build_man') def process_data_files(df):