Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/
Date: Fri, 30 Apr 2021 09:26:10
Message-Id: 1619774726.23d8ea01da3bace294eb8a666814eb3ccc653b1e.zlogene@gentoo
1 commit: 23d8ea01da3bace294eb8a666814eb3ccc653b1e
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 09:25:26 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 09:25:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d8ea01
7
8 dev-lang/python: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-lang/python/python-2.7.18_p8.ebuild | 7 ++-----
14 dev-lang/python/python-3.10.0_alpha7.ebuild | 7 ++-----
15 dev-lang/python/python-3.6.13_p1.ebuild | 7 ++-----
16 dev-lang/python/python-3.7.10_p1.ebuild | 7 ++-----
17 dev-lang/python/python-3.8.8_p1.ebuild | 7 ++-----
18 dev-lang/python/python-3.8.9.ebuild | 7 ++-----
19 dev-lang/python/python-3.9.2_p1.ebuild | 7 ++-----
20 dev-lang/python/python-3.9.4.ebuild | 7 ++-----
21 8 files changed, 16 insertions(+), 40 deletions(-)
22
23 diff --git a/dev-lang/python/python-2.7.18_p8.ebuild b/dev-lang/python/python-2.7.18_p8.ebuild
24 index a74794af575..59aed167c78 100644
25 --- a/dev-lang/python/python-2.7.18_p8.ebuild
26 +++ b/dev-lang/python/python-2.7.18_p8.ebuild
27 @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
28 LICENSE="PSF-2"
29 SLOT="${PYVER}"
30 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
31 -IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
32 +IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
33
34 # Do not add a dependency on dev-lang/python to this ebuild.
35 # If you need to apply a patch which requires python for bootstrapping, please
36 @@ -50,10 +50,7 @@ RDEPEND="app-arch/bzip2:=
37 ncurses? ( >=sys-libs/ncurses-5.2:= )
38 readline? ( >=sys-libs/readline-4.1:= )
39 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
40 - ssl? (
41 - !libressl? ( dev-libs/openssl:= )
42 - libressl? ( dev-libs/libressl:= )
43 - )
44 + ssl? ( dev-libs/openssl:= )
45 tk? (
46 >=dev-lang/tcl-8.0:=
47 >=dev-lang/tk-8.0:=
48
49 diff --git a/dev-lang/python/python-3.10.0_alpha7.ebuild b/dev-lang/python/python-3.10.0_alpha7.ebuild
50 index 7d2e54b48f9..82f3f29aff1 100644
51 --- a/dev-lang/python/python-3.10.0_alpha7.ebuild
52 +++ b/dev-lang/python/python-3.10.0_alpha7.ebuild
53 @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
54 LICENSE="PSF-2"
55 SLOT="${PYVER}"
56 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
57 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
58 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
59 RESTRICT="!test? ( test )"
60
61 # Do not add a dependency on dev-lang/python to this ebuild.
62 @@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
63 ncurses? ( >=sys-libs/ncurses-5.2:= )
64 readline? ( >=sys-libs/readline-4.1:= )
65 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
66 - ssl? (
67 - !libressl? ( dev-libs/openssl:= )
68 - libressl? ( dev-libs/libressl:= )
69 - )
70 + ssl? ( dev-libs/openssl:= )
71 tk? (
72 >=dev-lang/tcl-8.0:=
73 >=dev-lang/tk-8.0:=
74
75 diff --git a/dev-lang/python/python-3.6.13_p1.ebuild b/dev-lang/python/python-3.6.13_p1.ebuild
76 index a126a676d61..e24be42012b 100644
77 --- a/dev-lang/python/python-3.6.13_p1.ebuild
78 +++ b/dev-lang/python/python-3.6.13_p1.ebuild
79 @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
80 LICENSE="PSF-2"
81 SLOT="${PYVER}/${PYVER}m"
82 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
83 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
84 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
85 RESTRICT="!test? ( test )"
86
87 # Do not add a dependency on dev-lang/python to this ebuild.
88 @@ -41,10 +41,7 @@ RDEPEND="app-arch/bzip2:=
89 ncurses? ( >=sys-libs/ncurses-5.2:= )
90 readline? ( >=sys-libs/readline-4.1:= )
91 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
92 - ssl? (
93 - !libressl? ( dev-libs/openssl:= )
94 - libressl? ( dev-libs/libressl:= )
95 - )
96 + ssl? ( dev-libs/openssl:= )
97 tk? (
98 >=dev-lang/tcl-8.0:=
99 >=dev-lang/tk-8.0:=
100
101 diff --git a/dev-lang/python/python-3.7.10_p1.ebuild b/dev-lang/python/python-3.7.10_p1.ebuild
102 index 7a7442b4229..0e99aadfd9c 100644
103 --- a/dev-lang/python/python-3.7.10_p1.ebuild
104 +++ b/dev-lang/python/python-3.7.10_p1.ebuild
105 @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
106 LICENSE="PSF-2"
107 SLOT="${PYVER}/${PYVER}m"
108 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
109 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
110 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
111 RESTRICT="!test? ( test )"
112
113 # Do not add a dependency on dev-lang/python to this ebuild.
114 @@ -42,10 +42,7 @@ RDEPEND="app-arch/bzip2:=
115 ncurses? ( >=sys-libs/ncurses-5.2:= )
116 readline? ( >=sys-libs/readline-4.1:= )
117 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
118 - ssl? (
119 - !libressl? ( dev-libs/openssl:= )
120 - libressl? ( dev-libs/libressl:= )
121 - )
122 + ssl? ( dev-libs/openssl:= )
123 tk? (
124 >=dev-lang/tcl-8.0:=
125 >=dev-lang/tk-8.0:=
126
127 diff --git a/dev-lang/python/python-3.8.8_p1.ebuild b/dev-lang/python/python-3.8.8_p1.ebuild
128 index 9ef8a08637b..b1c4a316ec3 100644
129 --- a/dev-lang/python/python-3.8.8_p1.ebuild
130 +++ b/dev-lang/python/python-3.8.8_p1.ebuild
131 @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
132 LICENSE="PSF-2"
133 SLOT="${PYVER}"
134 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
135 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
136 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
137 RESTRICT="!test? ( test )"
138
139 # Do not add a dependency on dev-lang/python to this ebuild.
140 @@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
141 ncurses? ( >=sys-libs/ncurses-5.2:= )
142 readline? ( >=sys-libs/readline-4.1:= )
143 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
144 - ssl? (
145 - !libressl? ( dev-libs/openssl:= )
146 - libressl? ( dev-libs/libressl:= )
147 - )
148 + ssl? ( dev-libs/openssl:= )
149 tk? (
150 >=dev-lang/tcl-8.0:=
151 >=dev-lang/tk-8.0:=
152
153 diff --git a/dev-lang/python/python-3.8.9.ebuild b/dev-lang/python/python-3.8.9.ebuild
154 index 56c8ed395e5..0a87aec9180 100644
155 --- a/dev-lang/python/python-3.8.9.ebuild
156 +++ b/dev-lang/python/python-3.8.9.ebuild
157 @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
158 LICENSE="PSF-2"
159 SLOT="${PYVER}"
160 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
161 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
162 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
163 RESTRICT="!test? ( test )"
164
165 # Do not add a dependency on dev-lang/python to this ebuild.
166 @@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
167 ncurses? ( >=sys-libs/ncurses-5.2:= )
168 readline? ( >=sys-libs/readline-4.1:= )
169 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
170 - ssl? (
171 - !libressl? ( dev-libs/openssl:= )
172 - libressl? ( dev-libs/libressl:= )
173 - )
174 + ssl? ( dev-libs/openssl:= )
175 tk? (
176 >=dev-lang/tcl-8.0:=
177 >=dev-lang/tk-8.0:=
178
179 diff --git a/dev-lang/python/python-3.9.2_p1.ebuild b/dev-lang/python/python-3.9.2_p1.ebuild
180 index 60682191e27..ba35fe24eeb 100644
181 --- a/dev-lang/python/python-3.9.2_p1.ebuild
182 +++ b/dev-lang/python/python-3.9.2_p1.ebuild
183 @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
184 LICENSE="PSF-2"
185 SLOT="${PYVER}"
186 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
187 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
188 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
189 RESTRICT="!test? ( test )"
190
191 # Do not add a dependency on dev-lang/python to this ebuild.
192 @@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
193 ncurses? ( >=sys-libs/ncurses-5.2:= )
194 readline? ( >=sys-libs/readline-4.1:= )
195 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
196 - ssl? (
197 - !libressl? ( dev-libs/openssl:= )
198 - libressl? ( dev-libs/libressl:= )
199 - )
200 + ssl? ( dev-libs/openssl:= )
201 tk? (
202 >=dev-lang/tcl-8.0:=
203 >=dev-lang/tk-8.0:=
204
205 diff --git a/dev-lang/python/python-3.9.4.ebuild b/dev-lang/python/python-3.9.4.ebuild
206 index e3e5d129c15..444f9d6d14b 100644
207 --- a/dev-lang/python/python-3.9.4.ebuild
208 +++ b/dev-lang/python/python-3.9.4.ebuild
209 @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
210 LICENSE="PSF-2"
211 SLOT="${PYVER}"
212 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
213 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
214 +IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
215 RESTRICT="!test? ( test )"
216
217 # Do not add a dependency on dev-lang/python to this ebuild.
218 @@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
219 ncurses? ( >=sys-libs/ncurses-5.2:= )
220 readline? ( >=sys-libs/readline-4.1:= )
221 sqlite? ( >=dev-db/sqlite-3.3.8:3= )
222 - ssl? (
223 - !libressl? ( dev-libs/openssl:= )
224 - libressl? ( dev-libs/libressl:= )
225 - )
226 + ssl? ( dev-libs/openssl:= )
227 tk? (
228 >=dev-lang/tcl-8.0:=
229 >=dev-lang/tk-8.0:=