From 151ac3445e0de16cc02615d332980d865d8d19ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 16 Mar 2020 21:53:22 +0100 Subject: [PATCH] dev-python/cryptography: Replace virts with cond deps MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 1cfcb46fdc96..281e405e9f4e 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 7238fe0f9b47..2b7b392c0bd3 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}] -- 2.26.2