gentoo auto-resync : 18:10:2024 - 04:04:23

12 files changed, 8 insertions, 1326 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 162330247da9..4aa9cf00a2ff 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d4492f9c0f8f..37cca156383b 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,13 +1,9 @@
 AUX haproxy.confd-r1 637 BLAKE2B 5b79a652f0cd124ab9349ceee026c7b54de10c5c4ceccba189c856204fb149b2be667f1bcbd73cb438848d7b34f1ce15812c4fd0e3445b5a6d8c3bd77bdfeda4 SHA512 19cd0dad0fabf579b86c4de74f291e6caf6f5b91d9ae37da2315169dbb75fd35337a7a3e07f4d9e424cfe9776f39952c91f69abd6580c2df16b0d2cc8f3f099a
 AUX haproxy.initd-r8 1668 BLAKE2B 2d5b6ec27af7cc067eff402d71322fa1776d95437ae515b56729a4d380338c29d128724b429009512380ac3f841510ddec89bb2ccfdf62eeea1fcf24a34bd838 SHA512 0c160c3850e32bccf8757f2e4a066d4d2ddea80cfd307d3cd83fccece98719fd0688b5bc6e1360c8f44306f08f241efe76a2d25c36269f4f309a88f32ffa5c88
 DIST VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz 196700 BLAKE2B d740e19104a91b4cf978596ccda861974e96c9ed85a49c91e996c5bc6dde40f1cdcf49e6a75243aba7bf59abfd8d2c051a7ee574bab22f9e512d74376c9e1738 SHA512 cdc62271bb75ef7032745a457e1a54a84bcaadce73324272462b647383177338c5c2c8a17993d6344840e8ce0308a7e6f0df9bb766ebe0e8d4ee6dd4914e188c
-DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076 SHA512 bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1
-DIST haproxy-2.4.27.tar.gz 3671596 BLAKE2B 987df4b07686e68805ff31a6832498ad8a7487a63b37e8d5ba9cd20be245a91c42e50d754d7d580d0899fed630a6bf99bd594cfec7b3a9d00ccac744a09da19b SHA512 97227805acd6131df8b4d398099bd9b89d1cd2aaddce4a3f334bf5b8b4dd01a30a0c3b56a7c23268456cf0e3a39244ddfd3ea0c27ee44f2c3bdf49c045b5fd8c
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc SHA512 81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
 DIST haproxy-2.6.18.tar.gz 4103766 BLAKE2B e55f401ede25e54b199b33b7fc3dd788a45e9abbeef10fde5be6939124ab14e119ace3a2dd9d191b7c32270989c98787bdc30d2defa80c012215e2761538ce4c SHA512 44bc0504b62c9553fe084c607e8e4d73df100b371a3493663f82fe661d07852046e1be5dc7d195a3d85f1170d9096c6a0770251ed10c1bc88f8f982ce740042f
 DIST haproxy-2.6.19.tar.gz 4110701 BLAKE2B fe003ac433a7756e57751db8f5430fb5f16e20d328bd28c0c5595304570a1450cecc19ca600fae515b21af00bfd6699ba08bd8ccfe43a09b6719e0f90b985a02 SHA512 cdcf6c2108d844c08b586e0e4ee4bd64dde3ef0da7487d65ea68f6fb52d9a1c2c34f4438ffacebea1d0f2400aac9f9f1b9000714a08cbac192a9f302dcc6c345
-DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0 SHA512 1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
-DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2 SHA512 774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.10.tar.gz 4392333 BLAKE2B 4afc387970adbd6f882aa9b1d95cf6cc914d98ce69648282798fe2d97be82adc60c6ad4d0f3a78f56e2eca26d91a47044de2ca7277ca2567ecfdd2233ad64f32 SHA512 0a36f1e17702f4ab6eccf1c10643f4685e8c8b272cc71cbf5feb61c8c95ea52b5fc47eeefc97390bb8cb4ac1d52db0c9ad3c0510f8ca017bf10204690554c6d2
 DIST haproxy-2.8.11.tar.gz 4400628 BLAKE2B 0daccc4dbae5cecae3ad0bc1d164ea78a9584a0f4cb71e15664aff4b76fc05a828030dee355722c99a77270427bd3e9e43939ae59a3f3b1cabcc0179faff34b9 SHA512 59517187a5c0e0dbcb8629d2a922f7a865e1ebdbb9fe0f4fbe273913e0f15a1a26767808bd1607f10e79d3abcdd8c35c1ae648df149a1d5c0df32604df553655
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc SHA512 dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
@@ -17,27 +13,21 @@ DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a6
 DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B 60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303c SHA512 23f320d49f822761cc0a4d8b7e15c8a58b804e4601c9421fa2433afe19798944d5a7264bf83502534b99236dda7c44ec72b97c1e6cdbcf203ab3090ae5313b3b
 DIST haproxy-3.0.4.tar.gz 4689835 BLAKE2B bb3691ac99db91a4a9faecce14f032d152d2fec36bc7722e7a71a8218e05e258c2667e45109af2006f20df38739d911db0be2f4845789824e7a012d4adc7bc38 SHA512 354d441d39a981ca16d844b64e06fde62df9ba0bc7fdd9e79e4890312be18378d7231ac997b035d5ef990f67f0b2cf8e60592026634777ccdb99286078c12867
 DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396 SHA512 8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91
-EBUILD haproxy-2.4.25.ebuild 6637 BLAKE2B 53be34d7dbb5ccb6d871dceae60492769ef48a44f484b85d2bfe5024224cb4fc1eca299fd660333a59865be563aa8bdfcfd092af879ef19071429834c4f1ab18 SHA512 306d7f23b250c1537f4b62745211724b89990442c40037a464358d494387dc5c66ba175dcc824ac791b55cc1c5fc9002f8d5070c92c230f467246eb21066c5f2
-EBUILD haproxy-2.4.27.ebuild 6640 BLAKE2B 01b5855988197a1cf18619ca10400699ecdab66db56fca87714833bedbf32e608f596ed3c3476db6ca73c87a438e991cce579a8114c0cad4f58ce4fe172a1f6b SHA512 8cd574c578a7dbaa1fed5357d0af31b4a661055c3c79aabeaade71c67fff139b01193293042704112ebb1e0b767289e50fd0416b5cb4fc00e1124d27613d7141
-EBUILD haproxy-2.4.9999.ebuild 6640 BLAKE2B 01b5855988197a1cf18619ca10400699ecdab66db56fca87714833bedbf32e608f596ed3c3476db6ca73c87a438e991cce579a8114c0cad4f58ce4fe172a1f6b SHA512 8cd574c578a7dbaa1fed5357d0af31b4a661055c3c79aabeaade71c67fff139b01193293042704112ebb1e0b767289e50fd0416b5cb4fc00e1124d27613d7141
 EBUILD haproxy-2.6.16.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630
 EBUILD haproxy-2.6.18.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
-EBUILD haproxy-2.6.19.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
+EBUILD haproxy-2.6.19.ebuild 6635 BLAKE2B e2589caadfcacbe0f5a4242b996ec786098367a1f41216b473f48b1bd42cd2f450c0ad35e80ce8d0a883bf037884a10e89b51c68324dd1ee80a865daf792942d SHA512 b6bc9eb2a374f981547f112469ac2022a02e71d6d65270943efa5afe418ccc7bbe4d4c178ea987589ae346d28f8c43aad3d6aab0a2713ac567f252324ca4ca08
 EBUILD haproxy-2.6.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
-EBUILD haproxy-2.7.11.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06
-EBUILD haproxy-2.7.9.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630
-EBUILD haproxy-2.7.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
 EBUILD haproxy-2.8.10.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
-EBUILD haproxy-2.8.11.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
+EBUILD haproxy-2.8.11.ebuild 6635 BLAKE2B e2589caadfcacbe0f5a4242b996ec786098367a1f41216b473f48b1bd42cd2f450c0ad35e80ce8d0a883bf037884a10e89b51c68324dd1ee80a865daf792942d SHA512 b6bc9eb2a374f981547f112469ac2022a02e71d6d65270943efa5afe418ccc7bbe4d4c178ea987589ae346d28f8c43aad3d6aab0a2713ac567f252324ca4ca08
 EBUILD haproxy-2.8.7.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630
 EBUILD haproxy-2.8.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
 EBUILD haproxy-2.9.10.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
-EBUILD haproxy-2.9.11.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
+EBUILD haproxy-2.9.11.ebuild 6635 BLAKE2B e2589caadfcacbe0f5a4242b996ec786098367a1f41216b473f48b1bd42cd2f450c0ad35e80ce8d0a883bf037884a10e89b51c68324dd1ee80a865daf792942d SHA512 b6bc9eb2a374f981547f112469ac2022a02e71d6d65270943efa5afe418ccc7bbe4d4c178ea987589ae346d28f8c43aad3d6aab0a2713ac567f252324ca4ca08
 EBUILD haproxy-2.9.6.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630
 EBUILD haproxy-2.9.7.ebuild 6635 BLAKE2B 2f7647df104b260d33088b3e2d2db3833e697e1d8a014982e64194809e42a8f07163f3aa942d7321ec46b06c73a2920f329ded843cccae91816940795fca4b38 SHA512 7c6374320c5752202645fbf69c478be712146e05beefaf0ba6950696d3cb8ade628704170b8d5d662455add9e04dc294388dbc90344eff2bf474ae6604463e6a
 EBUILD haproxy-2.9.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
 EBUILD haproxy-3.0.4.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
-EBUILD haproxy-3.0.5.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
+EBUILD haproxy-3.0.5.ebuild 6492 BLAKE2B ed12e6f6eb8aac5bd755161c0939edad308d53f4707fa8c061a1ab4fde52f62818b3345e4b376a77e736b42302dbd82324cf30e7b1a6dd6156125f7dc86805ac SHA512 759a5f01aa06fc63151b26c3d6bc138e28f1ef3e1babe3b40e63e05572078d6a62323e0a7f6abf5102adf0ac97ff9860bc32d41972a821355449a2a89646c377
 EBUILD haproxy-3.0.9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
 EBUILD haproxy-9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
 MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121
diff --git a/net-proxy/haproxy/haproxy-2.4.25.ebuild b/net-proxy/haproxy/haproxy-2.4.25.ebuild
deleted file mode 100644
index 74bb3576a796..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.25.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 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} multiprocessing
-
-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
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="amd64 arm64 x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-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_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	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_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-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 ROADMAP 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
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-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.4.27.ebuild b/net-proxy/haproxy/haproxy-2.4.27.ebuild
deleted file mode 100644
index 62cd2fd227c9..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.27.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-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_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	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_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-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 ROADMAP 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
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-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.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
deleted file mode 100644
index 62cd2fd227c9..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-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_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	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_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-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 ROADMAP 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
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-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.6.19.ebuild b/net-proxy/haproxy/haproxy-2.6.19.ebuild
index ce11ece1a066..1a0bb77f9535 100644
--- a/net-proxy/haproxy/haproxy-2.6.19.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.19.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-2.7.11.ebuild b/net-proxy/haproxy/haproxy-2.7.11.ebuild
deleted file mode 100644
index dca3aa00891c..000000000000
--- a/net-proxy/haproxy/haproxy-2.7.11.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 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} multiprocessing
-
-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
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-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_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	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_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-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
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-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.9.ebuild b/net-proxy/haproxy/haproxy-2.7.9.ebuild
deleted file mode 100644
index 1e57b8694cc7..000000000000
--- a/net-proxy/haproxy/haproxy-2.7.9.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 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} multiprocessing
-
-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
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="amd64 arm64 ppc x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-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_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	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_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-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
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-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.9999.ebuild b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.7.9999.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-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_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	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_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-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
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-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.8.11.ebuild b/net-proxy/haproxy/haproxy-2.8.11.ebuild
index ce11ece1a066..1a0bb77f9535 100644
--- a/net-proxy/haproxy/haproxy-2.8.11.ebuild
+++ b/net-proxy/haproxy/haproxy-2.8.11.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-2.9.11.ebuild b/net-proxy/haproxy/haproxy-2.9.11.ebuild
index ce11ece1a066..1a0bb77f9535 100644
--- a/net-proxy/haproxy/haproxy-2.9.11.ebuild
+++ b/net-proxy/haproxy/haproxy-2.9.11.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-3.0.5.ebuild b/net-proxy/haproxy/haproxy-3.0.5.ebuild
index 019b7ed1219f..499ab72feddc 100644
--- a/net-proxy/haproxy/haproxy-3.0.5.ebuild
+++ b/net-proxy/haproxy/haproxy-3.0.5.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"