From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C452138350 for ; Mon, 16 Mar 2020 20:56:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B063E0967; Mon, 16 Mar 2020 20:56:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C9C3E0967 for ; Mon, 16 Mar 2020 20:56:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCE1534F1FB for ; Mon, 16 Mar 2020 20:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76829176 for ; Mon, 16 Mar 2020 20:56:45 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1584392200.151ac3445e0de16cc02615d332980d865d8d19ae.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/cryptography/cryptography-2.6.1-r1.ebuild dev-python/cryptography/cryptography-2.8-r1.ebuild X-VCS-Directories: dev-python/cryptography/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 151ac3445e0de16cc02615d332980d865d8d19ae X-VCS-Branch: master Date: Mon, 16 Mar 2020 20:56:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 587a01c6-1739-40a2-b82d-1ccf293e5218 X-Archives-Hash: 8df0a5bd19fd09fe0bf70fb82a436970 commit: 151ac3445e0de16cc02615d332980d865d8d19ae Author: Michał Górny gentoo org> AuthorDate: Mon Mar 16 20:53:22 2020 +0000 Commit: Michał Górny gentoo 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 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}]