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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 412C9158020 for ; Fri, 21 Oct 2022 05:15:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD9BDE07FE; Fri, 21 Oct 2022 05:14:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8489E07FE for ; Fri, 21 Oct 2022 05:14:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1AC63410CB for ; Fri, 21 Oct 2022 05:14:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58405627 for ; Fri, 21 Oct 2022 05:14:57 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1666329277.09e5cc520486a875ddfbe5b59ee95260c3cbe697.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild sys-apps/pkgcore/pkgcore-0.12.16.ebuild sys-apps/pkgcore/pkgcore-9999.ebuild X-VCS-Directories: sys-apps/pkgcore/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 09e5cc520486a875ddfbe5b59ee95260c3cbe697 X-VCS-Branch: master Date: Fri, 21 Oct 2022 05:14:57 +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: 4935216d-2b5d-43b5-b2a8-35b3fed8123e X-Archives-Hash: ebce6c412439031fed67f99960b49017 commit: 09e5cc520486a875ddfbe5b59ee95260c3cbe697 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 21 04:05:30 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 21 05:14:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e5cc52 sys-apps/pkgcore: Fix INSTALL_PREFIX PkgCore's setup.py originally embedded the actual install prefix into _const.py when `setup.py install` was used. However, as we switched to PEP517 builds, it started installing a generic variant that uses sys.prefix instead. This breaks using PkgCore from inside a venv with `--system-site-packages` option, as the system copy of PkgCore tries to find its config files inside the venv. Hardcode the correct path from the ebuild to avoid this. Courtesy of Arthur Zamarin. Signed-off-by: Michał Górny gentoo.org> .../pkgcore/{pkgcore-0.12.16.ebuild => pkgcore-0.12.16-r1.ebuild} | 7 +++++++ sys-apps/pkgcore/pkgcore-9999.ebuild | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sys-apps/pkgcore/pkgcore-0.12.16.ebuild b/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild similarity index 89% rename from sys-apps/pkgcore/pkgcore-0.12.16.ebuild rename to sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild index 9eb8420dfb20..b060b26f7101 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.16.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild @@ -39,6 +39,13 @@ BDEPEND=" distutils_enable_tests setup.py +src_prepare() { + # force Gentoo's prefix + sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i setup.py || die + + distutils-r1_src_prepare +} + src_test() { # With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules. # https://bugs.gentoo.org/840266 diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild index a54deed756c0..6b4c768d3a2f 100644 --- a/sys-apps/pkgcore/pkgcore-9999.ebuild +++ b/sys-apps/pkgcore/pkgcore-9999.ebuild @@ -40,6 +40,13 @@ BDEPEND=" distutils_enable_tests setup.py +src_prepare() { + # force Gentoo's prefix + sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i setup.py || die + + distutils-r1_src_prepare +} + src_test() { # With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules. # https://bugs.gentoo.org/840266