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
This commit is contained in:
Michał Górny
2017-11-11 16:01:42 +01:00
parent c73f262063
commit c39181e9cb
2 changed files with 24 additions and 2 deletions

View File

@@ -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"

View File

@@ -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"