dev-python/cryptography: add cffi to RDEPEND

cryptography installs egg-info/requires.txt containing cffi. This means
packages using pkg_resources to import cryptography will fail if cffi is not
installed at runtime.

Closes: https://bugs.gentoo.org/696224
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
similarity index 100%
rename from dev-python/cryptography/cryptography-2.6.1.ebuild
rename to dev-python/cryptography/cryptography-2.6.1-r1.ebuild
index 5eb0f608b495aa040f3f9e8b3b1788b62ad01513..d0c85a6a8fd1ba907fb5989d949da481a905cca9 100644 (file)
--- a/dev-python/cryptography/cryptography-2.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
@@ -39,11 +39,11 @@ RDEPEND="
        >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
        virtual/python-enum34[${PYTHON_USEDEP}]
        virtual/python-ipaddress[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+       $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
        "
 DEPEND="${RDEPEND}
        >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
-       $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
        test? (
                ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
                dev-python/pretend[${PYTHON_USEDEP}]

diff --git a/dev-python/cryptography/cryptography-2.8.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
similarity index 100%
rename from dev-python/cryptography/cryptography-2.8.ebuild
rename to dev-python/cryptography/cryptography-2.8-r1.ebuild
index edd5696da250961e6fdb34017237a00846ed0e9c..a3a34f92d7fca7723fdcc8851c3e3ab5f27ff179 100644 (file)
--- a/dev-python/cryptography/cryptography-2.8.ebuild
+++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild
@@ -40,11 +40,11 @@ RDEPEND="
        >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
        virtual/python-enum34[${PYTHON_USEDEP}]
        virtual/python-ipaddress[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+       $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
        "
 DEPEND="${RDEPEND}
        >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
-       $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
        test? (
                dev-python/pretend[${PYTHON_USEDEP}]
                dev-python/iso8601[${PYTHON_USEDEP}]