gentoo resync : 04.05.2021

29 files changed, 58 insertions, 432 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e7b198e67d29..3006e88725f2 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 0ab5bf892063..0a3b3d35e332 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,12 +1,11 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
-AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7ab32b63b92220a70e7b1c2fb1776969aab1ec385546d6879786e6879e36bd26133a7d78ffca0c67cad75812a09a46ba SHA512 0ee34af486625e7a2a7ffd6e40e9ff24224d2785ea0ccba7402bcbbffedd3194526f38585b5d99f0492cca2edc3ed67234a4e6e6c5c73f1e68540d7ff8db4cef
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
-DIST gentoo-apache-2.4.46-r4-20201230.tar.bz2 25821 BLAKE2B 3f83b48aa36fa8b9adc75a2cbeaadddad8fb0d69d1602753e0a1978cd6136b1dbf15ad06a837f36c26244e3950bae3ecdfbcdd7668a4d2fc4f0d9f58a909e5b7 SHA512 cea71f3e40ac1409206d906df36c772d7985a79a9e713a3016a9fae67dad032e24ce124789089a4b92454bc98455a70c66515106c8f3c33e05aeaf3037ffabe8
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-EBUILD apache-2.4.46-r5.ebuild 8034 BLAKE2B 2122bc1b9ca03744b401d91c491c79970f1617268f84e24eb7e0454aa002c3b8242f79923e237322bf8dba61d468d2fd3822752a57523b0d2d668b4247118f75 SHA512 461598cb3338aff2af550dc0310821a8aa0cc0c30faaa5945d4847bb64c1b129249e7274b2696f756ad64b9cf82699e5810a82fad7ef44ece4cffcce541425eb
-EBUILD apache-2.4.46-r6.ebuild 8034 BLAKE2B e78751a46d26cfc1d71ea4959bcddafa74697285cdc5d79df8c0caf07c3c1f3eda0f5f8eb1942a645855ca42a497830d35f9e64502c6759340829fbf39e863ed SHA512 f755b461be53638aa2c07a04b4a7d2cf766ccea6c28e75756f6aa5a98f2ef601a8886a222d2edfca865ae376001c1b390e4d88adf115c883316584bef987e258
-EBUILD apache-2.4.46.ebuild 7781 BLAKE2B d0e70858edc5aaa5ced5732d0542d8759a2b453d904ad38ebee006e70b07a3f00f179d2038c29ba44c87f535a32ed43028122153cf9fcbb3195ae69a85137bf7 SHA512 a091f71aecb5875eaa55d0a01aa86fbebfd70da549cfac97918e4147ec428135e4fd37be6b20d161d376a88626322e093b7c0ce73fca3a1e8f3076bf6ba15053
+DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
+EBUILD apache-2.4.46-r6.ebuild 7970 BLAKE2B 4ee72658964c0e283b676b31a9b1aa593c6f469ef6f75d7d8cfcafc3fa7c43d4485fc9dd9075c4154fb76a84adb2bf753a84dbf470d74b9e405ca0cb61962be7 SHA512 770a785f3665e5b4d84b2bb931f853addaa8d49bd71b110d8c17bdc60aae7a28227177d4b3ebb8c9c84bce11899146b0519fa676754b763ff81741d525a7527f
+EBUILD apache-2.4.46.ebuild 7717 BLAKE2B 7a2c274d2763e0fd67612a7c8471f9142b76ac4bc3a1cf5ce1ac74556b75b355e949d0ce825a093c4d539f7dced7ae0fe36761622574893c711d86c0d3d64bb8 SHA512 50a3104db3454f6479ef5ee96da8001dfc742b048289bfc3f2eeeeb8bbca4df89dd4a0c2f3f71d592f4524fdd52787368e95f0ffd8ed8762f0741e2e7ab06262
+EBUILD apache-2.4.47.ebuild 7970 BLAKE2B 4ee72658964c0e283b676b31a9b1aa593c6f469ef6f75d7d8cfcafc3fa7c43d4485fc9dd9075c4154fb76a84adb2bf753a84dbf470d74b9e405ca0cb61962be7 SHA512 770a785f3665e5b4d84b2bb931f853addaa8d49bd71b110d8c17bdc60aae7a28227177d4b3ebb8c9c84bce11899146b0519fa676754b763ff81741d525a7527f
 MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/apache-2.4.46-r6.ebuild b/www-servers/apache/apache-2.4.46-r6.ebuild
index c4b85183a2b3..7343e87cea34 100644
--- a/www-servers/apache/apache-2.4.46-r6.ebuild
+++ b/www-servers/apache/apache-2.4.46-r6.ebuild
@@ -145,10 +145,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
 REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
-)
-
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index 1f2646bf81ed..95d53cb994df 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -138,10 +138,6 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
-)
-
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/apache/apache-2.4.46-r5.ebuild b/www-servers/apache/apache-2.4.47.ebuild
index f5c277b6c90e..7343e87cea34 100644
--- a/www-servers/apache/apache-2.4.46-r5.ebuild
+++ b/www-servers/apache/apache-2.4.47.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20201230"
+GENTOO_PATCHSTAMP="20210212"
 GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r4"
+GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="prefork"
@@ -145,10 +145,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
 REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
-)
-
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/apache/files/apache-2.4.41-libressl.patch b/www-servers/apache/files/apache-2.4.41-libressl.patch
deleted file mode 100644
index 86a1a7d02361..000000000000
--- a/www-servers/apache/files/apache-2.4.41-libressl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d446b977f28ec79fffc2d2b45c671e037b709f19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 28 Aug 2019 02:15:42 +0300
-Subject: [PATCH] mod_ssl: fix compilation with LibreSSL
-
-Upstream-Status: Submitted [https://github.com/apache/httpd/pull/64]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- modules/ssl/ssl_engine_init.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index f54c922fc7..646c903fea 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -1512,7 +1512,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s,
-     X509_STORE_CTX *sctx;
-     X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
-     /* For OpenSSL >=1.1.1, turn on client cert support which is
-      * otherwise turned off by default (by design).
-      * https://github.com/openssl/openssl/issues/6933 */
--- 
-2.23.0
-
diff --git a/www-servers/bozohttpd/Manifest b/www-servers/bozohttpd/Manifest
index 68ef824944a3..4ffc4b994eeb 100644
--- a/www-servers/bozohttpd/Manifest
+++ b/www-servers/bozohttpd/Manifest
@@ -1,5 +1,5 @@
 AUX bozohttpd.conffile 218 BLAKE2B 1f7cf56429b11a35b8a3ccc809cf781c1bfd76ec638e720387382cd2532ad2f82086136b919f11d60c42126c1f1fbcfcec2a341ae7ca08c8d7185aa1843ccf65 SHA512 fbc819db45d9ded83a14cc2088c5446c1a56509e2ed4a80a3bd1bb398d32130c1366ac1aad4152527665e9c8f9d097427160a9bfe703922e73a713abf7020f29
 AUX bozohttpd.initscript 942 BLAKE2B bf53e3004179bb55c0fe6201167a0aec9f186a59c823597620058e584412e208fcda499fb011393e37238655a5bdce4adec0ed5eb20410a18cebabe4f2efb592 SHA512 7ea3a704fcc1b5b9ea8c2d66fba6b2f273b77efa97d0222578d82d653d4c0c7d926d9fabf5dd3e14b80cc3e79674290acb0116e68a3b044a91c4d12115c9b365
 DIST bozohttpd-20190228.tar.bz2 59460 BLAKE2B bfd5f16f997903ce8c1b708c5d50955779545bbfee7525966ff0f3475114841ce8feac800d945782548474dc866c032876cb50afaa93cc164c7cdf4b5eeeb555 SHA512 8658695ad9248c9c013362d040981df5d18366e1ad0a6b80707841f93fe576c54631ff3810cc08062b1b28fb07884464bfc27fb71c37831446b2de67a6254f09
-EBUILD bozohttpd-20190228.ebuild 760 BLAKE2B 76f212adb1f52546396c1933df68f01f61b9435db8619b522dce348a9fe85b6f12cca8a033e72d2dbbf5529ae93b32665759940e1d976969f0c90ad700f51477 SHA512 aac24a2e4d1f0ebac0de2873a07c5fec20ae5a7f194014387511f8f668de732695d2c79e0a7eac885f63f238ca3f073a57954014cc825913b07e677515d31886
+EBUILD bozohttpd-20190228.ebuild 694 BLAKE2B 32ac8132880d78f14a9a1fe071ad393fe272788894b9a8f83eac8064c88ddc689a999b27264d438d0636023c2519e90794032fb7b264d2d078dbe9c75936e306 SHA512 0b812bd1bb9e9dcc8a1eea6ceeaf096b5cdb49b5b5ffa3d5e009d698812c9f332a3e701ec0d5c7c73ca20d12d2139ceb776f9d0af9c6e8e3c42a507bdf79f081
 MISC metadata.xml 312 BLAKE2B f77dfdd970ef0e921ce72aec618bbedcf217bc9e85aee7f99a1cd2d43f351dc4049e6664339a49c21c471651d747633bfd19be94a9d35b04ef7907e1c3176abc SHA512 9970b0a12f1e68b7f0babffef064357434c7c3e37c1e92d8b336d70ef8f8940b8cc73d68bb0b338a13e6613cf086c5f2e06f119f6feae067cc31b91cd743e41f
diff --git a/www-servers/bozohttpd/bozohttpd-20190228.ebuild b/www-servers/bozohttpd/bozohttpd-20190228.ebuild
index 483262bc9dc0..a95a11e85e56 100644
--- a/www-servers/bozohttpd/bozohttpd-20190228.ebuild
+++ b/www-servers/bozohttpd/bozohttpd-20190228.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,8 @@ SRC_URI="http://www.eterna.com.au/bozohttpd/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libressl"
 
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
+DEPEND="dev-libs/openssl:0="
 RDEPEND="${DEPEND}
 	virtual/logger"
 
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 70ad16272b2a..444ea9622e21 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -3,5 +3,5 @@ AUX gatling-0.15-ar.patch 754 BLAKE2B 08ebd3714234ced36751d0ddcb0d3391aa8cbc0f91
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
 DIST gatling-0.16.tar.xz 126844 BLAKE2B 33dd2e93833b216ffadae4dbd5650af87b23ed5d62caf181d8005acb4dce889b86d1afb711676377ba2b7c4fe08b8f2350a32965cf6292a268281b28c4310c27 SHA512 9446ea0ae862509b1a892e5bdef14d3a2320c3c3e846362b4679c0834aa906ab5b16ef54e4a7c8e7ee839d30317436dd411e891e3105035a9ee31b0facc0b8c1
-EBUILD gatling-0.16-r1.ebuild 1253 BLAKE2B d6e82218be3c9aafb02d926b371bf81e345bb7a1c1d67f13a880aa1fa7aa4650c6f785fa105e2ff5215c44bda9224f3540b7d471cf9bdded7dd4312a2941766c SHA512 68c8202f04bf618d3893e299ced29e097ebfff41f360e389d7690ae87128db22c36358b72557d9cf3e3fe34d51c5cb44dd1034b5a50c6e1827e03aa36fc26ab9
+EBUILD gatling-0.16-r1.ebuild 1195 BLAKE2B 86cd7ccb52de31251021b2008c05fef9efb22d54f16783a96e9efa7c7e560a25470115d97eb4f45c08bfdeb255c3be9dc8f108c921903c456dda54f03e638d33 SHA512 84bcba8b516aa0dc5a0e654c8903e51fe946c1389720d718881927d4532a58b54d63170ec015dfec562951835830327d0963a5595236b8640c991fd86c3a7ef9
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/gatling-0.16-r1.ebuild b/www-servers/gatling/gatling-0.16-r1.ebuild
index 25265f0c79e5..ba75a8d4e970 100644
--- a/www-servers/gatling/gatling-0.16-r1.ebuild
+++ b/www-servers/gatling/gatling-0.16-r1.ebuild
@@ -12,14 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="libressl ssl diet"
+IUSE="ssl diet"
 REQUIRED_USE="ssl? ( !diet )"
 
 DEPEND=">=dev-libs/libowfat-0.32-r2[diet=]
 	diet? ( dev-libs/dietlibc )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0
 	)"
 RDEPEND="${DEPEND}
 	acct-group/gatling
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index e1c4550dba05..e4affd5a1f94 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,4 +1,3 @@
-AUX h2o-2.2-libressl-2.7.patch 808 BLAKE2B 02873b20cbd306329c75580d0a077b35f85baec9160c650555bcab725151e5109f8db8fa212636c551dc91dbda72b34e82274a86d7c9c5ebd304c4c898b82466 SHA512 578bfdbf8708c65c56bb0e00a0b95a98bd4af722a6913eac52db35f102bc1bb9c6b135d302864614b89ebee751604c2dfe2ad2de95e4618ffbde7bcfa323e307
 AUX h2o-2.2-mruby.patch 2034 BLAKE2B 78ab2c8080c017ae03b33366aed553e8d47581bc04b274adc7a7e18bc79ddb5a95266ce13824a8286d9b52d4432b0895598301bd07aa42b1d7e4cbb4d46d98a9 SHA512 724186190756292ce9589a5aae28fd9ae089e377beccb1a2a6562d3d764777dec820413f31d820f61691a529dbdac0dcb55b2e395e46629b2656496bea9c182a
 AUX h2o-2.3-mruby.patch 2726 BLAKE2B 686cfbf806093b579b0641cfb887d7a6835ac2a3ed058d8d3a35d6e41219ab53c8484ad63ea6b2b00957ba5553d8f47318a93c6a2c56ab63895a750cf50b2323 SHA512 077f54f4e4435c64dfe7ba470d1ab42ac4a3cb1411af397e40f57253a0a3732bc7ae5a6f2023d58e15bd2a130a71142d940ffe5a356360d723cf777bdf8dfb9f
 AUX h2o.conf 350 BLAKE2B 948c90451fd76cb55f3b42eaa9ddc01564b2bd2c46437649fb639d6cee89c5adfac780e533c13793133e6798d847c1c87c631979162af9a1b7c5caebb8963b3b SHA512 b2ba08c3bcd15c3c7631913dc64006870487773f952421aec624f82dcbe836137a2b8357cbd0b8e26626f9c6f108c8aee46beb61e8649fe78fac0e31ef585b6e
@@ -6,6 +5,6 @@ AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88
 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd
 AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
-EBUILD h2o-2.2.6.ebuild 2326 BLAKE2B c7f2e0754891a11e71ccf2fa642f2884b6a2b6d3f9e3d97f1dd9d43510c15133ae2c34333276763992be91f173eb8063686fbb7fd2eba2938aed029543c60e14 SHA512 d7a6334821963079ebd42c1ca9ff6ef8a3a04901aedd371ab97cbf1935caf37644a4e8ae5e946b3e27a3aa55a26a050b173e77fc942f3c0f6d5ab89f687f29b6
-EBUILD h2o-9999.ebuild 2252 BLAKE2B df13f53c813bf975ba667477823ae6a6c10f7e3a8065c1e2220e06e1740c6176027b12000ed0e7f51a45cb5b81d097d74dc290c0d575bd8e2fc7f1b83a345fc6 SHA512 eba716e1274e51556da2ca64e8df549b35991546734b0cd619a52b4010f5ae4da5fb1c1de95c11fff6618fa55e4bb6427b1992d53d494b4b13774b030049b86c
+EBUILD h2o-2.2.6.ebuild 2224 BLAKE2B fd17796b921cbe3d7661d472994beb73986a20601f5e8340e79aeb05bcb3e206e45f120c2fc0ef7a27ee9b8fa3aa3dc62767cd2c0206d93dc5e0a2bc6a0cf5e2 SHA512 cf53a31af03f929ebaf1636fba907e099e7ce2611ddd1095f17cd18f5f8e45a3fa58ecedd42fca031e87f0477866eac0ed2271748f5f71938191c718e996d9c7
+EBUILD h2o-9999.ebuild 2193 BLAKE2B 28f0e00c529caf8c7902e53d8a1d05d99f86c390f25b23da149049c3c09bc09a5f7b72b58bd46d27a1ec9cd30f016a09374b155d8b23aec8fe9fb218f50ab244 SHA512 34be235676dbde6a78d1be49b2d34b44d72faa85d62f3d5bcb35bf64d1992f442b8b1689aafa0197655acbdbd363b98edf6cd23145197eaf1dfb6e5b72ef5e35
 MISC metadata.xml 664 BLAKE2B 8b54065efeaf5a0506a1a2a3c0b6cfd803812c25b27fba925c5bc88c5cf5062eb7b56a6240f8461d6874f9aeff7f42c3b8b6d80561714106405ee4c7d5cc266b SHA512 171a99429df373753f72898d7b51399738e0c4b792aadec4a74ec0ca64d1651ee2947878db455bb48587b02165d6ec440a14e1c0a567c2e002e2805585086415
diff --git a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch b/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
deleted file mode 100644
index 02942b49227f..000000000000
--- a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From db50d885a87985310e65159a705b45de8646dc26 Mon Sep 17 00:00:00 2001
-From: AIZAWA Hina <hina@bouhime.com>
-Date: Fri, 23 Mar 2018 22:50:51 +0900
-Subject: [PATCH] Add supporting LibreSSL 2.7
-
-Signed-off-by: AIZAWA Hina <hina@bouhime.com>
----
- deps/neverbleed/neverbleed.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/neverbleed/neverbleed.c b/deps/neverbleed/neverbleed.c
-index 29b35a9..42356a6 100644
---- a/deps/neverbleed/neverbleed.c
-+++ b/deps/neverbleed/neverbleed.c
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
-     return 0;
- }
- 
--#if !OPENSSL_1_1_API
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index 45fd96ae7e29..41caa3e517e4 100644
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libh2o libressl +mruby"
+IUSE="libh2o +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
@@ -37,7 +37,6 @@ RDEPEND+="
 	!sci-libs/libh2o"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
 	"${FILESDIR}"/${PN}-2.2-mruby.patch
 )
 
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index e9dd787568e0..24da7a201180 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,13 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="libh2o libressl +mruby"
+IUSE="libh2o +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 89d2e8216ab0..44976f46f1b0 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -9,6 +9,6 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
 DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4
-EBUILD lighttpd-1.4.55-r100.ebuild 6978 BLAKE2B 349d99b2b1422cfb962124b02013b2af9f151442bc1da262e24c83855c4aa028d9701731a37be2fd9f66b4f45cfd226abfd34ad470b3d856c3e264a353a46550 SHA512 3cdbf07a0b2ca79283dd35db0b14029fc99b44ffaa9967412fb5c0021a5bcb2f77d653084961386553ba82bec1df5b680bb6b372d6ad556d067a4c376c642cd2
+EBUILD lighttpd-1.4.55-r100.ebuild 6908 BLAKE2B dd074fc1613f34eed2dbfcc4d7ab21a16b001f85d1abc24e08fa16468580e54e9773ef214242bb66b37280a754196701f514f43cc79bd7ff452524fcb0fed23c SHA512 c7e4ca53154f45139aad707815cfc207d0cce1fe9e7f838b675d4aa0f3e976c6d7e437656805b56adb744d3df96313dc1ce19f02edc6da41541e6d3bd1f5158a
 EBUILD lighttpd-1.4.58.ebuild 7525 BLAKE2B 0db0ce65e51ce0d51ab7288a5e6d5331156b7c168da6bf3c5729b14aedece35366526c48094c0713d8d130d661d0126bfc84f3ebf7066a85aa92c377771240cc SHA512 2eba45931fd8262191c4ceb264beb27bd3a34146f32ca9392cd24697f478a23e1f203395fd605e3bbfda1c8c50990f10383e320ec62d96f6ccaba9d90dff6502
 MISC metadata.xml 1718 BLAKE2B 40b67e4fc9a9fad8cb7008b32e24a1d57149ecc78514ec3dbcb9d3df4cd865283c8a6685acf6037bfeb04b0f3b189a32fee0e0cf98955d99525bb4a5b417fb0d SHA512 442d7ee6fc749d065c01f2e6f798465ab001a504d1104726322d5fd539114301cef2562b4721df9d40305f547b81d28fdaa8d3abeb327c045065e1a7a3820616
diff --git a/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild b/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild
index ccd168dd6046..a5923f383e75 100644
--- a/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild
@@ -14,10 +14,10 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="kerberos? ( ssl !libressl )
+REQUIRED_USE="kerberos? ( ssl )
 	lua? ( ${LUA_REQUIRED_USE} )
 	webdav? ( sqlite )"
 
@@ -41,8 +41,7 @@ COMMON_DEPEND="
 	rrdtool?  ( net-analyzer/rrdtool )
 	sasl?     ( dev-libs/cyrus-sasl )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.7:0=
 	)
 	sqlite?	( dev-db/sqlite:3 )
 	webdav? (
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 )
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index a9cbe07b4dcb..30b85628d047 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1,5 +1,5 @@
 AUX pound-2.2.cfg 906 BLAKE2B 82d6562a64099e11531340853ca49e347eea5b4c2c4b6c93dff89d30725d84045cf24c8add4454375713f2fbd511a581346ebd85dfcd938e64daf1cdf91b7220 SHA512 9471e5abe3e0ee83165ed01a7081a4d14075c6c21b9f9d7c3fb239aa78c38eae74394a7c7e7e7753d218a7ce5cae388823570d19b702a829baa93e949a8946b8
 AUX pound.init-1.9 495 BLAKE2B 9489ff9c18d6524dfb5b3b9af1f67898ac32b5e8ff2432b430dd91ea02f37d0e8c3447e0788e781438a93fbb0420d9d079bf7f68d36b092d4c0be56f0f19b853 SHA512 fab1936ce907bdb5b215eada2c05025bd4dd158d0dfb0cdeb9f32ec4284bcdc75625ed7933913d080c3c26edbd8dcbbd197a729fa9c130fbff12d7bfdfd8d41f
 DIST Pound-2.7f.tgz 186719 BLAKE2B 39a31b43c5945db1b5ad008e2f43d3026728ea5bdc3de0fa8c0b68a743d0bea4b86dd61a527ea140e6b0546732f0c66c863e78131432af32ab5b0874a7c1f705 SHA512 292f4f7b4363365829f204b687080eae9e17b9a67ae7eb6021eb5a028321191d97abd9633d5664db5ebca6467795f73a787be4a0bd29360d737865930ff81830
-EBUILD pound-2.7f-r1.ebuild 1278 BLAKE2B 70762f8c6cb41a322898fbc64076a4f735595d80a10140f73f9efff0addf49175fbf00a299bec076748ee1bff12471fb41d4e930fba9c1dcad56bfda989fac12 SHA512 8b053fe3105ebbe0b846a8dd1beed12216017dc33b3a8f8f1e68e13d74246dc69e1a3add52d7df7cb4308548fc25e3b5e4af686e7805ac85e7f6d386bf808d51
+EBUILD pound-2.7f-r1.ebuild 1212 BLAKE2B 1e1e6d2feb7eafa6564dddf435e6fc54b0dfc2df394d6e8ec2028689e3246b28070280edd165f89a1d66c8338da2027605623bef2b702676b11b45bf4c03fe64 SHA512 7c547c436b4ec84601dc0fa2adff3d34323429a98b7e7bd4606abf695fb3655e720f4c0ded6ade2820b5d056f49534334407c5f3e4801f23caa55c79f8293b97
 MISC metadata.xml 658 BLAKE2B 877fb06accfc516463028171c8d676d8e986eea0e5ff797202e82c47a54c4071d76d09d9254a465a14e40f2ed6845494435914fc7d07ece3168242f9a671c732 SHA512 b612e71ab896e042b83bd9a54478cf6f7467b46aa69ab281455cf5088529209299c332c2c8b2fffa8255c349460d9c78176dca484d8a739658b70f06a7697507
diff --git a/www-servers/pound/pound-2.7f-r1.ebuild b/www-servers/pound/pound-2.7f-r1.ebuild
index e87f5a3e4cc2..2054ebbc149e 100644
--- a/www-servers/pound/pound-2.7f-r1.ebuild
+++ b/www-servers/pound/pound-2.7f-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,10 @@ SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
-IUSE="libressl"
 
 DEPEND="dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )"
+	dev-libs/openssl:0
+"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index 3bca30a799c0..cf47dfb1ffde 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,3 +1,3 @@
 DIST pshs-0.4.1.tar.gz 11758 BLAKE2B b3f9422c8ebd47d3de9993b93ea0438232f3ba037d7433b08875a131f449fab880a205bb62616a057328b7d6fe9c00277fbb2e886a1494d2234ab684b0a1e90f SHA512 7ecd0e5019e9778b5f2eff31b8e2f481972cf6da66e4493cff850aa1ec13a4df46e46782799ab25cecd1cc36122f797c6ae0ac2863ea604477784a79191a62d6
-EBUILD pshs-0.4.1.ebuild 863 BLAKE2B 83e30ed6d9c92ce635d5ae580acb4c1474648e1481eabaed62cd079a2543c4a8568cb30a6b9ab7453f5f9df52387898877b9991d8df2cd0914a01b8216316a52 SHA512 937bd47e1fc0e39c1c0552bf8aa86771cffe8f8bdea4ddb4d78063f2f5a6735481b1adb44cfff472622b7c7887f6b717a7ca5f6c5918600ab011d6ab861cb9b4
+EBUILD pshs-0.4.1.ebuild 803 BLAKE2B 40b6798d0895869a10f36b36e7ecb6c9ee4b35c66cf0760755a6ae509daa42101cdb5ff12e269884a6dfa481906aef15f872b0cde5d33ec1f5156a7db0eb2377 SHA512 8f7669f13b79d642172a3f16b34807fd2284d7ba8d9724668f57cdd9f5b866b583de6aabe1e8ac4d2743e636a57f22db9c88321717665542357e72905d619d79
 MISC metadata.xml 698 BLAKE2B b2b93502d6c8751d60cf2cbf5daf2e78fc5301f1a3cbe5755ac11e9bc8dabbac642cfa87b81025488e7b41e18bdd6f6c356e09f612d8e3738ba55ac34d7514ed SHA512 bbedebc60e8a6e9750a80cf6f44fb35d791ef60c76bb1bac683b3f5240f1daac9951525149ff04ba48cf96ffed2f6fb913e5fca6249acfbe7bad0777866952b0
diff --git a/www-servers/pshs/pshs-0.4.1.ebuild b/www-servers/pshs/pshs-0.4.1.ebuild
index 1d7ddf7a5956..55ef2adeb61a 100644
--- a/www-servers/pshs/pshs-0.4.1.ebuild
+++ b/www-servers/pshs/pshs-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,14 +13,13 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libressl +magic qrcode ssl upnp"
+IUSE="+magic qrcode ssl upnp"
 
 RDEPEND=">=dev-libs/libevent-2:0=
 	magic? ( sys-apps/file:0= )
 	qrcode? ( media-gfx/qrencode:0= )
 	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 	upnp? ( net-libs/miniupnpc:0= )"
 DEPEND="${RDEPEND}"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 98f3aa1243cf..0d392f4f2c75 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,4 +1,3 @@
-AUX tomcat-10.0.2-build.xml.patch 11108 BLAKE2B 9c8db2ed4008def42bcfdcfd99fbaf01df0725738b92245e9138b08dfbead625959afc5f3dbef0cb28e322076efc34a22b751ffe1cf3b8a99db4a507651c6362 SHA512 ed2fbacd4cda8e582dc316e9ff3f14686eb68b5851c2c2a0c3ce779c5394af5161fa40b821bd4fd10e1295ff13ae3adcc03d2f0d42604efe19b57790af648ba8
 AUX tomcat-10.0.4-build.xml.patch 11459 BLAKE2B 841a96b09280a8790cf5bff7718219027abf793d3bf2f93c72086ca709102775995d06a4eeadcfab297742f6c0e74ac74736407606074cf6106b5948a8359ace SHA512 54e0c3ad71afa28b14c1644438daa0df0d2e6b95b55fd83d8776b30bb6ed3f8735bc18d5a8d9da6c56323c297245a34c441e126e7d1e1d2deeb331c8c382ba30
 AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
 AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601
diff --git a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
deleted file mode 100644
index 0ed246822913..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 455edf9..457c0a9 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1032,6 +1032,7 @@
-       addOSGi="true" />
- 
-     <!-- Servlet Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -1039,21 +1040,23 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license"
-       addOSGi="true" />
--
-+-->
-     <!-- EL Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
-       addOSGi="true" />
--
-+-->
-     <!-- JSP Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-       addOSGi="true" />
--
-+-->
-     <!-- WebSocket API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-@@ -1166,10 +1169,10 @@
-       addOSGi="true" />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
--    <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-dbcp"
--      addOSGi="true" />
-+      addOSGi="true" /> -->
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1397,9 +1400,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1459,7 +1462,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1502,7 +1505,7 @@
- 
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1517,7 +1520,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1620,9 +1623,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2196,11 +2201,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2231,6 +2237,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+<!--
-     <javadoc packagenames="jakarta.servlet.*"
-       excludepackagenames="jakarta.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -2295,6 +2302,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="jakarta.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2357,13 +2365,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${osgi-annotations.jar}"/>
-       </classpath>
-       <link href="../annotationapi"/>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="../jaspicapi"/>
-+<!--
-       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
-       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
-       <packageset dir="${tomcat.dist}/src/java/">
-         <include name="org/**"/>
-         <exclude name="org/apache/el/parser/**"/>
-@@ -3083,7 +3095,7 @@ skip.installer property in build.properties" />
- 
-   <target name="download-compile"
-           description="Download components necessary to compile"
--          depends="setup-bnd">
-+          depends="setup-bnd" unless="noget">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -3127,7 +3139,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -3205,7 +3217,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3260,13 +3272,13 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
-@@ -3388,7 +3400,7 @@ skip.installer property in build.properties" />
-     </sequential>
-   </macrodef>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3405,7 +3417,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3430,7 +3442,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3446,7 +3458,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3485,7 +3497,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3513,7 +3525,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -3524,7 +3536,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3553,7 +3565,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
- 
-   <target name="ide-intellij"
-           depends="download-compile, download-test-compile"
--          description="Creates project directory .idea for IntelliJ IDEA">
-+          description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
- 
-     <copy todir="${tomcat.home}/.idea">
-       <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index ca4aa55a42e3..5f6ac432d264 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,6 +2,6 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
-EBUILD uwsgi-2.0.19.1-r100.ebuild 11568 BLAKE2B 4b4a86432176b09fd3b5d14cfdaae3f1ca7481bbf672522ce5b6abb93aecb0ef17ebda2cb403cbd19a662f0789101fe01870dce7bfa90b597865c4ff0f4bac05 SHA512 50373394197ab84a527be0934b3994578463845cb8198f5ed57f60f220933ac17858a154ecb044f72cd4c60e2561f34cd1182ee77234b81aa1756a453ddbf545
-EBUILD uwsgi-2.0.19.1-r101.ebuild 11573 BLAKE2B 575f6be4e72ddda8ca88394391a81abd69e6ad940915e4565c3c3facce7f8a798ce060edf753aff9d9bf687e18359857f31f6643889ab0df5a040111670b5cd6 SHA512 416eee7a749abd5e9663a79646d77af26cf689f65e547a876507d521a1f7b236eb0858df9b044e6eff6888d44854b051b94dec9ae7c2c93cf4aaa581f28c5199
+EBUILD uwsgi-2.0.19.1-r100.ebuild 11507 BLAKE2B 20cbadf8cf896cab2f925fe2623d6bd95e7d28b2fdacc48f3aa8313b53dd0a40edfc533bc0d611c5338ffcf06c60cb7d8f6eafe37a8d5e4abf0e499c95d947c9 SHA512 9be90e49244c22086acd8e9a205efb2a4d5f51b0e22f57b27194dac8f7f039a69473fa7371454076fddbc51da576288378dd5c5454297a8fe4e23b27f84a1a93
+EBUILD uwsgi-2.0.19.1-r101.ebuild 11512 BLAKE2B e7ec6f725dce1d704c981143b661f0efba8c8e6d6e8502f3a432ce3ea8b5ad93f50c69e49c49dfadaf7aa979b517bb6dd493123db2dc27b7703e9915259bb581 SHA512 c14f201d81e5e47b22e0f7fc36203fffe5f8c8d79ef6d37beb1d9b7274ebcf911d7de980d305fa079c1a5dd7d04edee2035e3ad772be1b2aec7bcf21ddb9fa09
 MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild
index e9cbeaa8d757..43900ea36303 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r100.ebuild
@@ -55,7 +55,7 @@ LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
 # *java*: TODO
 # v8: TODO
 # matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
 
 for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
 for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
@@ -88,10 +88,7 @@ CDEPEND="
 		yajl? ( dev-libs/yajl )
 	)
 	pcre? ( dev-libs/libpcre:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	xml? (
 		!expat? ( dev-libs/libxml2 )
 		expat? ( dev-libs/expat )
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild
index 72a449c8448f..dd1318cdc24e 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r101.ebuild
@@ -55,7 +55,7 @@ LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
 # *java*: TODO
 # v8: TODO
 # matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
 
 for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
 for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
@@ -88,10 +88,7 @@ CDEPEND="
 		yajl? ( dev-libs/yajl )
 	)
 	pcre? ( dev-libs/libpcre:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	xml? (
 		!expat? ( dev-libs/libxml2 )
 		expat? ( dev-libs/expat )