diff --git a/dev-python/xcffib/xcffib-0.1.10.ebuild b/dev-python/xcffib/xcffib-0.1.10.ebuild
index 481f7ea8a1766..13222eaddffba 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 1b041dbccf4aa..621063b07e9b0 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 1b041dbccf4aa..621063b07e9b0 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 86b41e48622db..9052d505fe7d1 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 03452f1ddfbb7..cece942b98a2c 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 03452f1ddfbb7..cece942b98a2c 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="