| 1 |
commit: ae017fcc14207aadf50344392d7d869e7ef1eb53 |
| 2 |
Author: Tom Gillespie <tgbugs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 2 08:38:19 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 2 09:35:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae017fcc |
| 7 |
|
| 8 |
dev-python/pypy3: fix gentoo-path.patch and rev bump |
| 9 |
|
| 10 |
Test that install_path starts with '/usr/lib/pypy' instead of doing an |
| 11 |
exact equality == test against the specific pypy version. This will |
| 12 |
allow the patch to be reused between pypy and pypy3 without the risk of |
| 13 |
having the gentoo specific fix fail to be detected due to a mismatched |
| 14 |
pypy version number. This also prevents the need to maintain an exact |
| 15 |
match the pypy version in the future since it will continue to change |
| 16 |
and I assume there is also the possibility that both pypy3.6 and pypy3.7 |
| 17 |
might be installed on the same system at the same time. |
| 18 |
|
| 19 |
Also rev bump so that users will recieve the fix. |
| 20 |
|
| 21 |
This also removes a blocker for https://bugs.gentoo.org/729958 and |
| 22 |
https://github.com/gentoo/gentoo/pull/16466. |
| 23 |
|
| 24 |
Closes: https://bugs.gentoo.org/735140 |
| 25 |
Related-to: https://bugs.gentoo.org/729958 |
| 26 |
Signed-off-by: Tom Gillespie <tgbugs <AT> gmail.com> |
| 27 |
Closes: https://github.com/gentoo/gentoo/pull/16943 |
| 28 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 29 |
|
| 30 |
dev-python/pypy3/files/7.3.1-gentoo-path.patch | 2 +- |
| 31 |
dev-python/pypy3/{pypy3-7.3.1-r1.ebuild => pypy3-7.3.1-r2.ebuild} | 0 |
| 32 |
2 files changed, 1 insertion(+), 1 deletion(-) |
| 33 |
|
| 34 |
diff --git a/dev-python/pypy3/files/7.3.1-gentoo-path.patch b/dev-python/pypy3/files/7.3.1-gentoo-path.patch |
| 35 |
index c9809f89b88..fba00b9fcac 100644 |
| 36 |
--- a/dev-python/pypy3/files/7.3.1-gentoo-path.patch |
| 37 |
+++ b/dev-python/pypy3/files/7.3.1-gentoo-path.patch |
| 38 |
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644 |
| 39 |
if (hasattr(sys, 'pypy_version_info') and |
| 40 |
not name.endswith(('_user', '_home'))): |
| 41 |
- if os.name == 'nt': |
| 42 |
-+ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'): |
| 43 |
++ if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')): |
| 44 |
+ # override paths for system-wide install |
| 45 |
+ name = 'gentoo' |
| 46 |
+ elif os.name == 'nt': |
| 47 |
|
| 48 |
diff --git a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild |
| 49 |
similarity index 100% |
| 50 |
rename from dev-python/pypy3/pypy3-7.3.1-r1.ebuild |
| 51 |
rename to dev-python/pypy3/pypy3-7.3.1-r2.ebuild |
Archives