gentoo auto-resync : 31:05:2023 - 21:24:18

20 files changed, 61 insertions, 674 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 73329a69bfa7..c4256e563b09 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 3f50cc67eb68..ba37b7d336a3 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,31 +6,24 @@ DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 58f85c063bada9c943415ff8a8e51232dec0f
 DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe SHA512 066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220 SHA512 4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77 SHA512 c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
-DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2 SHA512 3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
-DIST haproxy-2.6.12.tar.gz 4060878 BLAKE2B c142ea24dfa8d68b8338ce46e326523c7568c5a99493f8418a6d0bd63e94e64a41f5843a017ca9140f0025c7d0baf3356099b32464d3d2046c9cdec20df42f6f SHA512 95841a7379488bf9632151a07f64a1a10af578e41c2749bd5e832f61977e195e3efdbf381db59f56a966732bcbf89f1ccb559f0bf3c369e4462b8419a1e347a6
 DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 5eed5e29d2121117866a1e7dde06ca02743001bd54f9b9a01c82c8c81e24686e3e24f5b8c291db12255d98b10f251b7f6e7612785130a8cf7fb68a0c7c5e28e6 SHA512 672b1c5cd373261865d03af1c5cc42d1f6ec672f08c8482185d17dca2bd7dbd1e83e65107bb0bf1eee33a7149d9d25cca3f2c90beeacb38ab2e3ab74e9bdc5ed
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 2222e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77 SHA512 24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a SHA512 f9eeee2d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
-DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba SHA512 c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397
-DIST haproxy-2.7.6.tar.gz 4162978 BLAKE2B f85dcccb4ad245c557cb7af84b93f825784247b5734d26720a9255c81b07062ca7d42c65096f13b0336a9684311879ffb379e9d0ab63b4bd0d9aaf674dadc0e3 SHA512 2e4227de737361a8176358c755809669feed6860eba2f2f285e96095eba54e8b0d1dcae0b952f31ecf88632636175088afe8cd1457bc758eeea350b8e973062e
-DIST haproxy-2.7.7.tar.gz 4176633 BLAKE2B b52f5d6cf00bfd888e97a0da0d52d631ead9cb136a6952fdfaa84e6d3c9ee314a4385fef7ebc0537599c1b27f4ded9178801655d2503c279788ff07a35d55588 SHA512 22750713803a1c340a21211fa1f588ccc24a811fdf99c87c8bd18b00c35cbe3931a9e2bce17dd41a2adeb94fa804cbc0e847af9bb20457951c7b44d8d444164c
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729 SHA512 00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
-EBUILD haproxy-2.2.25.ebuild 5409 BLAKE2B 23881b30d8189bf37242f0676cbd04c2fa211fbfc69f797b39b4cf7c69f18c1517f7442c5b2960b75adb8c226877548deca81a4aa8e90cf0cab41aeb5badb089 SHA512 529a8625f5eefc4e39eeab8d8e7ce369eaac1a03b70c28da81ac52dbf8b88ce01f70408250693d1ba55e242ea16e3027923d643f2878af174c7e8eb04388aa71
-EBUILD haproxy-2.2.29.ebuild 5382 BLAKE2B d1c72b8ac95ad42f7f32ccfbf3379b6ac519a7466b3655fa8c22a2f3fa283616fae6387fb6c3837f9b22840daaf79b4c5664f275b8f3f133a21e4632d0899ac8 SHA512 f71758ea7fff0b375f76002f9d5c38ae01071e49ea964fe14455c355d8470a570abc3a52e79bf3b6437f9539fab7d7705702f0289c4d849198ed6fe7a566821d
-EBUILD haproxy-2.2.9999.ebuild 5383 BLAKE2B 841112c06223237de84b633a2c7b57e004f8528b6083ea89590299bdb4cdb239a48dac7ee5be7a9d4e846f11eb09bde5be77b65f9810aaa567ef4ef3484e0c7c SHA512 18dc442d9813211f027597043736c6358622b46f9f89c76dc3cc3d725d0968ce09574a80b30335c17fe3db917df5692de03967fb6331f56f4a251f148c519d28
-EBUILD haproxy-2.4.18.ebuild 5641 BLAKE2B 69556c59fdb12da5c92937e9f65de6c6e06d7a3595e19d4b209eea3077fc39d588dec835250cb876f761755d8c1de6f4db93d6718c030d6c643c978a8ee6b7c2 SHA512 f0087392efd0294af57c9204c1dce514c8572dfa36bf96c8e7c4ffa76cf8078460e641815922887da76b48fe4d2294b45d0b78f20c80b70bb8286c0e53616343
-EBUILD haproxy-2.4.22.ebuild 5700 BLAKE2B 4cc895ecedcbc92bc7b969b6479fc714eac039ef4ae8f55f9254ea4b6ccf488e0e8359a9a1012e1fa11f4337a134a1b73e238a5d8fac4d207b8ff9de2892932f SHA512 67dd2f23a8abe96741b6899d3d17e0fef4187394a58b466df7ae7b3505ab6558a69d11cf6387d184b915893bdf94bbb8d45f08e706df7fa03c58e928d7b6d28a
-EBUILD haproxy-2.4.9999.ebuild 5658 BLAKE2B db2f90dda1482bb3d6360696d2e73258c86d1832787ebf73f06575eb2e0ae668447a1003385ae8c0fa7223b7e6a3107d53b5d0ccb7b7d5454b23f1eadf8a9021 SHA512 76e46e4c4a8385d2d4df9d68ec1b66a15548699e01742e60b9b50068143571e36450a2e8e3b1796d49f26d56b1310a2c0831e7abc0d5e2dde30a8f8b4fba9796
-EBUILD haproxy-2.6.10.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.6.12.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.6.13.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.6.9.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.6.9999.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.7.3.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.7.4.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.7.6.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.7.7.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.7.8.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-2.7.9999.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
-EBUILD haproxy-9999.ebuild 5650 BLAKE2B 1a53741519e6b0cfc97711c61eec876a8992bac625c27d753e6992550c3dd244d6f77ba151c1557d838baa06ec32a10ee5b000f66814c9d96e5073fcfd2b9eb8 SHA512 04279dddef4c353da08136a653287c3c79b995da7b9fde553a0d47f9bcae89cfba46ae741ac3aafb8d4567e96fbd2100c2c6ecf4e9197f18cd59a186d22da971
+DIST haproxy-2.8.0.tar.gz 4328018 BLAKE2B a5382e153f08a315b7df7f92736aabad8e9d4cd0152a9178c448d1071440b88dbd723599fd3709d266f97eee4fa89d336a3390d70a0c4ab7f0b46e4ae713fa12 SHA512 4197e94df3d4ab8b27487146181335422358a097f7d50188b40ae23263c58ddeab6d17d9ed91e93d239a7fccec2fa58319e3f2cf07ac589c79fd78a3839c2b81
+EBUILD haproxy-2.2.25.ebuild 5366 BLAKE2B 02593a431a2a273984fd0b98d76a749c3e3979fc2b4a3c67ba566db9346eb018665271e8c532fc1bbfbd90e76a03cab8da32be0598aeed5d87bae26599205b7b SHA512 2d902b8349729bbabade99e2287df68ff10654c0a02421a9a1304dfe12c5be32445e3696f36a9199dc58e73c945e5100bc7ae689a553087ea35096d4e43794b9
+EBUILD haproxy-2.2.29.ebuild 5339 BLAKE2B 354e3d794b2be80977377032cb09d4259218a3afc7b046d25dc346c215497143d113de9c2a295682270980fcb0ba45e713b4a365def4a4f6679fbfbf14b38194 SHA512 a517f380995b7ab61f98a2e4c36dd3c66678e13cd15ac507301485c23bf466981326f7d5e5f502e0708597aff948bd3dab100117723873bcf92f312e60cd35db
+EBUILD haproxy-2.2.9999.ebuild 5340 BLAKE2B 9c9187eb4ab5207904937754cc796b296284854c8540da1792131674545cee3823ca709ec044844b99afd02dcd5988cc00a13805f94bff567d98a242d8312a62 SHA512 38aac92d320dd9aa3c98644b241c17e5e1e3e54f44cf06f68adac4eb319060324b6728a0040f4cc31e9e4ad7d5e25c7f295afc46aa68f37200569b45e9067a27
+EBUILD haproxy-2.4.18.ebuild 5598 BLAKE2B 1c7283001f105bb98bd22bba4c01e0589c26df49c4faeea559fef51e7715758a0146f9f8fb7046d144ba1c8308f91758a4a9ddcce9f9dac6db42bbca5043a786 SHA512 18ec1088515e435ae8710667da6a1c4fd815c16bd0889595c4285cb57624697ef6a658746c0128adcaa786d46e7e4a82d637d5c71cb17c4ef2f1830bcb30bffc
+EBUILD haproxy-2.4.22.ebuild 5657 BLAKE2B 145c1f9808a68b0a7c1d23f07bc7a01f668d83006b0939cdad136cedc118751e962553620abc63b351bf5b5ec58e553935bf32fb516613eecaf5e51be85ad001 SHA512 b2a70110752a439ff7674e0f092bb72da020c6d52b4b780953204515ebde46fd0b277525b6a89087f647bb9dfca1fdc7f98cd1763b50a49944eb2583c095ef9e
+EBUILD haproxy-2.4.9999.ebuild 5615 BLAKE2B 0d6b8841fb5bd2ef6fc7dfcafed75db8fb5a62277e2e6a0662aecd0746f80ed82f8f9ac682a32731bb8402214d68f0c08f7e6a6a359f9ab48ea58cbfd772be0e SHA512 5ceae9bd306b0735c9e7d95dcf6c998f799db8478bc82b0fcd2ee4586b28dea7e7f77c939922d2bf0c00fdf3965f470ee3421ce829158278765b033da5755431
+EBUILD haproxy-2.6.13.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.6.9.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.6.9999.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.7.3.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.7.8.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.7.9999.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.8.0.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-2.8.9999.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
+EBUILD haproxy-9999.ebuild 5607 BLAKE2B ba2ff558d807e8b3c984e7a8469d709e272ccfa4e416febfee1618b1a09fbc654fb41f4801b427d5a4c4fe0be4768ebbfb8deac41f298f40197402af31e8b7f5 SHA512 96a7892eb7b081a56277b81e1537a4266728ab08fd5b80eda701599246d7a8a17244b8d4871c93304f5fc4325f65405b5d15b16785544480b51c13cf131496e3
 MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121
diff --git a/net-proxy/haproxy/haproxy-2.2.25.ebuild b/net-proxy/haproxy/haproxy-2.2.25.ebuild
index dc5155b408da..bec46c997025 100644
--- a/net-proxy/haproxy/haproxy-2.2.25.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.25.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
+ssl systemd +threads tools +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -165,10 +165,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins contrib/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.2.29.ebuild b/net-proxy/haproxy/haproxy-2.2.29.ebuild
index 55877bc2b9f5..a1da00905684 100644
--- a/net-proxy/haproxy/haproxy-2.2.29.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.29.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
+ssl systemd +threads tools +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -166,10 +166,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins contrib/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 752bdc4828b3..6f386ae05520 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
+ssl systemd +threads tools +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -166,10 +166,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins contrib/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.4.18.ebuild b/net-proxy/haproxy/haproxy-2.4.18.ebuild
index 883ab8118c3f..3cb34fca9462 100644
--- a/net-proxy/haproxy/haproxy-2.4.18.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.18.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -161,10 +161,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.4.22.ebuild b/net-proxy/haproxy/haproxy-2.4.22.ebuild
index 559e43610038..b1317d2d7f7e 100644
--- a/net-proxy/haproxy/haproxy-2.4.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.22.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -172,10 +172,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index ff2118770d3f..291a00595e4a 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.6.13.ebuild b/net-proxy/haproxy/haproxy-2.6.13.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.6.13.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.13.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.6.9.ebuild b/net-proxy/haproxy/haproxy-2.6.9.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.6.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.7.3.ebuild b/net-proxy/haproxy/haproxy-2.7.3.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.7.3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.3.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.7.4.ebuild b/net-proxy/haproxy/haproxy-2.7.4.ebuild
deleted file mode 100644
index 7c18e82dbedb..000000000000
--- a/net-proxy/haproxy/haproxy-2.7.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single 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"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	EGIT_REPO_URI="https://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 prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-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 wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	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}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	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 admin/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.7.6.ebuild b/net-proxy/haproxy/haproxy-2.7.6.ebuild
deleted file mode 100644
index 7c18e82dbedb..000000000000
--- a/net-proxy/haproxy/haproxy-2.7.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single 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"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	EGIT_REPO_URI="https://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 prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-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 wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	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}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	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 admin/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.7.7.ebuild b/net-proxy/haproxy/haproxy-2.7.7.ebuild
deleted file mode 100644
index 7c18e82dbedb..000000000000
--- a/net-proxy/haproxy/haproxy-2.7.7.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single 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"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	EGIT_REPO_URI="https://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 prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-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 wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	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}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	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 admin/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.7.8.ebuild b/net-proxy/haproxy/haproxy-2.7.8.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.7.8.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.8.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.7.9999.ebuild b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.7.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.6.10.ebuild b/net-proxy/haproxy/haproxy-2.8.0.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.6.10.ebuild
+++ b/net-proxy/haproxy/haproxy-2.8.0.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-2.6.12.ebuild b/net-proxy/haproxy/haproxy-2.8.9999.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-2.6.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.8.9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 7c18e82dbedb..843fa7ff2a33 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+ssl systemd +threads tools zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	lua? ( ${LUA_REQUIRED_USE} )
 	?? ( slz zlib )"
@@ -171,10 +171,8 @@ src_install() {
 		dodoc doc/seamless_reload.txt
 	fi
 
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {