dev-python/pypy: Inline deps and include dev-python/pycparser dep

Replace the autogenerated || dependency with an inlined version,
and include dev-python/pycparser in it when using CPython 2.7 (it is
built-in in dev-python/pypy, through CFFI). Enforce the dependency
only when USE=-low-memory, since otherwise CPython is not used, and we
can't enforce the dependency on PyPy anyway as it would cause circular
deps.

Closes: https://bugs.gentoo.org/634306

diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild
index cef567ec30c9f58fc00b2d2ee9740483e325ed7f..ce877adabdf420776917a1b72bbe4ceac45fee88 100644 (file)
--- a/dev-python/pypy/pypy-5.9.0.ebuild
+++ b/dev-python/pypy/pypy-5.9.0.ebuild
@@ -36,9 +36,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
                dev-tcltk/tix:0=
        )
        !dev-python/pypy-bin:0"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
        doc? ( dev-python/sphinx )
-       ${PYTHON_DEPS}"
+       !low-memory? (
+               || (
+                       dev-python/pypy
+                       dev-python/pypy-bin
+                       (
+                               dev-lang/python:2.7
+                               dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+                       )
+               )
+       )"
 
 S="${WORKDIR}/${MY_P}-src"
 

diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 08bd414c59012769608aad264d2e5a4eb12dff37..805c5e7f777f1dabc01003b41925051961d3e1d2 100644 (file)
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -37,9 +37,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
                dev-tcltk/tix:0=
        )
        !dev-python/pypy-bin:0"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
        doc? ( dev-python/sphinx )
-       ${PYTHON_DEPS}"
+       !low-memory? (
+               || (
+                       dev-python/pypy
+                       dev-python/pypy-bin
+                       (
+                               dev-lang/python:2.7
+                               dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+                       )
+               )
+       )"
 
 S="${WORKDIR}/${MY_P}-src"