summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-08-22 22:58:13 -0400
committerMike Gilbert <floppym@gentoo.org>2015-08-22 23:08:39 -0400
commitecfefda85d3f94c3c9dfe6496e1cb6f5bc801da2 (patch)
tree55347ede24284bec906a6d79f9d267a46003f0d4 /dev-python
parentprofiles/package.mask: Mask x11-base/nouveau-drm for removal. (diff)
parentdev-python/cffi: Remove pypy from PYTHON_TARGETS (diff)
downloadgentoo-ecfefda85d3f94c3c9dfe6496e1cb6f5bc801da2.tar.gz
gentoo-ecfefda85d3f94c3c9dfe6496e1cb6f5bc801da2.tar.bz2
gentoo-ecfefda85d3f94c3c9dfe6496e1cb6f5bc801da2.zip
Merge pull 34: Don't install cffi for PyPy
Pull-Request: #34
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/bcrypt/bcrypt-2.0.0.ebuild2
-rw-r--r--dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild3
-rw-r--r--dev-python/cairocffi/cairocffi-0.5.4.ebuild3
-rw-r--r--dev-python/cairocffi/cairocffi-0.6-r1.ebuild2
-rw-r--r--dev-python/cairocffi/cairocffi-0.6.ebuild2
-rw-r--r--dev-python/cairocffi/cairocffi-0.7.1.ebuild8
-rw-r--r--dev-python/cairocffi/cairocffi-0.7.2.ebuild8
-rw-r--r--dev-python/cffi/cffi-0.8.6.ebuild2
-rw-r--r--dev-python/cffi/cffi-1.1.2.ebuild2
-rw-r--r--dev-python/cffi/cffi-1.2.1.ebuild2
-rw-r--r--dev-python/cryptography/cryptography-1.0.ebuild3
-rw-r--r--dev-python/xcffib/xcffib-0.1.10.ebuild2
-rw-r--r--dev-python/xcffib/xcffib-0.2.0.ebuild2
-rw-r--r--dev-python/xcffib/xcffib-0.2.1.ebuild2
-rw-r--r--dev-python/xcffib/xcffib-0.2.5.ebuild5
-rw-r--r--dev-python/xcffib/xcffib-0.3.2.ebuild3
-rw-r--r--dev-python/xcffib/xcffib-0.3.4.ebuild3
17 files changed, 33 insertions, 21 deletions
diff --git a/dev-python/bcrypt/bcrypt-2.0.0.ebuild b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
index 28ee0eeb4886..a10d7dfbbbf4 100644
--- a/dev-python/bcrypt/bcrypt-2.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
@@ -23,9 +23,11 @@ IUSE=""
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
"
RDEPEND="
$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
!dev-python/py-bcrypt"
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
diff --git a/dev-python/cffi/cffi-0.8.6.ebuild b/dev-python/cffi/cffi-0.8.6.ebuild
index e7446c74ba22..a7862a668f48 100644
--- a/dev-python/cffi/cffi-0.8.6.ebuild
+++ b/dev-python/cffi/cffi-0.8.6.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
diff --git a/dev-python/cffi/cffi-1.1.2.ebuild b/dev-python/cffi/cffi-1.1.2.ebuild
index 102dde7bbda0..23b82d8107f9 100644
--- a/dev-python/cffi/cffi-1.1.2.ebuild
+++ b/dev-python/cffi/cffi-1.1.2.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
diff --git a/dev-python/cffi/cffi-1.2.1.ebuild b/dev-python/cffi/cffi-1.2.1.ebuild
index 4d1ec48dc6f5..c39d04a1eef4 100644
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
diff --git a/dev-python/cryptography/cryptography-1.0.ebuild b/dev-python/cryptography/cryptography-1.0.ebuild
index c06bcfde5b5a..89753712433b 100644
--- a/dev-python/cryptography/cryptography-1.0.ebuild
+++ b/dev-python/cryptography/cryptography-1.0.ebuild
@@ -5,7 +5,7 @@
EAPI=5
# only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
inherit distutils-r1
@@ -27,6 +27,7 @@ RDEPEND="
>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/xcffib-0.1.10.ebuild b/dev-python/xcffib/xcffib-0.1.10.ebuild
index 481f7ea8a176..13222eaddffb 100644
--- a/dev-python/xcffib/xcffib-0.1.10.ebuild
+++ b/dev-python/xcffib/xcffib-0.1.10.ebuild
@@ -19,7 +19,7 @@ IUSE=""
COMMON_DEPEND="x11-libs/libxcb"
RDEPEND="
- >=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 'python*')
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}"
DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.2.0.ebuild b/dev-python/xcffib/xcffib-0.2.0.ebuild
index 1b041dbccf4a..621063b07e9b 100644
--- a/dev-python/xcffib/xcffib-0.2.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.2.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="x11-libs/libxcb"
RDEPEND="
- >=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 'python*')
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}"
DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.2.1.ebuild b/dev-python/xcffib/xcffib-0.2.1.ebuild
index 1b041dbccf4a..621063b07e9b 100644
--- a/dev-python/xcffib/xcffib-0.2.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.2.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="x11-libs/libxcb"
RDEPEND="
- >=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 'python*')
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}"
DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.2.5.ebuild b/dev-python/xcffib/xcffib-0.2.5.ebuild
index 86b41e48622d..9052d505fe7d 100644
--- a/dev-python/xcffib/xcffib-0.2.5.ebuild
+++ b/dev-python/xcffib/xcffib-0.2.5.ebuild
@@ -20,8 +20,9 @@ IUSE="test"
COMMON_DEPEND="x11-libs/libxcb"
RDEPEND="
- >=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
- <dev-python/cffi-1:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep '<dev-python/cffi-1:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep '<virtual/pypy-2.6.0' pypy )
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}"
DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.3.2.ebuild b/dev-python/xcffib/xcffib-0.3.2.ebuild
index 03452f1ddfbb..cece942b98a2 100644
--- a/dev-python/xcffib/xcffib-0.3.2.ebuild
+++ b/dev-python/xcffib/xcffib-0.3.2.ebuild
@@ -20,7 +20,8 @@ IUSE="test"
COMMON_DEPEND="x11-libs/libxcb"
RDEPEND="
- >=dev-python/cffi-0.1.1:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}"
DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.3.4.ebuild b/dev-python/xcffib/xcffib-0.3.4.ebuild
index 03452f1ddfbb..cece942b98a2 100644
--- a/dev-python/xcffib/xcffib-0.3.4.ebuild
+++ b/dev-python/xcffib/xcffib-0.3.4.ebuild
@@ -20,7 +20,8 @@ IUSE="test"
COMMON_DEPEND="x11-libs/libxcb"
RDEPEND="
- >=dev-python/cffi-0.1.1:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}"
DEPEND="