commit: af97063e8d0c5a2530d0a3e834383985d461b8e1
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 2 09:54:19 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 2 09:54:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af97063e
www-servers/nginx: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
www-servers/nginx/nginx-1.18.0-r2.ebuild | 14 +++++---------
www-servers/nginx/nginx-1.19.10.ebuild | 14 +++++---------
www-servers/nginx/nginx-1.19.9.ebuild | 14 +++++---------
3 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild
b/www-servers/nginx/nginx-1.18.0-r2.ebuild
index b8b349e004f..e96a7738bc6 100644
--- a/www-servers/nginx/nginx-1.18.0-r2.ebuild
+++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild
@@ -246,7 +246,7 @@ NGINX_MODULES_3RD="
stream_javascript
"
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic luajit +pcre
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
for mod in $NGINX_MODULES_STD; do
@@ -281,17 +281,14 @@ CDEPEND="
pcre? ( dev-libs/libpcre:= )
pcre-jit? ( dev-libs/libpcre:=[jit] )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
http2? (
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-1.0.1c:0=
)
http-cache? (
userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
nginx_modules_http_brotli? ( app-arch/brotli:= )
@@ -305,8 +302,7 @@ CDEPEND="
nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
nginx_modules_http_secure_link? (
userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
diff --git a/www-servers/nginx/nginx-1.19.10.ebuild
b/www-servers/nginx/nginx-1.19.10.ebuild
index 11e748bc8c2..1cdf07062df 100644
--- a/www-servers/nginx/nginx-1.19.10.ebuild
+++ b/www-servers/nginx/nginx-1.19.10.ebuild
@@ -247,7 +247,7 @@ NGINX_MODULES_3RD="
stream_javascript
"
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl +pcre
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
for mod in $NGINX_MODULES_STD; do
@@ -282,17 +282,14 @@ CDEPEND="
pcre? ( dev-libs/libpcre:= )
pcre-jit? ( dev-libs/libpcre:=[jit] )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
http2? (
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-1.0.1c:0=
)
http-cache? (
userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
nginx_modules_http_brotli? ( app-arch/brotli:= )
@@ -306,8 +303,7 @@ CDEPEND="
nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
nginx_modules_http_secure_link? (
userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
diff --git a/www-servers/nginx/nginx-1.19.9.ebuild
b/www-servers/nginx/nginx-1.19.9.ebuild
index 11e748bc8c2..1cdf07062df 100644
--- a/www-servers/nginx/nginx-1.19.9.ebuild
+++ b/www-servers/nginx/nginx-1.19.9.ebuild
@@ -247,7 +247,7 @@ NGINX_MODULES_3RD="
stream_javascript
"
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl +pcre
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
for mod in $NGINX_MODULES_STD; do
@@ -282,17 +282,14 @@ CDEPEND="
pcre? ( dev-libs/libpcre:= )
pcre-jit? ( dev-libs/libpcre:=[jit] )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
http2? (
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-1.0.1c:0=
)
http-cache? (
userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
nginx_modules_http_brotli? ( app-arch/brotli:= )
@@ -306,8 +303,7 @@ CDEPEND="
nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
nginx_modules_http_secure_link? (
userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
