gentoo resync : 04.05.2021

4 files changed, 18 insertions, 30 deletions

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 4e4c5d2372ec..01e64ab8df82 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -38,7 +38,7 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.4.3.tar.gz 460997 BLAKE2B 373a4aca51ada84d628ae6b6254c9268b4cec4ac8870f81ba43ff693f20148a9ca862038e57a68c22cbff29ea613785e83778cc708cf1b47103e9f950a198289 SHA512 b3b4294817997a06661f00f53d38e0cde08e022f41b3663f9d17a91b343fb944e21184114f09d89995096faee491187c3ae424407f2855ed0670c0cccf928cd7
 DIST njs-0.5.3.tar.gz 519938 BLAKE2B 1d06f8a20f6c37977e3b4b9afa0f136761a6998b85739a9853bb41d70ea6af42f49541035961fd0251eda2e10579f7bf983eaec2f9e19460138e53f44b9e6788 SHA512 b1d2e7498c37cc1df18e0f65866391637bf75d3d251fc7d7ad1ef5c76457697f49eaea088e1d157c94a6e779e9b8cc07b3f5aaac965666624506f517f6878c23
-EBUILD nginx-1.18.0-r2.ebuild 40484 BLAKE2B f0379273dc6fd4291346e5cf6554bb738edee778ae388985e5bd22b9695e099038822ea0b9de96cc1f3b973ab54ca18a0a1b2c21a234b6c8e8da664165b67614 SHA512 fc6a75bc744a3bb876b3eeaa1d275ec0efb6afde6e95fa29e7368d566b605392c1692e2110626a17cff319c5447a85918513d18d524a5a780c402f8cea0a43ee
-EBUILD nginx-1.19.10.ebuild 40442 BLAKE2B 69dc967f94b33dcf158da4408b369bb4fa3e6ad69594bafbc4729fb61bc873f571cec7ad628f00081ae22dde9be2133368978af5d822d2b1c9b00bde68dfe2a2 SHA512 082d25b415b6ca1bde49bf0009022b06b5a6144331e4d714fd08921da393501aef2396915aa1c832887ae42907b3590e25db6f4df1b667e4c393ec553bd0b259
-EBUILD nginx-1.19.9.ebuild 40442 BLAKE2B 69dc967f94b33dcf158da4408b369bb4fa3e6ad69594bafbc4729fb61bc873f571cec7ad628f00081ae22dde9be2133368978af5d822d2b1c9b00bde68dfe2a2 SHA512 082d25b415b6ca1bde49bf0009022b06b5a6144331e4d714fd08921da393501aef2396915aa1c832887ae42907b3590e25db6f4df1b667e4c393ec553bd0b259
+EBUILD nginx-1.18.0-r2.ebuild 40269 BLAKE2B 0162ffffd48901395478085e7a5afb31f9ccb724cd945a1e6204009ccb37d0818c6580bb7376e29840714c407c91953e254bdaa212f53753feb3fc4479b1503b SHA512 955a60c469f56331035f2712bb24278b4da780e0504eb19c4f53ef1bd2ab8c223d9b3dd064427b159b97a54811d6242c3a3c3a61eb856d0e5708404f3366eced
+EBUILD nginx-1.19.10.ebuild 40227 BLAKE2B 48aa0810fa1514c379f8c0ef4436d5071a52a4bac04f716cfa31869dbcf3c2c1432e363487be03249d33aa0a5c80aa6236b6aa6f62ac768fdab0e99b1896dc89 SHA512 ac88f2cfb18b41e1606194dae2d6c9f78e37da2ed28c036a775f3b6d3a43bfac2307ad48267f9578baf37d05c5ac3db2bd5f9ed2e818dc16bc505b3faecfc84b
+EBUILD nginx-1.19.9.ebuild 40227 BLAKE2B 48aa0810fa1514c379f8c0ef4436d5071a52a4bac04f716cfa31869dbcf3c2c1432e363487be03249d33aa0a5c80aa6236b6aa6f62ac768fdab0e99b1896dc89 SHA512 ac88f2cfb18b41e1606194dae2d6c9f78e37da2ed28c036a775f3b6d3a43bfac2307ad48267f9578baf37d05c5ac3db2bd5f9ed2e818dc16bc505b3faecfc84b
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
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 )