From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A6B21382C5 for ; Sun, 2 May 2021 09:54:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D09E0843; Sun, 2 May 2021 09:54:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B27D3E0843 for ; Sun, 2 May 2021 09:54:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A7E6340CA7 for ; Sun, 2 May 2021 09:54:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1677964D for ; Sun, 2 May 2021 09:54:44 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1619949281.af97063e8d0c5a2530d0a3e834383985d461b8e1.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx/nginx-1.18.0-r2.ebuild www-servers/nginx/nginx-1.19.10.ebuild www-servers/nginx/nginx-1.19.9.ebuild X-VCS-Directories: www-servers/nginx/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: af97063e8d0c5a2530d0a3e834383985d461b8e1 X-VCS-Branch: master Date: Sun, 2 May 2021 09:54:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba452689-5217-401c-93e7-fa23b94e3583 X-Archives-Hash: 28a5ba27936a0494fe5a81bfc78ad27b commit: af97063e8d0c5a2530d0a3e834383985d461b8e1 Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 2 09:54:19 2021 +0000 Commit: Mikle Kolyada gentoo 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 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 )