gentoo auto-resync : 21:03:2025 - 00:31:16

16 files changed, 187 insertions, 685 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 5ea0e38aac66..bedc9e45084a 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 9c416f3c3ba5..4d14ba6105e2 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,44 +1,39 @@
 AUX haproxy.confd-r1 637 BLAKE2B 5b79a652f0cd124ab9349ceee026c7b54de10c5c4ceccba189c856204fb149b2be667f1bcbd73cb438848d7b34f1ce15812c4fd0e3445b5a6d8c3bd77bdfeda4 SHA512 19cd0dad0fabf579b86c4de74f291e6caf6f5b91d9ae37da2315169dbb75fd35337a7a3e07f4d9e424cfe9776f39952c91f69abd6580c2df16b0d2cc8f3f099a
 AUX haproxy.initd-r8 1668 BLAKE2B 2d5b6ec27af7cc067eff402d71322fa1776d95437ae515b56729a4d380338c29d128724b429009512380ac3f841510ddec89bb2ccfdf62eeea1fcf24a34bd838 SHA512 0c160c3850e32bccf8757f2e4a066d4d2ddea80cfd307d3cd83fccece98719fd0688b5bc6e1360c8f44306f08f241efe76a2d25c36269f4f309a88f32ffa5c88
+AUX haproxy.initd-r9 1855 BLAKE2B c2718e225dd266d06ea7f687f0f12ece94f5f58339e4dac41ed7fffb77b8d6988acf8a496d769dd77edb3256b41b035060691f39924ac40361959c6293277ca7 SHA512 3914ea252a6e3f86bb3906245649d786698500aee365bc43f38d6b10a15474c0808396ca082675f21c2a78a1a784e07dfc42a7e0b9843b2c6fb3260183875b4f
 DIST VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz 196700 BLAKE2B d740e19104a91b4cf978596ccda861974e96c9ed85a49c91e996c5bc6dde40f1cdcf49e6a75243aba7bf59abfd8d2c051a7ee574bab22f9e512d74376c9e1738 SHA512 cdc62271bb75ef7032745a457e1a54a84bcaadce73324272462b647383177338c5c2c8a17993d6344840e8ce0308a7e6f0df9bb766ebe0e8d4ee6dd4914e188c
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc SHA512 81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
 DIST haproxy-2.6.19.tar.gz 4110701 BLAKE2B fe003ac433a7756e57751db8f5430fb5f16e20d328bd28c0c5595304570a1450cecc19ca600fae515b21af00bfd6699ba08bd8ccfe43a09b6719e0f90b985a02 SHA512 cdcf6c2108d844c08b586e0e4ee4bd64dde3ef0da7487d65ea68f6fb52d9a1c2c34f4438ffacebea1d0f2400aac9f9f1b9000714a08cbac192a9f302dcc6c345
-DIST haproxy-2.6.20.tar.gz 4111858 BLAKE2B cddd6a14f82b4957a6b4c9e61b580772a17aa1698042578628267d5339d43a3805ada1721855de44b4202838734d479f434d857bf0ad3598776bdab5eb2b5f8a SHA512 f52f5b7223d825455dd5eb415a69985a124c30e1bb2d04221c54d82f83c705e45e1b5a312e2d760f9991e0f09e962cd9b8454557c3e08700e75309e4b6ea30ac
 DIST haproxy-2.6.21.tar.gz 4114397 BLAKE2B acdd0b8f07b33299ab4f91e9c04ffe8e1bf6c1a04694e46bc0a296f88577c300fb51251c1ea5c26d2deb1e900c2e211afdca7c8b11409fd568493336e937ccf0 SHA512 3c438185e88c2abfef5f855960ba477e11b914cdab1e17324c1b4725b68e7b8908df7933d82fc6b87c67fd73635b4610ca5c5732c0ced650a2a5e66f10d9b221
 DIST haproxy-2.8.11.tar.gz 4400628 BLAKE2B 0daccc4dbae5cecae3ad0bc1d164ea78a9584a0f4cb71e15664aff4b76fc05a828030dee355722c99a77270427bd3e9e43939ae59a3f3b1cabcc0179faff34b9 SHA512 59517187a5c0e0dbcb8629d2a922f7a865e1ebdbb9fe0f4fbe273913e0f15a1a26767808bd1607f10e79d3abcdd8c35c1ae648df149a1d5c0df32604df553655
-DIST haproxy-2.8.13.tar.gz 4407964 BLAKE2B b9dc167ca395d71cf1340bd92c1399187f93fce0cfd2f895f6fda05f09bc341c63bc64fa8d4fed5cb521ff5466d8c9b09d368139ac09e11b43f58bb4dadbd138 SHA512 6097516d469ac633e2cdb1423d060b46708592d366a6a8d17bfc14a2224c40203cc201b905c3501aa3acc3c17edf6a25a812f88b599359507ee2a72136ee1b97
 DIST haproxy-2.8.14.tar.gz 4411140 BLAKE2B fb17032027eafe6c1d891e33ad45026cdb66cb26aa798109eea40f40fd6b4b75218a5e155da69af440f9ee376146bba09ac46341fe5c33514c0aaed62dab03af SHA512 14fee269b6b1bbe517ac1752b89243888bcd3d2090f04c6047a5b4fabd88f89e0270c58666d5f54e8ead066dfbd743fc095203878c7e84d71d8001bdee9517e0
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc SHA512 dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
 DIST haproxy-2.9.11.tar.gz 4540689 BLAKE2B 53f81c845e2bb8b3c9935a6035cb28d49708337e16081c2197cab60e4c1f01642cc64f1b2162bdabef07ab79cf72af9fac136bfa19fe89518b7de110433a1789 SHA512 316ab1dfbc60da4fe39acd4f9dc62d352690b35f0787f4fc0ae51853c7d35c656417e97945650bd79900d815414ad9504e4ff368e852657690f20ddc69bd3693
-DIST haproxy-2.9.13.tar.gz 4555979 BLAKE2B 8ef464cf9f6c12f7a85336f578137e4a070e9f0083a4cf99150b7a4128211afbf92bfd578debc77657533c0188cb41fbcc08c6e575abb9feefd0980f0792163e SHA512 7ad13194ae274123d4bfbdaa00d4dcd662218bc98274c11adffb9334d9215dec71d7f97491e5042c5134a472207563292d9a87e9ec58e33f7a0c346b757ab52a
 DIST haproxy-2.9.14.tar.gz 4557688 BLAKE2B 78b819990924d199b0aba78aafe788303cce9bb695e060563eac21bda51dfc83e6d7a3163bec6f31d97adbc4832a3ad4caf75c69c7fb3f4ed70407bbff3cefc3 SHA512 067d7ede1093e9180ff09f51d8acdb9677b1ac9072d38bfb01417f2a440d579c1036bf514bba8ce8a63701a7e46111af0098162a9799f26c9ca6d4d3de198d69
 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692 SHA512 4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
 DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396 SHA512 8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91
-DIST haproxy-3.0.7.tar.gz 4713776 BLAKE2B f6515e0d6e3d26a122e341715ecdcc701c6b98fb5ba2d2bf9d38d65cd6d00fc43912c223b0b1530c1154b326247362ea7b1253af5e0ba9567937fb51aa6cc0f6 SHA512 a2ee8cf513fcbae9fc6fa8d66dc6dcd5013667791ef9c3320753f4490904e1568258e499a3b2ccdd3b9d60b2efce98688fd638297cd9b87bddb715167c730c70
 DIST haproxy-3.0.8.tar.gz 4723201 BLAKE2B f5533157d5c7d454f42137ea4071cc0838cf9eb84e5c0444a78665a3242af04fc49493b04d0dcc4aa21065718df42a9e194860f1000c549669fb4e7df99791b3 SHA512 37a633aba96c4da7f00da9c636dd874c5b5d1419a00468857525ee4ddab9cee0b0cbea6f5834d7f07568b41836a1be9ae7d34443c22e42627b9043534a6df6ea
-DIST haproxy-3.1.3.tar.gz 4902565 BLAKE2B 55ada7d553ad771840cb196538373aecb16017f7ccb6ba4ac5f492ffc28cf5e7ccf8c638c61f6c92ba22c138199a3ac443fd0efe4cdc070081345f575d524871 SHA512 639c4b8faee0f775c2e0a6683fa6631bae604b59ea6843432e772fb20b6a430a6191b3070a8436f0894178e81e027ca4215c26590766fb389db9dcec14d9b533
+DIST haproxy-3.0.9.tar.gz 4729071 BLAKE2B a4d48dc927dd4ab1829aaa6e1e395aa138e25c078a9792dab05e7b58af3ebf92c76d10d65802825ccc442469195cfad700c8499c3072a3035c2b5efbbc36d2dd SHA512 57e0db9176af607014dc1b51a717172f2bf80326cb70823bf1fe8aa1e1f016f6f132289acfb9ba6518a38ca2d7bd59083e7a77eac337f6673b4ab7e45b45e013
 DIST haproxy-3.1.5.tar.gz 4907109 BLAKE2B 08cb1b7291fb6047922910758059dd5fb748218f3eaf711b823939489a975eef0340c626abb423afa3ba591b633319b75dff6e8bd6ada95c9ebb8b7f02bf491a SHA512 4eb9e07b9f3b31b41bc829b267f55549d19d1b45b9247c30c36b49fbfc8b9780364bdc01ff483d20760fcdce7fe43f56b5c6f0cd8fc430cbc2b1b60bd71ab184
+DIST haproxy-3.1.6.tar.gz 4911948 BLAKE2B 6ec25894fd725d3b7a5bf231eefc41656d03583d70dfb1e2ab12ae2a1d4ab863170891451db18a8d1f90f4965916c9f26ebe091f3017304a8aa7061c15d257e2 SHA512 85a3c68591b2547278d641c20d6c1b9dd82639c5a5917adc3abdbc02f731bb7dd34ad1101c873e3efc1eb970db853404a1839a33368bb1229edda59ed1c7f2ec
 EBUILD haproxy-2.6.16.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630
 EBUILD haproxy-2.6.19.ebuild 6635 BLAKE2B e2589caadfcacbe0f5a4242b996ec786098367a1f41216b473f48b1bd42cd2f450c0ad35e80ce8d0a883bf037884a10e89b51c68324dd1ee80a865daf792942d SHA512 b6bc9eb2a374f981547f112469ac2022a02e71d6d65270943efa5afe418ccc7bbe4d4c178ea987589ae346d28f8c43aad3d6aab0a2713ac567f252324ca4ca08
-EBUILD haproxy-2.6.20.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
 EBUILD haproxy-2.6.21.ebuild 6637 BLAKE2B 6a2f34497377413b848306d17442c3100d06c6074c73d9f31a3ec3f26b16c1ca32ea17719ce788be7772d66058aa3a6ed8217cb464d4ffe600008c06d568a9f9 SHA512 37714f99219cdffb673bf79d349f6f190624cce3e29f939635af9e3d382342ce104f9f32798d706b588fdbfdf8c059fcc79d95a8616e91e166e94cd681448b61
-EBUILD haproxy-2.6.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
+EBUILD haproxy-2.6.9999.ebuild 6637 BLAKE2B 12c089f2fe233d9eb8cf9ec967a54051a978423876c62f858c9f63dbddc830c71e888c16b90ce4df01f47e4058be0de66517e94d4bfc75c2ca3180e85c17d000 SHA512 39be3a3e2fdf060ff22148bb350610a7719e4793c0f09ad96bb0023079a21c1bdc9f27885a4a2b58694a60b5ec05d85ccde54e26cdfeb5387321836a586d7ee3
 EBUILD haproxy-2.8.11.ebuild 6635 BLAKE2B e2589caadfcacbe0f5a4242b996ec786098367a1f41216b473f48b1bd42cd2f450c0ad35e80ce8d0a883bf037884a10e89b51c68324dd1ee80a865daf792942d SHA512 b6bc9eb2a374f981547f112469ac2022a02e71d6d65270943efa5afe418ccc7bbe4d4c178ea987589ae346d28f8c43aad3d6aab0a2713ac567f252324ca4ca08
-EBUILD haproxy-2.8.13.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
 EBUILD haproxy-2.8.14.ebuild 6637 BLAKE2B 6a2f34497377413b848306d17442c3100d06c6074c73d9f31a3ec3f26b16c1ca32ea17719ce788be7772d66058aa3a6ed8217cb464d4ffe600008c06d568a9f9 SHA512 37714f99219cdffb673bf79d349f6f190624cce3e29f939635af9e3d382342ce104f9f32798d706b588fdbfdf8c059fcc79d95a8616e91e166e94cd681448b61
 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.8.9999.ebuild 6637 BLAKE2B 12c089f2fe233d9eb8cf9ec967a54051a978423876c62f858c9f63dbddc830c71e888c16b90ce4df01f47e4058be0de66517e94d4bfc75c2ca3180e85c17d000 SHA512 39be3a3e2fdf060ff22148bb350610a7719e4793c0f09ad96bb0023079a21c1bdc9f27885a4a2b58694a60b5ec05d85ccde54e26cdfeb5387321836a586d7ee3
 EBUILD haproxy-2.9.11.ebuild 6635 BLAKE2B e2589caadfcacbe0f5a4242b996ec786098367a1f41216b473f48b1bd42cd2f450c0ad35e80ce8d0a883bf037884a10e89b51c68324dd1ee80a865daf792942d SHA512 b6bc9eb2a374f981547f112469ac2022a02e71d6d65270943efa5afe418ccc7bbe4d4c178ea987589ae346d28f8c43aad3d6aab0a2713ac567f252324ca4ca08
-EBUILD haproxy-2.9.13.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
 EBUILD haproxy-2.9.14.ebuild 6637 BLAKE2B 6a2f34497377413b848306d17442c3100d06c6074c73d9f31a3ec3f26b16c1ca32ea17719ce788be7772d66058aa3a6ed8217cb464d4ffe600008c06d568a9f9 SHA512 37714f99219cdffb673bf79d349f6f190624cce3e29f939635af9e3d382342ce104f9f32798d706b588fdbfdf8c059fcc79d95a8616e91e166e94cd681448b61
 EBUILD haproxy-2.9.6.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630
-EBUILD haproxy-2.9.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
+EBUILD haproxy-2.9.9999.ebuild 6637 BLAKE2B 12c089f2fe233d9eb8cf9ec967a54051a978423876c62f858c9f63dbddc830c71e888c16b90ce4df01f47e4058be0de66517e94d4bfc75c2ca3180e85c17d000 SHA512 39be3a3e2fdf060ff22148bb350610a7719e4793c0f09ad96bb0023079a21c1bdc9f27885a4a2b58694a60b5ec05d85ccde54e26cdfeb5387321836a586d7ee3
 EBUILD haproxy-3.0.5.ebuild 6492 BLAKE2B ed12e6f6eb8aac5bd755161c0939edad308d53f4707fa8c061a1ab4fde52f62818b3345e4b376a77e736b42302dbd82324cf30e7b1a6dd6156125f7dc86805ac SHA512 759a5f01aa06fc63151b26c3d6bc138e28f1ef3e1babe3b40e63e05572078d6a62323e0a7f6abf5102adf0ac97ff9860bc32d41972a821355449a2a89646c377
-EBUILD haproxy-3.0.7.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
 EBUILD haproxy-3.0.8.ebuild 6494 BLAKE2B 7c392ff216ce69c66d37dbe56b919ef5a348b181dfd65de5b18968de722e5d9c6fc3bdd22cb21caefb0174344f9d2b5a48feaed125e20c34add214688c57db48 SHA512 fbba451072fc13e80f168770bda9e3ccbe40dde8ffe063aa0a77ca568755442a2f180d1c6bb0d3932e42f201a86bdca9500329e886d1859c3b6aa7a1ebf57d16
-EBUILD haproxy-3.0.9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
-EBUILD haproxy-3.1.3.ebuild 6445 BLAKE2B 33dc145de230296dc79dc0b9433be05c347052f3350be63b75efc74655398140e60bb18779906f78f20a13d35e2fef098ccd9d24b248f74c6aafa37ddf4f0bca SHA512 c04379ab9b775333a2f28254940de854c7df0175e41d2c288e5e34715a6c62ea163a2b0af4cecbe91f3662c07ca0470f603aead6d7891682845555e972f998dc
+EBUILD haproxy-3.0.9.ebuild 6494 BLAKE2B 07d8345e7a8e3232d88a3657525e6588e0daa094d333856ba62f84aa3f61bc57f751168eebaefb486e23f1a25a2ab2fc19fe416908a2571f2bf7bd1f2a51374d SHA512 1bd49fd889bdd1833ec79ab5f2f1e60c8053636188d019542983a513bb35cee1d17cb8ddf481fc0e20aa9467e958eda4152ab20ce42e8a2fb48941069602060c
+EBUILD haproxy-3.0.9999.ebuild 6494 BLAKE2B 07d8345e7a8e3232d88a3657525e6588e0daa094d333856ba62f84aa3f61bc57f751168eebaefb486e23f1a25a2ab2fc19fe416908a2571f2bf7bd1f2a51374d SHA512 1bd49fd889bdd1833ec79ab5f2f1e60c8053636188d019542983a513bb35cee1d17cb8ddf481fc0e20aa9467e958eda4152ab20ce42e8a2fb48941069602060c
 EBUILD haproxy-3.1.5.ebuild 6445 BLAKE2B 33dc145de230296dc79dc0b9433be05c347052f3350be63b75efc74655398140e60bb18779906f78f20a13d35e2fef098ccd9d24b248f74c6aafa37ddf4f0bca SHA512 c04379ab9b775333a2f28254940de854c7df0175e41d2c288e5e34715a6c62ea163a2b0af4cecbe91f3662c07ca0470f603aead6d7891682845555e972f998dc
-EBUILD haproxy-3.1.9999.ebuild 6445 BLAKE2B 4da01b7dd748aad9d1b99e4f8f950a12231c800d48528de14628d884d203ddac6866b3d41d787bbbffd85c236da437430cb5a4920fa39e9bbaea43e5def11f7b SHA512 faefd0aed3fee36304dd6b4de9873d8de5db5f9de62863599a21eea09b2adcb58c10ed19df821fe8ba728149d3031e84b8fa91c0d7b2c4731f8af8e9c8ee821e
-EBUILD haproxy-9999.ebuild 6445 BLAKE2B 4da01b7dd748aad9d1b99e4f8f950a12231c800d48528de14628d884d203ddac6866b3d41d787bbbffd85c236da437430cb5a4920fa39e9bbaea43e5def11f7b SHA512 faefd0aed3fee36304dd6b4de9873d8de5db5f9de62863599a21eea09b2adcb58c10ed19df821fe8ba728149d3031e84b8fa91c0d7b2c4731f8af8e9c8ee821e
+EBUILD haproxy-3.1.6.ebuild 6445 BLAKE2B 01f0d035a2572d98c60df28435ea1c3ffe86cd1f30914a3408a2c98a94f48ce526a3d7db8184b87e7cca148b8e8e3f086d9f4b947e907d15760c6d11bd88324e SHA512 d8e0d60296e6c7fb21913a08d41e822b72b6470d04766e9c14ba58e6ee3427cd3cc785554c30632b54803b2005b7417d77804b2b1919c139806202a0cb9d82f9
+EBUILD haproxy-3.1.9999.ebuild 6445 BLAKE2B 01f0d035a2572d98c60df28435ea1c3ffe86cd1f30914a3408a2c98a94f48ce526a3d7db8184b87e7cca148b8e8e3f086d9f4b947e907d15760c6d11bd88324e SHA512 d8e0d60296e6c7fb21913a08d41e822b72b6470d04766e9c14ba58e6ee3427cd3cc785554c30632b54803b2005b7417d77804b2b1919c139806202a0cb9d82f9
+EBUILD haproxy-9999.ebuild 6445 BLAKE2B 01f0d035a2572d98c60df28435ea1c3ffe86cd1f30914a3408a2c98a94f48ce526a3d7db8184b87e7cca148b8e8e3f086d9f4b947e907d15760c6d11bd88324e SHA512 d8e0d60296e6c7fb21913a08d41e822b72b6470d04766e9c14ba58e6ee3427cd3cc785554c30632b54803b2005b7417d77804b2b1919c139806202a0cb9d82f9
 MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121
diff --git a/net-proxy/haproxy/files/haproxy.initd-r9 b/net-proxy/haproxy/files/haproxy.initd-r9
new file mode 100644
index 000000000000..4b2ffb07712d
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r9
@@ -0,0 +1,86 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/sbin/haproxy"
+
+pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
+
+configs=
+
+if [ -z "${CONFIGS}" ]; then
+	if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+		CONFIGS=/etc/haproxy/${SVCNAME}.cfg
+	elif [ -f "/etc/${SVCNAME}.cfg" ]; then
+		CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
+	fi
+fi
+
+for conf in $CONFIGS; do
+	configs="${configs} -f ${conf}"
+done
+
+command_args="-D -W -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	if [ -z "${CONFIGS}" ]; then
+		eerror "No config(s) has been specified"
+		return 1
+	fi
+
+	for conf in $CONFIGS; do
+		if [ ! -f "${conf}" ]; then
+			eerror "${conf} does not exist!"
+			return 1
+		fi
+	done
+
+	ebegin "Checking ${CONFIGS}"
+	$command -q -c $command_args
+	eend $?
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+stop() {
+	local _t _pid
+
+	_t="$(mktemp)"
+	for _pid in $(cat ${pidfile}) ; do
+		echo "${_pid}" > "${_t}"
+		start-stop-daemon --stop --pidfile="${_t}"
+	done
+	rm -f "${_t}"
+}
+
+reload() {
+	checkconfig || { eerror "Reloading failed, please fix your config(s) first"; return 1; }
+
+	if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
+		einfo "Calling user-defined reload_seamless()"
+		ewarn "The user-defiled reload_seamless() function is deprecated as it is no longer necessary nowadays, with recent HAProxy versions. If you think otherwise, please file a bug"
+		reload_seamless || { eerror "reload_seamless() failed!"; return 1; }
+	fi
+
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal USR2 --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-proxy/haproxy/haproxy-2.6.20.ebuild b/net-proxy/haproxy/haproxy-2.6.20.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.20.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.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index ce11ece1a066..b8adca997201 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -160,7 +160,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.8.13.ebuild b/net-proxy/haproxy/haproxy-2.8.13.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.8.13.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.9999.ebuild b/net-proxy/haproxy/haproxy-2.8.9999.ebuild
index ce11ece1a066..b8adca997201 100644
--- a/net-proxy/haproxy/haproxy-2.8.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -160,7 +160,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.9.13.ebuild b/net-proxy/haproxy/haproxy-2.9.13.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.9.13.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.9.9999.ebuild b/net-proxy/haproxy/haproxy-2.9.9999.ebuild
index ce11ece1a066..b8adca997201 100644
--- a/net-proxy/haproxy/haproxy-2.9.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -160,7 +160,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-3.0.7.ebuild b/net-proxy/haproxy/haproxy-3.0.9.ebuild
index 019b7ed1219f..8205a410b419 100644
--- a/net-proxy/haproxy/haproxy-3.0.7.ebuild
+++ b/net-proxy/haproxy/haproxy-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -159,7 +159,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-3.0.9999.ebuild b/net-proxy/haproxy/haproxy-3.0.9999.ebuild
index 019b7ed1219f..8205a410b419 100644
--- a/net-proxy/haproxy/haproxy-3.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -159,7 +159,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-3.1.3.ebuild b/net-proxy/haproxy/haproxy-3.1.6.ebuild
index d7bd5ede499e..ea3c85bbd20c 100644
--- a/net-proxy/haproxy/haproxy-3.1.3.ebuild
+++ b/net-proxy/haproxy/haproxy-3.1.6.ebuild
@@ -158,7 +158,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-3.1.9999.ebuild b/net-proxy/haproxy/haproxy-3.1.9999.ebuild
index c0bde0ca349c..ea3c85bbd20c 100644
--- a/net-proxy/haproxy/haproxy-3.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-3.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -158,7 +158,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index c0bde0ca349c..ea3c85bbd20c 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -158,7 +158,7 @@ src_install() {
 	dosbin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 967a4ee597ba..5b39e7b2472c 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,4 +1,7 @@
 DIST sshuttle-1.1.2-docs.tar.xz 8300 BLAKE2B efbffcda40422b76e18ad8e85b1ccd392a5ca342897d3a179b31b5f000954b2021c877680eda6a0aae70c8594704afb8a81599f2c79dd1c954665c437ad789f2 SHA512 b48896b48da2540e561fec10ae20a8b53ffc8df59c7917e7166f138b6c2ad2d3555949d9f10934886e3c6d5a062e20460e985c064b1502a3951149265c332956
 DIST sshuttle-1.1.2.gh.tar.gz 111767 BLAKE2B 7f2a63df0a6e2815e8787c6e02cd81924ff3d80d4b2309d8ebb875b49db33ff5b7b8c8249760b27a942f69db049c862041433099a06f009fe3532c4cb4493bac SHA512 c24a6490c1877b9ded8f5f4f44571953c4c204c33f0238c709ca32c7a581ddc919bfc48beb4fafd3a4d346cccd9b02dc7051b6233ff989a0ad329d55c1c5ec47
+DIST sshuttle-1.3.0-docs.tar.xz 8596 BLAKE2B feef646cd450b74fd635aa942a2858dd360ee081668629b7c8a88dd3fdd9ed862bf3b37689961964d25f90ae77fb31f1ce2a53633e126f1fc7ca8adcda73f1d6 SHA512 03430d700411e3dd7d69a1bc56abf5be19cc9d128e5f7f1e07bbba992191a387b2ecfc1ec872347ad5f2b46ec09c20565f276d8fa85afd2442f195581f313562
+DIST sshuttle-1.3.0.gh.tar.gz 137742 BLAKE2B 47d548f717ff0b670a48dff675fd0898c0ac28a89afb942349a0c4eeeb3ef9d2e78a42b6b065d3a69f1a2bb05518774b2c4c21126e9a29234acc347f8ec2b751 SHA512 5a3aff534c811cc5c8e6d46fd52fd019b0e79977c357f3903cd71a3315cc6a96ca0a9128cbf74be0874c58d79d328b89db702e252ce0b24202b79782528e69ab
 EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B 262310d7f620e32f502688e05d8813800307115c26e5c1577c3361bb2462bc966c48dfb819e135491082ffc310f471e67db19e2d10540491c6858a9fa7483cc7 SHA512 87bbc5ce6d45eed71dd3e65c36bbebc5629feb111fec73ab081baf3b635a0f2593617836124ae686158fc290b695fbbdf7f8d5231e50b77f84272cee0597195c
+EBUILD sshuttle-1.3.0.ebuild 2053 BLAKE2B 6e09c239efcb3f3d90505ecad7c5fbf97e65dd531c4717e5c3fabf8aeffdb39db82ad938a9e464cc0dac88b87825b90d5255fb3e805079d91eca543af5b0b56a SHA512 8b2d6395d094973d10a9e85b413013744f5ce5d94a967c8ddd60c99f106bd8a4f3db3c8d81ec655806c0624466f659ad1bb63655b84dde908188b366223de68f
 MISC metadata.xml 368 BLAKE2B 8781826aa94f38296cb3c0ef628c931875cf7d8c1f3080970be16c3dd01862d067d4051f4d2c271bc63dd9260c4652ba5fd48002eb5747eab68ba9f02a6a3629 SHA512 a4609eb161d14b0b12d93406a257774465e377c432731cd6d72267baa3396545f45e5df9a16577ff143254797e872aa988213af190d47134d9f09de8d820b6d2
diff --git a/net-proxy/sshuttle/sshuttle-1.3.0.ebuild b/net-proxy/sshuttle/sshuttle-1.3.0.ebuild
new file mode 100644
index 000000000000..925f9ca23dc8
--- /dev/null
+++ b/net-proxy/sshuttle/sshuttle-1.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-sshuttle-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${SSHUTTLE_DOCS_PREBUILT:=1}
+
+SSHUTTLE_DOCS_PREBUILT_DEV=sam
+SSHUTTLE_DOCS_VERSION=${PV}
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+SSHUTTLE_DOCS_USEFLAG="+doc"
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 linux-info
+
+DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
+HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/"
+# No tests in sdist
+SRC_URI=" https://github.com/sshuttle/sshuttle/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+if [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${SSHUTTLE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${SSHUTTLE_DOCS_VERSION}-docs.tar.xz )"
+	SSHUTTLE_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="${SSHUTTLE_DOCS_USEFLAG}"
+
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+		dev-python/furo
+	)
+"
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	|| ( net-firewall/iptables net-firewall/nftables )
+"
+
+CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Don't require pytest-cov when running tests
+	sed -i "s/^addopts =/#\0/" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc ; then
+		emake -j1 -C docs html man
+	fi
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${SSHUTTLE_DOCS_VERSION}-docs/sshuttle.1
+	else
+		HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+
+	distutils-r1_python_install_all
+}