commit: 0e23f54cd2fded0aca4aad1ea475f74f313ad267
Author: Sean Vig <sean.v.775 <AT> gmail <DOT> com>
AuthorDate: Sat Aug 22 23:10:58 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 02:41:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e23f54c
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.
dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild | 3 ++-
dev-python/cairocffi/cairocffi-0.5.4.ebuild | 3 ++-
dev-python/cairocffi/cairocffi-0.6-r1.ebuild | 2 +-
dev-python/cairocffi/cairocffi-0.6.ebuild | 2 +-
dev-python/cairocffi/cairocffi-0.7.1.ebuild | 8 +++++---
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 02d50b7..b09276c 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 02d50b7..b09276c 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 b760032..77ff6bf 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 b2428f7..bf66655 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 c101a39..257de33 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 8aa7b95..b9396d0 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
