diff options
| author |   Sean Vig <sean.v.775@gmail.com> | 2015-08-22 18:10:58 -0500 |
|---|---|---|
| committer | Sean Vig <sean.v.775@gmail.com> | 2015-08-22 21:41:57 -0500 |
| commit | 0e23f54cd2fded0aca4aad1ea475f74f313ad267 (patch) | |
| tree | 1ae3b3123d33a84b1cfee43ccd3e9da2cad3c144 /dev-python | |
| parent | dev-python/bcrypt: Ensure new enough pypy installed (diff) | |
| download | gentoo-0e23f54cd2fded0aca4aad1ea475f74f313ad267.tar.gz gentoo-0e23f54cd2fded0aca4aad1ea475f74f313ad267.tar.bz2 gentoo-0e23f54cd2fded0aca4aad1ea475f74f313ad267.zip | |
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.
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-python/cairocffi/cairocffi-0.5.4.ebuild | 3 | ||||
| -rw-r--r-- | dev-python/cairocffi/cairocffi-0.6-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/cairocffi/cairocffi-0.6.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/cairocffi/cairocffi-0.7.1.ebuild | 8 | ||||
| -rw-r--r-- | dev-python/cairocffi/cairocffi-0.7.2.ebuild | 8 |
6 files changed, 16 insertions, 10 deletions
diff --git a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild index 02d50b7bc552..b09276cfb9b0 100644 --- 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 02d50b7bc552..b09276cfb9b0 100644 --- 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 b760032169a0..77ff6bff9b57 100644 --- 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 b2428f70f21c..bf666550f4ac 100644 --- 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 c101a394be13..257de33cb3d7 100644 --- 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 8aa7b95b2a27..b9396d0d506f 100644 --- 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 |