1 |
commit: 7c9feafd05d62ac42c8cafb3b82fcc7e7623f083 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 11 15:04:22 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 11 15:07:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9feafd |
7 |
|
8 |
dev-python/pypy3: Inline deps and include dev-python/pycparser dep |
9 |
|
10 |
Replace the autogenerated || dependency with an inlined version, |
11 |
and include dev-python/pycparser in it when using CPython 2.7 (it is |
12 |
built-in in dev-python/pypy, through CFFI). |
13 |
|
14 |
dev-python/pypy3/pypy3-5.9.0.ebuild | 12 ++++++++++-- |
15 |
dev-python/pypy3/pypy3-9999.ebuild | 12 ++++++++++-- |
16 |
2 files changed, 20 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild |
19 |
index 68ba1a3ef97..d81c5775b40 100644 |
20 |
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild |
21 |
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild |
22 |
@@ -35,8 +35,16 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= |
23 |
) |
24 |
!dev-python/pypy3-bin:0" |
25 |
DEPEND="${RDEPEND} |
26 |
- low-memory? ( virtual/pypy:0 ) |
27 |
- !low-memory? ( ${PYTHON_DEPS} )" |
28 |
+ low-memory? ( virtual/pypy ) |
29 |
+ !low-memory? ( |
30 |
+ || ( |
31 |
+ virtual/pypy |
32 |
+ ( |
33 |
+ dev-lang/python:2.7 |
34 |
+ dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] |
35 |
+ ) |
36 |
+ ) |
37 |
+ )" |
38 |
# doc? ( dev-python/sphinx ) |
39 |
|
40 |
S="${WORKDIR}/${MY_P}-src" |
41 |
|
42 |
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild |
43 |
index 92c2f84f5b0..5be752f1fc4 100644 |
44 |
--- a/dev-python/pypy3/pypy3-9999.ebuild |
45 |
+++ b/dev-python/pypy3/pypy3-9999.ebuild |
46 |
@@ -36,8 +36,16 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= |
47 |
) |
48 |
!dev-python/pypy3-bin:0" |
49 |
DEPEND="${RDEPEND} |
50 |
- low-memory? ( virtual/pypy:0 ) |
51 |
- !low-memory? ( ${PYTHON_DEPS} )" |
52 |
+ low-memory? ( virtual/pypy ) |
53 |
+ !low-memory? ( |
54 |
+ || ( |
55 |
+ virtual/pypy |
56 |
+ ( |
57 |
+ dev-lang/python:2.7 |
58 |
+ dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] |
59 |
+ ) |
60 |
+ ) |
61 |
+ )" |
62 |
# doc? ( dev-python/sphinx ) |
63 |
|
64 |
# Who would care about predictable directory names? |