[gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography/

[Michał Górny]

commit:     151ac3445e0de16cc02615d332980d865d8d19ae
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 20:53:22 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 20:56:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151ac344

dev-python/cryptography: Replace virts with cond deps

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/cryptography/cryptography-2.6.1-r1.ebuild | 12 ++++++++----
 dev-python/cryptography/cryptography-2.8-r1.ebuild   | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild 
b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
index 1cfcb46fdc9..281e405e9f4 100644
--- a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
@@ -37,10 +37,14 @@ RDEPEND="
        >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]
        >=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*')
+       $(python_gen_cond_dep '
+               dev-python/enum34[${PYTHON_USEDEP}]
+               dev-python/ipaddress[${PYTHON_USEDEP}]
+       ' -2)
+       $(python_gen_cond_dep '
+               >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+               !~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]
+       ' 'python*')
        "
 DEPEND="${RDEPEND}
        >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]

diff --git a/dev-python/cryptography/cryptography-2.8-r1.ebuild 
b/dev-python/cryptography/cryptography-2.8-r1.ebuild
index 7238fe0f9b4..2b7b392c0bd 100644
--- a/dev-python/cryptography/cryptography-2.8-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild
@@ -38,10 +38,14 @@ RDEPEND="
        idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
        dev-python/setuptools[${PYTHON_USEDEP}]
        >=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*')
+       $(python_gen_cond_dep '
+               dev-python/enum34[${PYTHON_USEDEP}]
+               dev-python/ipaddress[${PYTHON_USEDEP}]
+       ' -2)
+       $(python_gen_cond_dep '
+               >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+               !~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]
+       ' 'python*')
        "
 DEPEND="${RDEPEND}
        >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]