gentoo resync : 04.05.2021

18 files changed, 400 insertions, 52 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 985b97b5598e..df70d443fe42 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 77cd19868f33..f70bdfd66156 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,18 +8,22 @@ DIST haproxy-2.0.21.tar.gz 2696549 BLAKE2B 97f211a768006370d85c0b2bda539440ac260
 DIST haproxy-2.0.22.tar.gz 2698262 BLAKE2B 417bc6bdfad276d210d597896f0685637034593a2418b0fcf984e62b767a491000a1f62f58b5ccc8f552890de14607737bc81bdf4736b6e4212ac15081ef5689 SHA512 29a1ee6d77892003ab4d813336d1ea165d91784bcf2124b98ca030e376e7ccc1c1b9f09e9a85ef0cd04f9808b589bfc7b7c19f831dcb55bb41d7777a172112ff
 DIST haproxy-2.2.12.tar.gz 2913160 BLAKE2B 0a9bc637e2d70a23ca33f3711569c0a3dbd0922f332cffc024ba523271bf8086871595a9cd9636d2ce71811f6f8c8190d1d58179458f2cf1d64562f826392471 SHA512 fc4d8725d85aaecc8cacd9177a81dea1b09d5b000ff27bb5217847779e89d67cabd35db6175acc898b674dc1c5aadfa20b015d54095a5ea2f2176444c858d90d
 DIST haproxy-2.2.13.tar.gz 2921533 BLAKE2B 870f105ab8dd6697944959b7422804b58379fb26540ecb6a396c016bdbd3f6ca44f20bcc67e6ce71a6a4b09104985dd4540c840cdf3045131bdaf9c5a56cba14 SHA512 33f0821b49e5916621d06cd524e25011072bfd0a9ed2db95a53c2d26f51ac484866fedbc54f2214b250f502297063926e6c5f6f4dee8aa77cde24098835c213d
+DIST haproxy-2.2.14.tar.gz 2923727 BLAKE2B 6a234490247b5b0d8bf9131683deaa7b7fd4468aceaeec9c4ff401315a6be6237b5eae25a74330ffc2438de54f0e91938e8830fa8f17d6366286f6880be4af34 SHA512 ec5e2bf0c38a9af878f69f062e81e096b849c3ae93957bbcddc32f7c0e972d678136c8f06a16e594b60b7e2f41228e8179e93b4b0a3478ab775bece6745db877
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
+DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8b5b534665619703d42c9163afcd2b19768d408b27484ad73061e10b54b4bb512f09444944c403a30431814e8f8a SHA512 595a62d677240cb8a463245e5d5d497bb584a379852e533d82e45a77e1b91b469f84e386adcd42b6ec24e5806e256fc2708f672a0da5c1c4f784e3b76a9e7318
 DIST haproxy-2.3.9.tar.gz 2928660 BLAKE2B 48b56aa72d50d4783bf54c6dbf642388d6f12d4e2ede09e86e9262d62a981177365dc2d2999e76c2be124c0576fe0b8d16a7a5bf412133fcbf87d45d8abfe3dd SHA512 49ee2a9be8dc7836e73be8e01ccbde52e29522f94d0bc80cf753fe76f4b32657fb123df7d443228afef36928f5a6cef67b693f05008a891001082b4264f015f6
-EBUILD haproxy-1.8.29.ebuild 4862 BLAKE2B a2274b5d45ed0d5d1ce3ae0150e1ffdeeffb09204486f3f3784b35798852976078f4b15b6a0c78dc2213bfb12979c71e1ef509dc7df91b57ce36bac981d6da91 SHA512 616b59595cdfe4143d44209597f50fcf147b389b8c776904a1ea04be29f1708c1940c1d9a4aee254b5108d2311f4be0328b749c40a8b9753a8a5743eeb597c6a
-EBUILD haproxy-1.8.30.ebuild 4862 BLAKE2B a2274b5d45ed0d5d1ce3ae0150e1ffdeeffb09204486f3f3784b35798852976078f4b15b6a0c78dc2213bfb12979c71e1ef509dc7df91b57ce36bac981d6da91 SHA512 616b59595cdfe4143d44209597f50fcf147b389b8c776904a1ea04be29f1708c1940c1d9a4aee254b5108d2311f4be0328b749c40a8b9753a8a5743eeb597c6a
-EBUILD haproxy-2.0.14-r2.ebuild 5399 BLAKE2B 6c36cb252b70d331721710d4b1793f9743ef7fc5277135a98fadba63e8565e48ffb0758a45b560db1d0d968f09a77ba082209ac3042cc285b04a22a16921f284 SHA512 7f12d55a8bdf745f2c30756d791cd23d90ac18b2b74c9f991a790ba9cb17b5c851bd12780b213c9110902a708cac8471d2ecc37176838beef5d424be2bf3b53b
-EBUILD haproxy-2.0.21.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
-EBUILD haproxy-2.0.22.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
-EBUILD haproxy-2.0.9999.ebuild 5280 BLAKE2B edccb304b97a9b1378d0078d7a18216610b4e4d67688325789b148ca919b5c8ddc50a29a572b7d641cf54f181ca8df912b522b5f94565d145e873ede1772697b SHA512 a4333f26aaed3a106c9e0660f0c343c14a4a09197deea9f66a689f694076bcba8cbc3eb4cbe63caaf3f316bc9484e2c558ab632b7740c0f2ca0638382a6f61a2
-EBUILD haproxy-2.2.12.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
-EBUILD haproxy-2.2.13.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
-EBUILD haproxy-2.2.5-r1.ebuild 5458 BLAKE2B b1715fc4d3354a6392cb45c280cffd579e0b7ace6fa05268fda65e7f11ed0bed9af8bac7fb550f548348de19d42553001b62c0c397004c50070cdac2d04c2dac SHA512 42a82233ff3c1b55883df477af5d5ead89de1739fe3bb006ebe994be4d158b833ab221b6936cf7850359b7f5e3cb62802f8053f416fb157e82708b947eb38aa3
-EBUILD haproxy-2.2.9999.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
-EBUILD haproxy-2.3.9.ebuild 5311 BLAKE2B 41b862242ce5575c77c7cdd71c93569ab57859027cdf8330dd751265b9d1d79f8b25a8bbccdf8bdfd4cd9f75b23c4ae572de64e6919b87da4576945e23c1292a SHA512 6be03b0872a2b3abee3fdc54cc7dfa0b6bd3401ccb7d599efdd6e1736808f29d9c8193026ee4956a9472f2f6a045ffba8e9fa42d0fcfff8d183ef6f96d1e8095
-EBUILD haproxy-2.3.9999.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
+EBUILD haproxy-1.8.29.ebuild 4801 BLAKE2B b8e35cc672d3baa46ac81934fe6fca6e0c103f4d76c5353d9d563b74da87aa00bd71848716ed4296972d3c45d5e0a6b745a7df3990cee9c4e34cba21334a73c1 SHA512 798ef5b92290651e20ee5b8f6d76c84930d629926b320ee261be04b906d7db959b005a59e719d8c7739b57edd4c5a6342ee2c260ef5a950508dab9d7f96a8b95
+EBUILD haproxy-1.8.30.ebuild 4801 BLAKE2B b8e35cc672d3baa46ac81934fe6fca6e0c103f4d76c5353d9d563b74da87aa00bd71848716ed4296972d3c45d5e0a6b745a7df3990cee9c4e34cba21334a73c1 SHA512 798ef5b92290651e20ee5b8f6d76c84930d629926b320ee261be04b906d7db959b005a59e719d8c7739b57edd4c5a6342ee2c260ef5a950508dab9d7f96a8b95
+EBUILD haproxy-2.0.14-r2.ebuild 5338 BLAKE2B 3660a27183936423478dfadd77f5b592f7bd52a5fe07dcea642151f3af732c2f51eb16375aa811a3b300e37549ed0270ccbffe514987dba9492b5d9e421afead SHA512 e655fff56e642bf7b172654c9905b56ecc4f50b71412038ec4b5224dc62f80e0f416a777abd9abe54c7f73f929f569b0771b1658aab647c4044696615d86e639
+EBUILD haproxy-2.0.21.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
+EBUILD haproxy-2.0.22.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
+EBUILD haproxy-2.0.9999.ebuild 5219 BLAKE2B 230b14695597e0fd350fcc223e25a67710316b463bd27e49f2551c83509aa51799875bf5bff0671fe092db8cb31bb00b4501b684e3ed9b9cdb24ba5ae99306e8 SHA512 c3bbd688c7c3aaf92a0418b23fb802d1252994bfd07f18cc0eb8edbb7fd39ec3cb8eb56ed19aaccdd36ca8d4d79cab7e5958dbe063deecee0b1121941941e333
+EBUILD haproxy-2.2.12.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
+EBUILD haproxy-2.2.13.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
+EBUILD haproxy-2.2.14.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
+EBUILD haproxy-2.2.5-r1.ebuild 5397 BLAKE2B a5e538af8dfd42bc86753e6e30decd34fced36bf23eff3bdc1eb3b28c6c6b646941bce14b77f8e1d153bbec64a62b4863e1003a59d7b85c9058add57b6d61fdf SHA512 97e657df4a400672cd4447ee266aa30e1a121e59f8f7bee0886e74f703339eef0d05b89e5a40bd989f51b6496355a67c6e3227e4c573c720d328dc82d7e37819
+EBUILD haproxy-2.2.9999.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
+EBUILD haproxy-2.3.10.ebuild 5250 BLAKE2B bced61c6fff7d187f486a5fe05b1a376dc98d42123a7cedc5ea748be46d0cafac8561baae81e3f7fd00cdab86e7354051657fb560432fc2ed817f23e5a90aee3 SHA512 ce4b33fb66c6c7584fbbfccebe9d0583c4ec684d0e14eb866130cee02848e3b3a50cd95a2514266e719914e1b3ee315410f55d348fa3b78a616b048791575c16
+EBUILD haproxy-2.3.9.ebuild 5250 BLAKE2B bced61c6fff7d187f486a5fe05b1a376dc98d42123a7cedc5ea748be46d0cafac8561baae81e3f7fd00cdab86e7354051657fb560432fc2ed817f23e5a90aee3 SHA512 ce4b33fb66c6c7584fbbfccebe9d0583c4ec684d0e14eb866130cee02848e3b3a50cd95a2514266e719914e1b3ee315410f55d348fa3b78a616b048791575c16
+EBUILD haproxy-2.3.9999.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild b/net-proxy/haproxy/haproxy-1.8.29.ebuild
index 861e6ae7a252..6b6c80be510f 100644
--- a/net-proxy/haproxy/haproxy-1.8.29.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.29.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+IUSE="+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
 systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-1.8.30.ebuild b/net-proxy/haproxy/haproxy-1.8.30.ebuild
index 861e6ae7a252..6b6c80be510f 100644
--- a/net-proxy/haproxy/haproxy-1.8.30.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+IUSE="+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
 systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
index bffd36a3ab43..59e794398e84 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.21.ebuild b/net-proxy/haproxy/haproxy-2.0.21.ebuild
index 94d32f6c96a7..85d813df1073 100644
--- a/net-proxy/haproxy/haproxy-2.0.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.22.ebuild b/net-proxy/haproxy/haproxy-2.0.22.ebuild
index 94d32f6c96a7..85d813df1073 100644
--- a/net-proxy/haproxy/haproxy-2.0.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index bdd4de3bca26..212a94723795 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
diff --git a/net-proxy/haproxy/haproxy-2.2.12.ebuild b/net-proxy/haproxy/haproxy-2.2.12.ebuild
index 94d32f6c96a7..85d813df1073 100644
--- a/net-proxy/haproxy/haproxy-2.2.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.12.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.2.13.ebuild b/net-proxy/haproxy/haproxy-2.2.13.ebuild
index 94d32f6c96a7..85d813df1073 100644
--- a/net-proxy/haproxy/haproxy-2.2.13.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.13.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.2.14.ebuild b/net-proxy/haproxy/haproxy-2.2.14.ebuild
new file mode 100644
index 000000000000..85d813df1073
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.14.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=[zlib?]
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
index 2c82ff8d7230..f2141551be59 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 94d32f6c96a7..85d813df1073 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.3.10.ebuild b/net-proxy/haproxy/haproxy-2.3.10.ebuild
new file mode 100644
index 000000000000..a2280c3fd255
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.3.10.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=[zlib?]
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.3.9.ebuild b/net-proxy/haproxy/haproxy-2.3.9.ebuild
index 463b8b547e69..a2280c3fd255 100644
--- a/net-proxy/haproxy/haproxy-2.3.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 94d32f6c96a7..85d813df1073 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
@@ -38,8 +38,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2[jit] )
 	)
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[zlib?]
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index d268968f6575..cc3fbf1a32ad 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,3 @@
 DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
-EBUILD mitmproxy-6.0.2.ebuild 3113 BLAKE2B 1512ec1be8f45885f334b91363fa2cc61b46cf56bcd3a713bb6a760712d4862e745304c190e63b8babb7c2990c38176dfc014e7111349e3086452e94670addab SHA512 d2ae20195230d170131edce5fae35a01e9a54ab41eb8928f8a832d4cfad0297066fa320ba47ef0bd84914324462389399a031801529491abe570cb1442798c15
+EBUILD mitmproxy-6.0.2.ebuild 3046 BLAKE2B e943a273e580e36956e75e794b9848f6206d6a4b111f3e8c398e1ae2e8af23a6e358519ff18219f649f2834ec6dbd843f85a4031253fdf8348063d099a038102 SHA512 a2770f8d6222a509c2d3e0e6b30fe49db2105ef9b35beba460fa9ce309a7f657b8606f7c23a4dcbae08e3d0bc20da15802077a25959bc0c76d5fc54b4a087d66
 MISC metadata.xml 1065 BLAKE2B 55b5f921dc3e44fe0b1b1a0957fe579d2c358996e4a0f6fcd352303e93749859474e56d639a4cd9f6ef152588c445a7bc88b58841209f6c64761a77f61865e31 SHA512 f5042a78818a1e00fb2157919aa9c6918a953fa55d775b8fd52f6549cbeefc138fd525c9c885186b4b047efb2c5b4d46e74cbc93edd3280a4220fc49b3a7f4e5
diff --git a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
index 19fef3485eec..03adf19a0507 100644
--- a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="libressl test"
+IUSE="test"
 
 RDEPEND="
 	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
@@ -43,8 +43,7 @@ RDEPEND="
 	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
 	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( >=dev-libs/libressl-3.2.0:0 )
+	dev-libs/openssl:0
 "
 
 DEPEND="${RDEPEND}