1 |
commit: 142555b7efeff4b8da9297ab20a0b91728b1ad51 |
2 |
Author: Tom Gillespie <tgbugs <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Aug 2 08:37:07 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 2 09:34:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142555b7 |
7 |
|
8 |
dev-python/pypy: fix gentoo-path.patch and rev bump |
9 |
|
10 |
Signed-off-by: Tom Gillespie <tgbugs <AT> gmail.com> |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
dev-python/pypy/files/7.3.1-gentoo-path.patch | 2 +- |
14 |
dev-python/pypy/{pypy-7.3.1-r1.ebuild => pypy-7.3.1-r2.ebuild} | 0 |
15 |
2 files changed, 1 insertion(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch |
18 |
index 5281781865a..74ca86a84ac 100644 |
19 |
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch |
20 |
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch |
21 |
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644 |
22 |
if (hasattr(sys, 'pypy_version_info') and |
23 |
not name.endswith(('_user', '_home'))): |
24 |
- if os.name == 'nt': |
25 |
-+ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'): |
26 |
++ if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')): |
27 |
+ # override paths for system-wide install |
28 |
+ name = 'gentoo' |
29 |
+ elif os.name == 'nt': |
30 |
|
31 |
diff --git a/dev-python/pypy/pypy-7.3.1-r1.ebuild b/dev-python/pypy/pypy-7.3.1-r2.ebuild |
32 |
similarity index 100% |
33 |
rename from dev-python/pypy/pypy-7.3.1-r1.ebuild |
34 |
rename to dev-python/pypy/pypy-7.3.1-r2.ebuild |