1 |
commit: 4803751e71e74e5f948b19cdcd58e2f9f65574b0 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 6 09:07:16 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 6 09:07:16 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4803751e |
7 |
|
8 |
www-servers/nginx: remove userland_GNU |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
www-servers/nginx/nginx-1.20.1-r2.ebuild | 14 ++++---------- |
13 |
www-servers/nginx/nginx-1.20.2.ebuild | 14 ++++---------- |
14 |
www-servers/nginx/nginx-1.21.0-r2.ebuild | 14 ++++---------- |
15 |
www-servers/nginx/nginx-1.21.1.ebuild | 14 ++++---------- |
16 |
www-servers/nginx/nginx-1.21.2.ebuild | 14 ++++---------- |
17 |
www-servers/nginx/nginx-1.21.3.ebuild | 14 ++++---------- |
18 |
www-servers/nginx/nginx-1.21.4.ebuild | 14 ++++---------- |
19 |
7 files changed, 28 insertions(+), 70 deletions(-) |
20 |
|
21 |
diff --git a/www-servers/nginx/nginx-1.20.1-r2.ebuild b/www-servers/nginx/nginx-1.20.1-r2.ebuild |
22 |
index 544d72b4fb06..e9e47694a337 100644 |
23 |
--- a/www-servers/nginx/nginx-1.20.1-r2.ebuild |
24 |
+++ b/www-servers/nginx/nginx-1.20.1-r2.ebuild |
25 |
@@ -1,4 +1,4 @@ |
26 |
-# Copyright 1999-2021 Gentoo Authors |
27 |
+# Copyright 1999-2022 Gentoo Authors |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
EAPI=7 |
31 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
32 |
" |
33 |
|
34 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
35 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
36 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
37 |
|
38 |
for mod in $NGINX_MODULES_STD; do |
39 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
40 |
@@ -289,9 +289,7 @@ CDEPEND=" |
41 |
>=dev-libs/openssl-1.0.1c:0= |
42 |
) |
43 |
http-cache? ( |
44 |
- userland_GNU? ( |
45 |
- dev-libs/openssl:0= |
46 |
- ) |
47 |
+ dev-libs/openssl:0= |
48 |
) |
49 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
50 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
51 |
@@ -302,11 +300,7 @@ CDEPEND=" |
52 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
53 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
54 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
55 |
- nginx_modules_http_secure_link? ( |
56 |
- userland_GNU? ( |
57 |
- dev-libs/openssl:0= |
58 |
- ) |
59 |
- ) |
60 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
61 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
62 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
63 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |
64 |
|
65 |
diff --git a/www-servers/nginx/nginx-1.20.2.ebuild b/www-servers/nginx/nginx-1.20.2.ebuild |
66 |
index 3f56502d4648..df8739941162 100644 |
67 |
--- a/www-servers/nginx/nginx-1.20.2.ebuild |
68 |
+++ b/www-servers/nginx/nginx-1.20.2.ebuild |
69 |
@@ -1,4 +1,4 @@ |
70 |
-# Copyright 1999-2021 Gentoo Authors |
71 |
+# Copyright 1999-2022 Gentoo Authors |
72 |
# Distributed under the terms of the GNU General Public License v2 |
73 |
|
74 |
EAPI=7 |
75 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
76 |
" |
77 |
|
78 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
79 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
80 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
81 |
|
82 |
for mod in $NGINX_MODULES_STD; do |
83 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
84 |
@@ -289,9 +289,7 @@ CDEPEND=" |
85 |
>=dev-libs/openssl-1.0.1c:0= |
86 |
) |
87 |
http-cache? ( |
88 |
- userland_GNU? ( |
89 |
- dev-libs/openssl:0= |
90 |
- ) |
91 |
+ dev-libs/openssl:0= |
92 |
) |
93 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
94 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
95 |
@@ -302,11 +300,7 @@ CDEPEND=" |
96 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
97 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
98 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
99 |
- nginx_modules_http_secure_link? ( |
100 |
- userland_GNU? ( |
101 |
- dev-libs/openssl:0= |
102 |
- ) |
103 |
- ) |
104 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
105 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
106 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
107 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |
108 |
|
109 |
diff --git a/www-servers/nginx/nginx-1.21.0-r2.ebuild b/www-servers/nginx/nginx-1.21.0-r2.ebuild |
110 |
index 599d1bf039c2..4bb1e40afbbd 100644 |
111 |
--- a/www-servers/nginx/nginx-1.21.0-r2.ebuild |
112 |
+++ b/www-servers/nginx/nginx-1.21.0-r2.ebuild |
113 |
@@ -1,4 +1,4 @@ |
114 |
-# Copyright 1999-2021 Gentoo Authors |
115 |
+# Copyright 1999-2022 Gentoo Authors |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
|
118 |
EAPI=7 |
119 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
120 |
" |
121 |
|
122 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
123 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
124 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
125 |
|
126 |
for mod in $NGINX_MODULES_STD; do |
127 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
128 |
@@ -289,9 +289,7 @@ CDEPEND=" |
129 |
>=dev-libs/openssl-1.0.1c:0= |
130 |
) |
131 |
http-cache? ( |
132 |
- userland_GNU? ( |
133 |
- dev-libs/openssl:0= |
134 |
- ) |
135 |
+ dev-libs/openssl:0= |
136 |
) |
137 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
138 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
139 |
@@ -302,11 +300,7 @@ CDEPEND=" |
140 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
141 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
142 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
143 |
- nginx_modules_http_secure_link? ( |
144 |
- userland_GNU? ( |
145 |
- dev-libs/openssl:0= |
146 |
- ) |
147 |
- ) |
148 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
149 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
150 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
151 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |
152 |
|
153 |
diff --git a/www-servers/nginx/nginx-1.21.1.ebuild b/www-servers/nginx/nginx-1.21.1.ebuild |
154 |
index 5c6078c50aec..f7d071a8e8f0 100644 |
155 |
--- a/www-servers/nginx/nginx-1.21.1.ebuild |
156 |
+++ b/www-servers/nginx/nginx-1.21.1.ebuild |
157 |
@@ -1,4 +1,4 @@ |
158 |
-# Copyright 1999-2021 Gentoo Authors |
159 |
+# Copyright 1999-2022 Gentoo Authors |
160 |
# Distributed under the terms of the GNU General Public License v2 |
161 |
|
162 |
EAPI=7 |
163 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
164 |
" |
165 |
|
166 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
167 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
168 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
169 |
|
170 |
for mod in $NGINX_MODULES_STD; do |
171 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
172 |
@@ -289,9 +289,7 @@ CDEPEND=" |
173 |
>=dev-libs/openssl-1.0.1c:0= |
174 |
) |
175 |
http-cache? ( |
176 |
- userland_GNU? ( |
177 |
- dev-libs/openssl:0= |
178 |
- ) |
179 |
+ dev-libs/openssl:0= |
180 |
) |
181 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
182 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
183 |
@@ -302,11 +300,7 @@ CDEPEND=" |
184 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
185 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
186 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
187 |
- nginx_modules_http_secure_link? ( |
188 |
- userland_GNU? ( |
189 |
- dev-libs/openssl:0= |
190 |
- ) |
191 |
- ) |
192 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
193 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
194 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
195 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |
196 |
|
197 |
diff --git a/www-servers/nginx/nginx-1.21.2.ebuild b/www-servers/nginx/nginx-1.21.2.ebuild |
198 |
index bdebfbba028c..28cef0b0ea20 100644 |
199 |
--- a/www-servers/nginx/nginx-1.21.2.ebuild |
200 |
+++ b/www-servers/nginx/nginx-1.21.2.ebuild |
201 |
@@ -1,4 +1,4 @@ |
202 |
-# Copyright 1999-2021 Gentoo Authors |
203 |
+# Copyright 1999-2022 Gentoo Authors |
204 |
# Distributed under the terms of the GNU General Public License v2 |
205 |
|
206 |
EAPI=7 |
207 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
208 |
" |
209 |
|
210 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
211 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
212 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
213 |
|
214 |
for mod in $NGINX_MODULES_STD; do |
215 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
216 |
@@ -289,9 +289,7 @@ CDEPEND=" |
217 |
>=dev-libs/openssl-1.0.1c:0= |
218 |
) |
219 |
http-cache? ( |
220 |
- userland_GNU? ( |
221 |
- dev-libs/openssl:0= |
222 |
- ) |
223 |
+ dev-libs/openssl:0= |
224 |
) |
225 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
226 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
227 |
@@ -302,11 +300,7 @@ CDEPEND=" |
228 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
229 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
230 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
231 |
- nginx_modules_http_secure_link? ( |
232 |
- userland_GNU? ( |
233 |
- dev-libs/openssl:0= |
234 |
- ) |
235 |
- ) |
236 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
237 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
238 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
239 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |
240 |
|
241 |
diff --git a/www-servers/nginx/nginx-1.21.3.ebuild b/www-servers/nginx/nginx-1.21.3.ebuild |
242 |
index bdebfbba028c..28cef0b0ea20 100644 |
243 |
--- a/www-servers/nginx/nginx-1.21.3.ebuild |
244 |
+++ b/www-servers/nginx/nginx-1.21.3.ebuild |
245 |
@@ -1,4 +1,4 @@ |
246 |
-# Copyright 1999-2021 Gentoo Authors |
247 |
+# Copyright 1999-2022 Gentoo Authors |
248 |
# Distributed under the terms of the GNU General Public License v2 |
249 |
|
250 |
EAPI=7 |
251 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
252 |
" |
253 |
|
254 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
255 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
256 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
257 |
|
258 |
for mod in $NGINX_MODULES_STD; do |
259 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
260 |
@@ -289,9 +289,7 @@ CDEPEND=" |
261 |
>=dev-libs/openssl-1.0.1c:0= |
262 |
) |
263 |
http-cache? ( |
264 |
- userland_GNU? ( |
265 |
- dev-libs/openssl:0= |
266 |
- ) |
267 |
+ dev-libs/openssl:0= |
268 |
) |
269 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
270 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
271 |
@@ -302,11 +300,7 @@ CDEPEND=" |
272 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
273 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
274 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
275 |
- nginx_modules_http_secure_link? ( |
276 |
- userland_GNU? ( |
277 |
- dev-libs/openssl:0= |
278 |
- ) |
279 |
- ) |
280 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
281 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
282 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
283 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |
284 |
|
285 |
diff --git a/www-servers/nginx/nginx-1.21.4.ebuild b/www-servers/nginx/nginx-1.21.4.ebuild |
286 |
index bdebfbba028c..28cef0b0ea20 100644 |
287 |
--- a/www-servers/nginx/nginx-1.21.4.ebuild |
288 |
+++ b/www-servers/nginx/nginx-1.21.4.ebuild |
289 |
@@ -1,4 +1,4 @@ |
290 |
-# Copyright 1999-2021 Gentoo Authors |
291 |
+# Copyright 1999-2022 Gentoo Authors |
292 |
# Distributed under the terms of the GNU General Public License v2 |
293 |
|
294 |
EAPI=7 |
295 |
@@ -248,7 +248,7 @@ NGINX_MODULES_3RD=" |
296 |
" |
297 |
|
298 |
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
299 |
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
300 |
+ pcre-jit rtmp selinux ssl threads vim-syntax" |
301 |
|
302 |
for mod in $NGINX_MODULES_STD; do |
303 |
IUSE="${IUSE} +nginx_modules_http_${mod}" |
304 |
@@ -289,9 +289,7 @@ CDEPEND=" |
305 |
>=dev-libs/openssl-1.0.1c:0= |
306 |
) |
307 |
http-cache? ( |
308 |
- userland_GNU? ( |
309 |
- dev-libs/openssl:0= |
310 |
- ) |
311 |
+ dev-libs/openssl:0= |
312 |
) |
313 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
314 |
nginx_modules_http_geoip? ( dev-libs/geoip ) |
315 |
@@ -302,11 +300,7 @@ CDEPEND=" |
316 |
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) |
317 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) |
318 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
319 |
- nginx_modules_http_secure_link? ( |
320 |
- userland_GNU? ( |
321 |
- dev-libs/openssl:0= |
322 |
- ) |
323 |
- ) |
324 |
+ nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) |
325 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
326 |
nginx_modules_http_lua? ( ${LUA_DEPS} ) |
327 |
nginx_modules_http_auth_pam? ( sys-libs/pam ) |