1 |
commit: c47ac53e6c4efbe05baf75ff7a3ad68485aed535 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 09:44:02 2021 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 3 09:44:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47ac53e |
7 |
|
8 |
dev-php/swoole: 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-php/swoole/swoole-4.2.13.ebuild | 6 +++--- |
14 |
dev-php/swoole/swoole-4.4.12.ebuild | 7 +++---- |
15 |
dev-php/swoole/swoole-4.4.14.ebuild | 7 +++---- |
16 |
dev-php/swoole/swoole-4.4.15.ebuild | 7 +++---- |
17 |
dev-php/swoole/swoole-4.4.16.ebuild | 7 +++---- |
18 |
dev-php/swoole/swoole-4.4.19.ebuild | 7 +++---- |
19 |
dev-php/swoole/swoole-4.5.9.ebuild | 7 +++---- |
20 |
7 files changed, 21 insertions(+), 27 deletions(-) |
21 |
|
22 |
diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild |
23 |
index 04aa2e40c37..facb4470ae8 100644 |
24 |
--- a/dev-php/swoole/swoole-4.2.13.ebuild |
25 |
+++ b/dev-php/swoole/swoole-4.2.13.ebuild |
26 |
@@ -1,4 +1,4 @@ |
27 |
-# Copyright 1999-2019 Gentoo Authors |
28 |
+# Copyright 1999-2021 Gentoo Authors |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
EAPI="7" |
32 |
@@ -27,7 +27,7 @@ DEPEND=" |
33 |
dev-libs/boost:0= |
34 |
dev-libs/libpcre |
35 |
http2? ( net-libs/nghttp2:0= ) |
36 |
- ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) |
37 |
+ ssl? ( dev-libs/openssl:0= ) |
38 |
php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) |
39 |
php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) |
40 |
php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) |
41 |
@@ -40,7 +40,7 @@ DEPEND=" |
42 |
|
43 |
RDEPEND="${DEPEND}" |
44 |
|
45 |
-IUSE="debug http2 libressl mysql sockets ssl" |
46 |
+IUSE="debug http2 mysql sockets ssl" |
47 |
|
48 |
src_configure() { |
49 |
# PostgreSQL disabled due to Gentoo's slot system |
50 |
|
51 |
diff --git a/dev-php/swoole/swoole-4.4.12.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild |
52 |
index 7df45e4948c..dd302030870 100644 |
53 |
--- a/dev-php/swoole/swoole-4.4.12.ebuild |
54 |
+++ b/dev-php/swoole/swoole-4.4.12.ebuild |
55 |
@@ -1,4 +1,4 @@ |
56 |
-# Copyright 1999-2019 Gentoo Authors |
57 |
+# Copyright 1999-2021 Gentoo Authors |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
|
60 |
EAPI="7" |
61 |
@@ -30,8 +30,7 @@ DEPEND=" |
62 |
sys-libs/zlib:0= |
63 |
http2? ( net-libs/nghttp2:0= ) |
64 |
ssl? ( |
65 |
- !libressl? ( dev-libs/openssl:0= ) |
66 |
- libressl? ( dev-libs/libressl:0= ) |
67 |
+ dev-libs/openssl:0= |
68 |
) |
69 |
php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) |
70 |
php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) |
71 |
@@ -47,7 +46,7 @@ DEPEND=" |
72 |
|
73 |
RDEPEND="${DEPEND}" |
74 |
|
75 |
-IUSE="debug http2 libressl mysql sockets ssl" |
76 |
+IUSE="debug http2 mysql sockets ssl" |
77 |
|
78 |
src_configure() { |
79 |
# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory |
80 |
|
81 |
diff --git a/dev-php/swoole/swoole-4.4.14.ebuild b/dev-php/swoole/swoole-4.4.14.ebuild |
82 |
index 146edf124e9..dd302030870 100644 |
83 |
--- a/dev-php/swoole/swoole-4.4.14.ebuild |
84 |
+++ b/dev-php/swoole/swoole-4.4.14.ebuild |
85 |
@@ -1,4 +1,4 @@ |
86 |
-# Copyright 1999-2020 Gentoo Authors |
87 |
+# Copyright 1999-2021 Gentoo Authors |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
|
90 |
EAPI="7" |
91 |
@@ -30,8 +30,7 @@ DEPEND=" |
92 |
sys-libs/zlib:0= |
93 |
http2? ( net-libs/nghttp2:0= ) |
94 |
ssl? ( |
95 |
- !libressl? ( dev-libs/openssl:0= ) |
96 |
- libressl? ( dev-libs/libressl:0= ) |
97 |
+ dev-libs/openssl:0= |
98 |
) |
99 |
php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) |
100 |
php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) |
101 |
@@ -47,7 +46,7 @@ DEPEND=" |
102 |
|
103 |
RDEPEND="${DEPEND}" |
104 |
|
105 |
-IUSE="debug http2 libressl mysql sockets ssl" |
106 |
+IUSE="debug http2 mysql sockets ssl" |
107 |
|
108 |
src_configure() { |
109 |
# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory |
110 |
|
111 |
diff --git a/dev-php/swoole/swoole-4.4.15.ebuild b/dev-php/swoole/swoole-4.4.15.ebuild |
112 |
index 146edf124e9..dd302030870 100644 |
113 |
--- a/dev-php/swoole/swoole-4.4.15.ebuild |
114 |
+++ b/dev-php/swoole/swoole-4.4.15.ebuild |
115 |
@@ -1,4 +1,4 @@ |
116 |
-# Copyright 1999-2020 Gentoo Authors |
117 |
+# Copyright 1999-2021 Gentoo Authors |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
|
120 |
EAPI="7" |
121 |
@@ -30,8 +30,7 @@ DEPEND=" |
122 |
sys-libs/zlib:0= |
123 |
http2? ( net-libs/nghttp2:0= ) |
124 |
ssl? ( |
125 |
- !libressl? ( dev-libs/openssl:0= ) |
126 |
- libressl? ( dev-libs/libressl:0= ) |
127 |
+ dev-libs/openssl:0= |
128 |
) |
129 |
php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) |
130 |
php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) |
131 |
@@ -47,7 +46,7 @@ DEPEND=" |
132 |
|
133 |
RDEPEND="${DEPEND}" |
134 |
|
135 |
-IUSE="debug http2 libressl mysql sockets ssl" |
136 |
+IUSE="debug http2 mysql sockets ssl" |
137 |
|
138 |
src_configure() { |
139 |
# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory |
140 |
|
141 |
diff --git a/dev-php/swoole/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild |
142 |
index 146edf124e9..dd302030870 100644 |
143 |
--- a/dev-php/swoole/swoole-4.4.16.ebuild |
144 |
+++ b/dev-php/swoole/swoole-4.4.16.ebuild |
145 |
@@ -1,4 +1,4 @@ |
146 |
-# Copyright 1999-2020 Gentoo Authors |
147 |
+# Copyright 1999-2021 Gentoo Authors |
148 |
# Distributed under the terms of the GNU General Public License v2 |
149 |
|
150 |
EAPI="7" |
151 |
@@ -30,8 +30,7 @@ DEPEND=" |
152 |
sys-libs/zlib:0= |
153 |
http2? ( net-libs/nghttp2:0= ) |
154 |
ssl? ( |
155 |
- !libressl? ( dev-libs/openssl:0= ) |
156 |
- libressl? ( dev-libs/libressl:0= ) |
157 |
+ dev-libs/openssl:0= |
158 |
) |
159 |
php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) |
160 |
php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) |
161 |
@@ -47,7 +46,7 @@ DEPEND=" |
162 |
|
163 |
RDEPEND="${DEPEND}" |
164 |
|
165 |
-IUSE="debug http2 libressl mysql sockets ssl" |
166 |
+IUSE="debug http2 mysql sockets ssl" |
167 |
|
168 |
src_configure() { |
169 |
# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory |
170 |
|
171 |
diff --git a/dev-php/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.4.19.ebuild |
172 |
index 146edf124e9..dd302030870 100644 |
173 |
--- a/dev-php/swoole/swoole-4.4.19.ebuild |
174 |
+++ b/dev-php/swoole/swoole-4.4.19.ebuild |
175 |
@@ -1,4 +1,4 @@ |
176 |
-# Copyright 1999-2020 Gentoo Authors |
177 |
+# Copyright 1999-2021 Gentoo Authors |
178 |
# Distributed under the terms of the GNU General Public License v2 |
179 |
|
180 |
EAPI="7" |
181 |
@@ -30,8 +30,7 @@ DEPEND=" |
182 |
sys-libs/zlib:0= |
183 |
http2? ( net-libs/nghttp2:0= ) |
184 |
ssl? ( |
185 |
- !libressl? ( dev-libs/openssl:0= ) |
186 |
- libressl? ( dev-libs/libressl:0= ) |
187 |
+ dev-libs/openssl:0= |
188 |
) |
189 |
php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) |
190 |
php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) |
191 |
@@ -47,7 +46,7 @@ DEPEND=" |
192 |
|
193 |
RDEPEND="${DEPEND}" |
194 |
|
195 |
-IUSE="debug http2 libressl mysql sockets ssl" |
196 |
+IUSE="debug http2 mysql sockets ssl" |
197 |
|
198 |
src_configure() { |
199 |
# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory |
200 |
|
201 |
diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild |
202 |
index 721b5a84f00..48523b05538 100644 |
203 |
--- a/dev-php/swoole/swoole-4.5.9.ebuild |
204 |
+++ b/dev-php/swoole/swoole-4.5.9.ebuild |
205 |
@@ -1,4 +1,4 @@ |
206 |
-# Copyright 1999-2020 Gentoo Authors |
207 |
+# Copyright 1999-2021 Gentoo Authors |
208 |
# Distributed under the terms of the GNU General Public License v2 |
209 |
|
210 |
EAPI="7" |
211 |
@@ -28,8 +28,7 @@ DEPEND=" |
212 |
dev-libs/libpcre |
213 |
sys-libs/zlib:0= |
214 |
ssl? ( |
215 |
- !libressl? ( dev-libs/openssl:0= ) |
216 |
- libressl? ( dev-libs/libressl:0= ) |
217 |
+ dev-libs/openssl:0= |
218 |
) |
219 |
mysql? ( |
220 |
php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) |
221 |
@@ -41,7 +40,7 @@ DEPEND=" |
222 |
|
223 |
RDEPEND="${DEPEND}" |
224 |
|
225 |
-IUSE="debug http2 libressl mysql sockets ssl" |
226 |
+IUSE="debug http2 mysql sockets ssl" |
227 |
|
228 |
src_configure() { |
229 |
# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory |