From af97063e8d0c5a2530d0a3e834383985d461b8e1 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 2 May 2021 12:54:19 +0300 Subject: www-servers/nginx: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada --- 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(-) (limited to 'www-servers/nginx') diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild b/www-servers/nginx/nginx-1.18.0-r2.ebuild index b8b349e004ff..e96a7738bc69 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 11e748bc8c24..1cdf07062dfa 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 11e748bc8c24..1cdf07062dfa 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 ) -- cgit v1.2.3-65-gdbad