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 3EA7013835A for ; Sun, 2 Aug 2020 09:35:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8792BE0C0D; Sun, 2 Aug 2020 09:35:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 71979E0B8B for ; Sun, 2 Aug 2020 09:35:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9600D34F2A6 for ; Sun, 2 Aug 2020 09:35:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F4942F1 for ; Sun, 2 Aug 2020 09:35:30 +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: <1596360901.ae017fcc14207aadf50344392d7d869e7ef1eb53.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/, dev-python/pypy3/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3/files/7.3.1-gentoo-path.patch dev-python/pypy3/pypy3-7.3.1-r1.ebuild dev-python/pypy3/pypy3-7.3.1-r2.ebuild X-VCS-Directories: dev-python/pypy3/files/ dev-python/pypy3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ae017fcc14207aadf50344392d7d869e7ef1eb53 X-VCS-Branch: master Date: Sun, 2 Aug 2020 09:35:30 +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: c4fde44b-cb8e-4cac-b6fd-7d10d05c10b4 X-Archives-Hash: 3b512f076060bb52d089834cff5ac582 commit: ae017fcc14207aadf50344392d7d869e7ef1eb53 Author: Tom Gillespie gmail com> AuthorDate: Sun Aug 2 08:38:19 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 2 09:35:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae017fcc dev-python/pypy3: fix gentoo-path.patch and rev bump Test that install_path starts with '/usr/lib/pypy' instead of doing an exact equality == test against the specific pypy version. This will allow the patch to be reused between pypy and pypy3 without the risk of having the gentoo specific fix fail to be detected due to a mismatched pypy version number. This also prevents the need to maintain an exact match the pypy version in the future since it will continue to change and I assume there is also the possibility that both pypy3.6 and pypy3.7 might be installed on the same system at the same time. Also rev bump so that users will recieve the fix. This also removes a blocker for https://bugs.gentoo.org/729958 and https://github.com/gentoo/gentoo/pull/16466. Closes: https://bugs.gentoo.org/735140 Related-to: https://bugs.gentoo.org/729958 Signed-off-by: Tom Gillespie gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16943 Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3/files/7.3.1-gentoo-path.patch | 2 +- dev-python/pypy3/{pypy3-7.3.1-r1.ebuild => pypy3-7.3.1-r2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pypy3/files/7.3.1-gentoo-path.patch b/dev-python/pypy3/files/7.3.1-gentoo-path.patch index c9809f89b88..fba00b9fcac 100644 --- a/dev-python/pypy3/files/7.3.1-gentoo-path.patch +++ b/dev-python/pypy3/files/7.3.1-gentoo-path.patch @@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644 if (hasattr(sys, 'pypy_version_info') and not name.endswith(('_user', '_home'))): - if os.name == 'nt': -+ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'): ++ if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')): + # override paths for system-wide install + name = 'gentoo' + elif os.name == 'nt': diff --git a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild similarity index 100% rename from dev-python/pypy3/pypy3-7.3.1-r1.ebuild rename to dev-python/pypy3/pypy3-7.3.1-r2.ebuild