Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography/
Date: Thu, 09 Jan 2020 18:04:23
Message-Id: 1578593054.484ac3d510a71d0c47a2841d06dd79cb5a34b202.floppym@gentoo
1 commit: 484ac3d510a71d0c47a2841d06dd79cb5a34b202
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 9 18:03:32 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 9 18:04:14 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=484ac3d5
7
8 dev-python/cryptography: add cffi to RDEPEND
9
10 cryptography installs egg-info/requires.txt containing cffi. This means
11 packages using pkg_resources to import cryptography will fail if cffi is not
12 installed at runtime.
13
14 Closes: https://bugs.gentoo.org/696224
15 Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
16 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
17
18 .../{cryptography-2.6.1.ebuild => cryptography-2.6.1-r1.ebuild} | 4 ++--
19 .../{cryptography-2.8.ebuild => cryptography-2.8-r1.ebuild} | 4 ++--
20 2 files changed, 4 insertions(+), 4 deletions(-)
21
22 diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
23 similarity index 100%
24 rename from dev-python/cryptography/cryptography-2.6.1.ebuild
25 rename to dev-python/cryptography/cryptography-2.6.1-r1.ebuild
26 index 5eb0f608b49..d0c85a6a8fd 100644
27 --- a/dev-python/cryptography/cryptography-2.6.1.ebuild
28 +++ b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
29 @@ -39,11 +39,11 @@ RDEPEND="
30 >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
31 virtual/python-enum34[${PYTHON_USEDEP}]
32 virtual/python-ipaddress[${PYTHON_USEDEP}]
33 + $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
34 + $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
35 "
36 DEPEND="${RDEPEND}
37 >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
38 - $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
39 - $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
40 test? (
41 ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
42 dev-python/pretend[${PYTHON_USEDEP}]
43
44 diff --git a/dev-python/cryptography/cryptography-2.8.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
45 similarity index 100%
46 rename from dev-python/cryptography/cryptography-2.8.ebuild
47 rename to dev-python/cryptography/cryptography-2.8-r1.ebuild
48 index edd5696da25..a3a34f92d7f 100644
49 --- a/dev-python/cryptography/cryptography-2.8.ebuild
50 +++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild
51 @@ -40,11 +40,11 @@ RDEPEND="
52 >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
53 virtual/python-enum34[${PYTHON_USEDEP}]
54 virtual/python-ipaddress[${PYTHON_USEDEP}]
55 + $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
56 + $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
57 "
58 DEPEND="${RDEPEND}
59 >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
60 - $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
61 - $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
62 test? (
63 dev-python/pretend[${PYTHON_USEDEP}]
64 dev-python/iso8601[${PYTHON_USEDEP}]