dev-python/cairocffi: Don't enable pypy Python target on dev-python/cffi

Also, check that new enough (>=2.6.0) PyPy installed to ensure correct
cffi version.

diff --git a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild
index 02d50b7bc552afac4038742f8a30248171fef13d..b09276cfb9b01d37ca1d5fdd83b32fe49faff1d4 100644 (file)
--- a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+RDEPEND="
+       $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*')
        x11-libs/cairo:0="
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )

diff --git a/dev-python/cairocffi/cairocffi-0.5.4.ebuild b/dev-python/cairocffi/cairocffi-0.5.4.ebuild
index 02d50b7bc552afac4038742f8a30248171fef13d..b09276cfb9b01d37ca1d5fdd83b32fe49faff1d4 100644 (file)
--- a/dev-python/cairocffi/cairocffi-0.5.4.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.5.4.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+RDEPEND="
+       $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*')
        x11-libs/cairo:0="
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )

diff --git a/dev-python/cairocffi/cairocffi-0.6-r1.ebuild b/dev-python/cairocffi/cairocffi-0.6-r1.ebuild
index b760032169a036afb23035a6b2111d6c284582d4..77ff6bff9b574f1da1bc72bb6cbf3b70a5aed6e7 100644 (file)
--- a/dev-python/cairocffi/cairocffi-0.6-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.6-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="doc test"
 
 # xcffib is an optional extra excpet that the testsuite has it a hard coded unconditional component
 RDEPEND="
-       >=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*')
        x11-libs/cairo:0=
        <dev-python/xcffib-0.3[${PYTHON_USEDEP}]
        x11-libs/gdk-pixbuf[jpeg]"

diff --git a/dev-python/cairocffi/cairocffi-0.6.ebuild b/dev-python/cairocffi/cairocffi-0.6.ebuild
index b2428f70f21c6848d90ff465fc63c6cfec2b7370..bf666550f4ac75e1731f778b9d2ac160e73baf27 100644 (file)
--- a/dev-python/cairocffi/cairocffi-0.6.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.6.ebuild
@@ -21,7 +21,7 @@ IUSE="doc test"
 
 # xcffib is an optional extra excpet that the testsuite has it a hard coded unconditional component
 RDEPEND="
-       >=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 'python*')
        x11-libs/cairo:0=
        <dev-python/xcffib-0.3[${PYTHON_USEDEP}]"
 

diff --git a/dev-python/cairocffi/cairocffi-0.7.1.ebuild b/dev-python/cairocffi/cairocffi-0.7.1.ebuild
index c101a394be13746ed368120cc02993aca1098f66..257de33cb3d734bb009d3060169552d145a5fb38 100644 (file)
--- a/dev-python/cairocffi/cairocffi-0.7.1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.7.1.ebuild
@@ -21,10 +21,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-       >=dev-python/cffi-1.1.0:=[$(python_gen_usedep 'python*')]
+       $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
        >=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
        x11-libs/cairo:0=
-       x11-libs/gdk-pixbuf[jpeg]"
+       x11-libs/gdk-pixbuf[jpeg]
+       $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
 DEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]
@@ -32,7 +33,8 @@ DEPEND="
        test? (
                ${RDEPEND}
                dev-python/pytest[${PYTHON_USEDEP}]
-       )"
+       )
+       $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
 PATCHES=(
        # Intersphinx cause the usual d'loading of objects.inv from TWO online sites

diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
index 8aa7b95b2a276d357091ab6d133c98d5aaa811a9..b9396d0d506fbb3d061966371f96be4d5cc58a22 100644 (file)
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
@@ -21,10 +21,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-       >=dev-python/cffi-1.1.0:=[$(python_gen_usedep 'python*')]
+       $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
        >=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
        x11-libs/cairo:0=
-       x11-libs/gdk-pixbuf[jpeg]"
+       x11-libs/gdk-pixbuf[jpeg]
+       $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
 DEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]
@@ -32,7 +33,8 @@ DEPEND="
        test? (
                ${RDEPEND}
                dev-python/pytest[${PYTHON_USEDEP}]
-       )"
+       )
+       $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
 PATCHES=(
        # Intersphinx cause the usual d'loading of objects.inv from TWO online sites