gentoo resync : 03.07.2021

19 files changed, 246 insertions, 229 deletions

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4ebe9c367864..06ddd715caa4 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -14,21 +14,21 @@ DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8
 DIST haproxy-2.3.9.tar.gz 2928660 BLAKE2B 48b56aa72d50d4783bf54c6dbf642388d6f12d4e2ede09e86e9262d62a981177365dc2d2999e76c2be124c0576fe0b8d16a7a5bf412133fcbf87d45d8abfe3dd SHA512 49ee2a9be8dc7836e73be8e01ccbde52e29522f94d0bc80cf753fe76f4b32657fb123df7d443228afef36928f5a6cef67b693f05008a891001082b4264f015f6
 DIST haproxy-2.4.0.tar.gz 3570069 BLAKE2B f37df37232edd5066564bb0f8b02125f697dc1e4d1d8121321a7a5e5089a63c16fb6919f329ac0adf8450f3088efc959fd0cad873151bddf5b53c149530a6e8e SHA512 846faffb7ac2ccbfe314f7c72d4ab3f1955338f3be45906e76a53934c32934e6a3ed9b7a04411717e9a91966e55266183e9cf583df5375f67d03d26c6c6fc273
 DIST haproxy-2.4.1.tar.gz 3575591 BLAKE2B ae5d9f12cf2ef8e114f3ec65a3f636c81b3816ea8dd20635ebc2f2e62ed351463ea97f834a166e2d0e8debc168ef23cbe1fab2f4951a2528bb4e02720e59138f SHA512 6251f0ac77b7bceb349a174faff003bbe621490e5380dcdcd06bf712e13e0c94fd08a3651a62e68c862978031ca2fc9ac8432ea4c6062bb1c718db697030de9d
-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
-EBUILD haproxy-2.4.0.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
-EBUILD haproxy-2.4.1.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
-EBUILD haproxy-2.4.9999.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
+EBUILD haproxy-1.8.29-r1.ebuild 4837 BLAKE2B 26a5dde732555de4c52f431b434f0da2ac5cd987b78d5e59843733a957ccbc5065cbbf2ead3777a49c5c14c82ee7671bee2346c20275162769fccd483b3a4a0b SHA512 57967a9c823303ec75167266515483d41fdf268efe4ce4758410b410542c58d4e78d9c4ea0e43956422a13882661023ce4d3a0d32148029ab31df02d71d2e3f2
+EBUILD haproxy-1.8.30-r1.ebuild 4837 BLAKE2B 26a5dde732555de4c52f431b434f0da2ac5cd987b78d5e59843733a957ccbc5065cbbf2ead3777a49c5c14c82ee7671bee2346c20275162769fccd483b3a4a0b SHA512 57967a9c823303ec75167266515483d41fdf268efe4ce4758410b410542c58d4e78d9c4ea0e43956422a13882661023ce4d3a0d32148029ab31df02d71d2e3f2
+EBUILD haproxy-2.0.14-r3.ebuild 5374 BLAKE2B 3f78134a9664ea1657504c00b69bb6bbd549cce4a8e7a0937ab5a9106197376a0ecf5c2316a506472d2f69571c9f748afc73f3978c65c4832bc0d7ecbffed352 SHA512 8f8754662639d3cb8f423c72419e6350824be54b6072309d0a76481fc3b8c14b9afe74a8abaf6110a6bae9bd4d3fee5257e65d4215588f80bd7a44a432cc2947
+EBUILD haproxy-2.0.21-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.0.22-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.0.9999.ebuild 5255 BLAKE2B 8be39d642abc7d83e8dcb644b3d899d432628012786e81b0e318d7be2a661d931c7d8c98e8a737075fc9217078e190ad957de8a7972fd4ea68af7310a0873129 SHA512 d61ec07f2266a999eb7156a180a48e523d5e9b6dec06c28b6ed5de46e7d30283a67b43ac2827acaeb92cc4e40f409973004d8264b60f82feda08a27e759ae999
+EBUILD haproxy-2.2.12-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.2.13-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.2.14-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.2.5-r2.ebuild 5433 BLAKE2B d950a2af4fb256a93ae8408dc128a3517f53c713a960ff099e31c1e65813fd84aea65754de40af24dd80018d71185b8814750ab8c4c43d7bf5bd1ad8c41d1e1d SHA512 4026e4a4ac7df45ca589de96fb9d29dd01c9ee0f00173b910e53646a21e0e7ce540709499f5f2329efa4f21d4c6ac7c24efd4a304ec5bc22ed0c1d2c9e6fb32b
+EBUILD haproxy-2.2.9999.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.3.10-r1.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
+EBUILD haproxy-2.3.9-r1.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
+EBUILD haproxy-2.3.9999.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
+EBUILD haproxy-2.4.0-r1.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
+EBUILD haproxy-2.4.1-r1.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
+EBUILD haproxy-2.4.9999.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
 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-r1.ebuild
index 6b6c80be510f..90d010744750 100644
--- a/net-proxy/haproxy/haproxy-1.8.29.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.29-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-1.8.30.ebuild b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
index 6b6c80be510f..90d010744750 100644
--- a/net-proxy/haproxy/haproxy-1.8.30.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
index 59e794398e84..49cfe55e3a3f 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.22.ebuild b/net-proxy/haproxy/haproxy-2.0.21-r1.ebuild
index 85d813df1073..42c17e31be40 100644
--- a/net-proxy/haproxy/haproxy-2.0.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.12.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
index 85d813df1073..42c17e31be40 100644
--- a/net-proxy/haproxy/haproxy-2.2.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 212a94723795..0dd6f7085108 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.13.ebuild b/net-proxy/haproxy/haproxy-2.2.12-r1.ebuild
index 85d813df1073..42c17e31be40 100644
--- a/net-proxy/haproxy/haproxy-2.2.13.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.12-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.21.ebuild b/net-proxy/haproxy/haproxy-2.2.13-r1.ebuild
index 85d813df1073..42c17e31be40 100644
--- a/net-proxy/haproxy/haproxy-2.0.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.13-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
new file mode 100644
index 000000000000..42c17e31be40
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
@@ -0,0 +1,181 @@
+# 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="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		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.14.ebuild b/net-proxy/haproxy/haproxy-2.2.14.ebuild
deleted file mode 100644
index 85d813df1073..000000000000
--- a/net-proxy/haproxy/haproxy-2.2.14.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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-r2.ebuild
index f2141551be59..f773d9548c6c 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 85d813df1073..42c17e31be40 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.3.10.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
index a2280c3fd255..143c6394abda 100644
--- a/net-proxy/haproxy/haproxy-2.3.10.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.3.9.ebuild b/net-proxy/haproxy/haproxy-2.3.9-r1.ebuild
index a2280c3fd255..143c6394abda 100644
--- a/net-proxy/haproxy/haproxy-2.3.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 85d813df1073..42c17e31be40 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.4.0.ebuild b/net-proxy/haproxy/haproxy-2.4.0-r1.ebuild
index ec2939f568a0..31171c86ed5b 100644
--- a/net-proxy/haproxy/haproxy-2.4.0.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.0-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.4.1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
index ec2939f568a0..31171c86ed5b 100644
--- a/net-proxy/haproxy/haproxy-2.4.1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index ec2939f568a0..31171c86ed5b 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
+	crypt? ( virtual/libcrypt:= )
 	pcre? (
 		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
 	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
 		dev-libs/openssl:0=[zlib?]