dev-python/pytest: Replace virts with cond deps

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index c4d2de67cde7dcd9a9421a0877305f6a17f8c1cc..10c1bb79f5c66a4b107ba3eb4d05aa87a8913acd 100644 (file)
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -25,15 +25,17 @@ PY_VER="1.5.0"
 RDEPEND="
        >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
        >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
-       $(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
+       $(python_gen_cond_dep '
+               >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+               <dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]
+               dev-python/funcsigs[${PYTHON_USEDEP}]
+               dev-python/pathlib2[${PYTHON_USEDEP}]
+       ' -2)
        $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3} )
-       $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
        >=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
        >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
        >=dev-python/setuptools-40[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       virtual/python-funcsigs[${PYTHON_USEDEP}]"
+       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
 # flake & pytest-capturelog cause a number of tests to fail
 DEPEND="${RDEPEND}

diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index f9bfdba1a65aa40a173731d395135f8dac2d3aa3..a54b3397dcf6dd264ac0e1cf86c9489e22d9f273 100644 (file)
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -26,14 +26,16 @@ RDEPEND="
        >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
        >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
        >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
+       $(python_gen_cond_dep '
+               dev-python/pathlib2[${PYTHON_USEDEP}]
+               dev-python/funcsigs[${PYTHON_USEDEP}]
+       ' -2)
        >=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
        <dev-python/pluggy-1
        >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
        >=dev-python/setuptools-40[${PYTHON_USEDEP}]
        dev-python/six[${PYTHON_USEDEP}]
-       dev-python/wcwidth[${PYTHON_USEDEP}]
-       virtual/python-funcsigs[${PYTHON_USEDEP}]"
+       dev-python/wcwidth[${PYTHON_USEDEP}]"
 
 # flake cause a number of tests to fail
 DEPEND="${RDEPEND}

diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild
index fe23e76eb74b303fa68841366a447dd103a06e8b..c4912d16a924f36d603b30238899270fe4e9b0dd 100644 (file)
--- a/dev-python/pytest/pytest-4.6.9.ebuild
+++ b/dev-python/pytest/pytest-4.6.9.ebuild
@@ -28,14 +28,16 @@ RDEPEND="
        >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
        $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
                -2 python3_{5,6,7} pypy3)
-       $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+       $(python_gen_cond_dep '
+               dev-python/pathlib2[${PYTHON_USEDEP}]
+               dev-python/funcsigs[${PYTHON_USEDEP}]
+       ' -2)
        >=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
        <dev-python/pluggy-1
        >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
        dev-python/packaging[${PYTHON_USEDEP}]
        dev-python/six[${PYTHON_USEDEP}]
-       dev-python/wcwidth[${PYTHON_USEDEP}]
-       virtual/python-funcsigs[${PYTHON_USEDEP}]"
+       dev-python/wcwidth[${PYTHON_USEDEP}]"
 
 # flake cause a number of tests to fail
 DEPEND="