gentoo resync : 20.03.2021

21 files changed, 207 insertions, 36 deletions

diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index ed4136735777..dd76cd3b13c9 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,4 +1,4 @@
 AUX 3proxy-0.9.0-gentoo.patch 1426 BLAKE2B 221bc5e87ae399ef621e687f03fbbd57a1f8ecce74e7ec0ed57f9536a4d8195563b00f4249769fe8ba3a736fc0cc5ca0441d5b879da575c3aa888d912ded2c4d SHA512 183d45fab08cf86d542f49844c8cc3e0930cc262bd928722ef021ab4bda21542f30587d3c1850d89caffc29059f7e3b5b2f22f1b5bdab15d916556e7af1951ee
 DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83
 EBUILD 3proxy-0.9.0.ebuild 919 BLAKE2B cdafe11efccb3df2faf230c4c9442f7a8603cdabd86cd3f7f52f81029c75fd6913de09d04486e31bbbca0a98c34a6801a89bf72fc4c913ad3077a99e6557d553 SHA512 a5717bedc448ba3a8719a8538ed6921ca6d9f8906aa2ca6066b3de3fa9bb7891d677b1f790ee15a01f42986f1e2ed1bb4d0183193f0038ef8f53eac605d43c24
-MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076
+MISC metadata.xml 1132 BLAKE2B 1111b34c8dc16b40a6dc6a794f1d11bc91c42a94a95874b598764b76b1690967d9b9f816f4529b4c0fd9803c2f30e4ef2a3f19d643645495c277c45c61544720 SHA512 916802478d4c216f27706feb20c186f703ec349b4d47d45f5384a766630167807a176c1cbae053457551564e5428df627c354d7a0456314c51f437d029a84d2e
diff --git a/net-proxy/3proxy/metadata.xml b/net-proxy/3proxy/metadata.xml
index f9ccb9ec7eab..f86063109ab7 100644
--- a/net-proxy/3proxy/metadata.xml
+++ b/net-proxy/3proxy/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>powerman-asdf@yandex.ru</email>
 		<name>Alex Efros</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 77ac59461f65..1a0a3218cdaf 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index fdea9d63c929..2de73b34c4b7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,31 +2,33 @@ AUX haproxy-2.3.0-hpack-VAR_ARRAY.patch 1230 BLAKE2B 282f82e498126771c3837f2da3c
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 DIST haproxy-1.8.28.tar.gz 2211162 BLAKE2B 81123750285a34891248fad675511c372aa87ff5047b2d7d8635984a7a71183ee2b3fce78c42a999424b70b1ee5d8a26b46bbe9dec1e951ed1845332bc566109 SHA512 67e7ff9bb5cba7b2ca2274a9fe72397d9a9c85257acdb963f20988db3760c0cd2deba09022b95df18d8a90601c55bd83fe7282fc0a124c796c54714788a39794
+DIST haproxy-1.8.29.tar.gz 2213262 BLAKE2B e63a437fce005f08615bc87937a7a38f404845f1d73fe1b06881c26ee7ab2577af2a409cbbd4df89b54274589780c13e1b750f37deaa31d27dd866d36464e767 SHA512 dbdb0c47d94cc332cb7a20558ee50b6e96781295af36f4e342799db8f9254f8a4b4f11d91004405aca4ece6d3d43b66d93f8a979238507e3db7a7c37af1573d3
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.0.20.tar.gz 2693943 BLAKE2B ff09ca70ed0644c190af73b691aeaced1b491289cf7f4d05dace9cd469bb47f6e8507fc210936b0489867f7e799220278a2b8076b2ee0b87b58e2bd62f1af9ea SHA512 804c0e46f2aa0495b796710335c9080c17b98ea0fa2d60a65eb3cdc51e960a76a13b4c34945ebed75766088836e80f8e5c8e40abaa8caf2c5a5cc4a449d1eb2b
+DIST haproxy-2.0.21.tar.gz 2696549 BLAKE2B 97f211a768006370d85c0b2bda539440ac26051d445d3430a8fbaa135692165fb3ce32e998fcf54e669d9a2e08a23526a769b841fdd36b69d484ec86812d0a6c SHA512 a2273928568ca27d164a9bfae579a4635afa57f8d52f576073758d26a60973bb713a49fbafa6173e3130ca5712efdbf4e214bf85b7530b23eb523b667848f588
 DIST haproxy-2.1.11.tar.gz 2726723 BLAKE2B eef039eaf2808aa7a9b824ddd8e5e25623fc2467d541d5c24f71e7308c167c8eaa8fa6f7356250388c40802aa0581ae02f370b973e8f1169048dea7a7eaea3dc SHA512 59c72cd5154a387849e3dbca87ef5a635508342e7690c5bfa2d325bd6c5a00786f3dc834903a8b81a35ea90d05694eaac17a87b17235ba02cd6657acfec9c69f
+DIST haproxy-2.1.12.tar.gz 2731180 BLAKE2B fe1d586c5f6a7844606d4b8cd8cb810464f0d7d5615d53e7d53e8d45eb383021952e419e2f00a9277dd9b92d2c62dad60db9dd7ea9a87e21a04c960287c05cba SHA512 e33735311b0c7f349d5f6aa88fd69e1e9838c08fdf793f6e0d27779cd0c165d9a85022c778be880a8284f62c3c511c2b2d16374bf466268c902045631a4fbff1
 DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
 DIST haproxy-2.2.10.tar.gz 2904903 BLAKE2B cd9f3cce6797349190b1502377a25d72a75ea8bae53993ed43cba6b434efcffaf77336be383c131fed88d864eff4d9eda788b7ebc74bdeb2182a1890ebf93527 SHA512 b32d1f06dae6df1f266a6ea329dc1769db7153d373e778b7fc7406242b7b70b8e6dd0b9b2b9e38c9484d5f2528e35cdbf10502fab447deace12a5f9d655cff19
+DIST haproxy-2.2.11.tar.gz 2907128 BLAKE2B 76ce4d75e6be1b3e169fe1f2a3ca4dc104f7b0a7af308e1713ce7c235e45525d094bcff71853de9d78e9b6d32115b96616d3d86fb72397d8fdf7d70f375f2547 SHA512 bf05666a712710a1b99e6014a97aceb0a3e9a3184afdaaf2ae4454e8f444f6b85fd855c41c211882e8158d5939f81f1da2dc8468a6a778914e6caa4a9246a5d3
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
-DIST haproxy-2.2.8.tar.gz 2895932 BLAKE2B ee918f3f9e05a99266bc27507daf5b42073ff4b51708db052e3cadc10bbd5de0f9e458925ef47ce4ddd30e1d7c292d82092d9a4cb971c18eb0577b94c1c144b3 SHA512 acbdd0b9d186b7d54a161247ae3e35017a8646ac2724ae8cfaa662b4dfbe495e0b321142d7b5a7af5c71a817cfe8156aa8ec5980a64f3d88bc5c5590b9e88886
-DIST haproxy-2.2.9.tar.gz 2900486 BLAKE2B b468d71c3caaf660b5cd3aff0d6113adf169dfb26254d7d759eb6f979a41e0ebfc754956d914391f0463ba6989609b0cc0c33bf46e34e8472fe471f8020821be SHA512 579af88b53c626ff05facbe452e28e3dc8195579be7c02c0b64d2a241332311b41ff3f0b38557fe342d663d4b94be1e0812db6804042139cef943cfa79b8a246
-DIST haproxy-2.3.4.tar.gz 2909672 BLAKE2B 4d1b3e6aaa13c30385056c4cefe86c5bcdc98cd34a94ea388a115e2fe547242fb68a9e4b2e22cc4990db16c76eb220d52999209958409bfda7a777eee587b947 SHA512 b6db7f6c573f700ce5e2f533c6b60c5e5cb15fbc31057f3e98c03144c52b87612420e962e5e8ba63176eb1b7459a956c80a0403e9189cb3fde1dcef5bfa64ac5
-DIST haproxy-2.3.5.tar.gz 2915064 BLAKE2B ce52ab3226bb03a39aad7c94f674b646eceaaf78be1e20fd48b9173fef6cfb9e8ea1db9cec9944b7c916d317efab8339f08a20b376b4331e0744bd9d4d26a03a SHA512 1d7d191b72157b9b504fd5b58a50225c737491b03b1ed52de4eb61e0cc7898abae298a1fee1c3a576a7de88dd6df5f0630906001046d26c0dfa3c4bf0cd0de50
 DIST haproxy-2.3.6.tar.gz 2918082 BLAKE2B 52998996c48b1ba9aaa1437ea2c5bdadda00dce58a7c1cbbafe686997a3b6fe03622986c3f5cd4dd7e3a982047e1a7c295ce6e6de2a65d36546b5e6dfff07800 SHA512 46000e08698db7a25d37b0a7e49b8c69e41eaef3cf17ea21bfda5075737110f682b8454196a72f09932a8c0bde0321e8cd075169cda840e2283aeb38bbbdf719
+DIST haproxy-2.3.7.tar.gz 2924802 BLAKE2B c2f82a49e7422b36f5af5568790002f2e5761adb971f4692406b8573035245782b155f6f05cd388400476f1af3734284dccf9922ba8a04ee3497dbf03d926bab SHA512 ba567294c61dbd19c178acace8804979fdb26384115e77a4eb88444fa9d45b1c62f22a171efafeeba027ae65f3a70fb67b7a3f84042eada025b6cce3b9ad62ec
 EBUILD haproxy-1.8.28.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
+EBUILD haproxy-1.8.29.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
 EBUILD haproxy-2.0.14-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
 EBUILD haproxy-2.0.20.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.0.21.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.0.9999.ebuild 5239 BLAKE2B 3e890c8af0d46e57e321b2942152ef13ff35a20f2b4250d1c1e7f7689d35c51c49d84b9fd3a95256ca0b1870577e40a500bee1b5d0a8f4676185b33a3a0f371e SHA512 5831d7d419c71d4ccf32a37be69d4409b35764c45684e4d795edc538c3c8fc029d63773f7ef64c93ac7f7b233d15b443186e656c12bc2daca8971c18d06693bd
 EBUILD haproxy-2.1.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.1.12.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.1.4-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
 EBUILD haproxy-2.1.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
 EBUILD haproxy-2.2.10.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.2.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.2.5-r1.ebuild 5417 BLAKE2B 21ad458ae0384f80859a1aea97d03671ddd001c60876fd9c0d596ad25da28e8c12a9e330ea7afcf3bbf68941fceb2995853f9a2833b3c6acd8bf5237454599b8 SHA512 1ef5ed092ce62f2b21bcd04e7a49ad3dd02573d6ddb9f87b54fe54c8b27b4b82fa19a267aa75f3ab09a8cb839cde6df8677a1959492f99a2ca83b316467392bc
-EBUILD haproxy-2.2.8.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
-EBUILD haproxy-2.2.9.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.2.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
-EBUILD haproxy-2.3.4.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
-EBUILD haproxy-2.3.5.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
 EBUILD haproxy-2.3.6.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
+EBUILD haproxy-2.3.7.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
 EBUILD haproxy-2.3.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild b/net-proxy/haproxy/haproxy-1.8.29.ebuild
new file mode 100644
index 000000000000..038c860b3686
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.29.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.2.8.ebuild b/net-proxy/haproxy/haproxy-2.0.21.ebuild
index 09bca46c32f8..09bca46c32f8 100644
--- a/net-proxy/haproxy/haproxy-2.2.8.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21.ebuild
diff --git a/net-proxy/haproxy/haproxy-2.2.9.ebuild b/net-proxy/haproxy/haproxy-2.1.12.ebuild
index 09bca46c32f8..09bca46c32f8 100644
--- a/net-proxy/haproxy/haproxy-2.2.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.12.ebuild
diff --git a/net-proxy/haproxy/haproxy-2.3.5.ebuild b/net-proxy/haproxy/haproxy-2.2.11.ebuild
index b7ea2373967e..09bca46c32f8 100644
--- a/net-proxy/haproxy/haproxy-2.3.5.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.11.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
@@ -94,6 +94,9 @@ src_compile() {
 	args+=( $(haproxy_use wurfl WURFL) )
 	args+=( $(haproxy_use systemd SYSTEMD) )
 
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
 	# Bug #668002
 	if use ppc || use arm || use hppa; then
 		TARGET_LDFLAGS=-latomic
diff --git a/net-proxy/haproxy/haproxy-2.3.4.ebuild b/net-proxy/haproxy/haproxy-2.3.7.ebuild
index b7ea2373967e..b7ea2373967e 100644
--- a/net-proxy/haproxy/haproxy-2.3.4.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.7.ebuild
diff --git a/net-proxy/metadata.xml b/net-proxy/metadata.xml
index 32488608746e..073272b1ee8e 100644
--- a/net-proxy/metadata.xml
+++ b/net-proxy/metadata.xml
@@ -30,4 +30,3 @@
 		Kategoria net-proxy zawiera oprogramowanie związane z serwerami proxy.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 13957db52b84..d268968f6575 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,3 @@
 DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
 EBUILD mitmproxy-6.0.2.ebuild 3113 BLAKE2B 1512ec1be8f45885f334b91363fa2cc61b46cf56bcd3a713bb6a760712d4862e745304c190e63b8babb7c2990c38176dfc014e7111349e3086452e94670addab SHA512 d2ae20195230d170131edce5fae35a01e9a54ab41eb8928f8a832d4cfad0297066fa320ba47ef0bd84914324462389399a031801529491abe570cb1442798c15
-MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
+MISC metadata.xml 1065 BLAKE2B 55b5f921dc3e44fe0b1b1a0957fe579d2c358996e4a0f6fcd352303e93749859474e56d639a4cd9f6ef152588c445a7bc88b58841209f6c64761a77f61865e31 SHA512 f5042a78818a1e00fb2157919aa9c6918a953fa55d775b8fd52f6549cbeefc138fd525c9c885186b4b047efb2c5b4d46e74cbc93edd3280a4220fc49b3a7f4e5
diff --git a/net-proxy/mitmproxy/metadata.xml b/net-proxy/mitmproxy/metadata.xml
index 1d76cc4073ae..c07ea5906c9b 100644
--- a/net-proxy/mitmproxy/metadata.xml
+++ b/net-proxy/mitmproxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>matt@offtopica.uk</email>
 		<name>Matt Smith</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-proxy/sqtop/Manifest b/net-proxy/sqtop/Manifest
index ed00dc99671a..75928dd510ea 100644
--- a/net-proxy/sqtop/Manifest
+++ b/net-proxy/sqtop/Manifest
@@ -1,4 +1,4 @@
 AUX sqtop-2015.02.08-ncurses.patch 994 BLAKE2B b60260392ddfcc501c3412c8788ed069303ecc58a7846943cf52f6d82edab021fb8a3fd8f3429c69dfe3334f147f441ca176932d48a46c54201aa0d62ef59fca SHA512 a6f2a8516ca58fb37184495ddd1e500f42e08c72b03ae55aefc1d1ce587801e2ef62a507e3edf5822544cafc189bd624efde01b07d4e100e536b04975cf82679
 DIST sqtop-2015.02.08.tar.gz 154535 BLAKE2B 4825a254670e5336acbddc8ffb50c7a423614c06fcf9b69b354e3ccf88496bde17ba586bf45cf062a4da40e2332b84a611b50582e425278a259cc27a23f53f7f SHA512 35911b2d4aaa6364ec52bb55264372378b4a458268cfc2e03884660576014739a55e255eb751a9be54b70d4504f16d095b6cf9db08ff5889d52fd2a46ab2033a
 EBUILD sqtop-2015.02.08.ebuild 549 BLAKE2B d9725e8fdea80cda5f964c8be21d36ff0f4186ba3c5560b3a74f6644c1e86d1b6c25e979dc7df5c3c09dfe44d90a761b4823b58f9fd9c3b7b537d86136eab1e7 SHA512 dca409a3d9af43a430439ed529957544d17a51baf60959d7a8dc7968801ee0ffcecd4cce8143a29c56d58f63c57b73d397d01f158d70109d647d9ae02a7ce7d6
-MISC metadata.xml 545 BLAKE2B c2cad7b255d8a4d69293b31c1d4049bebc4dab2a5a8035196a87ac5cfc346f3abd625b1113e92f410bfb195ea16cc0bbd28e809fe148bc8a0060b241539a0e9e SHA512 37585b61eab296899a5b85ee9ee881dc12e38359d8dc0bbe8fd246a317e0c7d05ba0ff658d3dd7461a59c0e9fc9d4b7278b732e6b92e5ceeea50ae079aaced95
+MISC metadata.xml 540 BLAKE2B 18d3d6cfa9c79be051b8bcfe05bd150f2979f310014491fd74eaf2def9cfc245e8842276ddf5dbfdf3c3b6d4f7cb43b353d798ec364ee04e0efc841d85f9fd6d SHA512 2d393ff9dddc0f4e4729476990a0c2b4c3d32d6ef551cd62eaf660366f2f938bd28e093cf3e313630861c0d6290c4705c42e6a50c0e8dc250ca24d962bb6b2a2
diff --git a/net-proxy/sqtop/metadata.xml b/net-proxy/sqtop/metadata.xml
index 3188f79afec6..58d27b2f453a 100644
--- a/net-proxy/sqtop/metadata.xml
+++ b/net-proxy/sqtop/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
-		<description>Proxy</description>
 	</maintainer>
 	<longdescription lang="en">
 		SquidTop is a program that connects with Squid and shows a live, top-like display as to what Squid is busy processing.
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f9ca2058af85..5131549408e0 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -6,6 +6,6 @@ AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f48
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
 DIST squid-4.13.tar.xz 2452752 BLAKE2B e2efdfda736f2324c6723e76272c4989a41fa6d0f52b48cc33957ae8e57e75350487d9683fc72c43926e5d91b698eef728282895018b78acefe23de2e67cfd74 SHA512 06807f82ed01e12afe2dd843aa0a94f69c351765b1889c4c5c3da1cf2ecb06ac3a4be6a24a62f04397299c8fc0df5397f76f64df5422ff78b37a9382d5fdf7fc
 DIST squid-4.14.tar.xz 2452892 BLAKE2B be8d8fc17b6b762faac0e6fbb5e428fc48b3f958b27f9da9eb941315c22185d34edb9fec73518626b6d5a7206b43f209638dc6bb874d52d6e183e5646874a668 SHA512 3509caea9e10ea54547eeb769a21f0ca4d37e39a063953821fc51d588b22facfa183d0a48be9ab15831ee646e031079b515c75162515b8a4e7c708df2d41958b
-EBUILD squid-4.13-r1.ebuild 8363 BLAKE2B 191c4ae5b5711aad2485173760f535dd4b36e02b49f23f5b394831510669533ac6ed1c8467d56651c90bd7faab07141efb34c5fb2347f1337a4209092700ad6e SHA512 c1e272f8ed510e9199ece9e952c18fc96d5c0a2e7bd7d301efaf99f0c89a4ac0c81f865eabc750fabc467b9719713cebd1410c72075568c699ba301ad6e3c358
-EBUILD squid-4.14.ebuild 8368 BLAKE2B 7cecd979db250eb02b6d7ad09ae544013a9c5adbb56e8f182b7a1c432b1d37c4df2367a87b594b2b02edb5764886996e9748cbb33d522176ace3961fbd611782 SHA512 ed8a2854af15518dae29cf210b134affa14b56fd46468e9c7e6c6de5c8bf8c6979a1662703db0d2e6954e724420687096ed68e0e2b7a8c9e16a3806f21f2e363
+EBUILD squid-4.13-r1.ebuild 8341 BLAKE2B d447060aeed4f41e59433f76c539033df3844b78035d1ef8d55e8ff626930e1d55b1334f105ed8abb6d3afd7d5b107d994aac01ebaf6e0c8cec4b8efdc154bba SHA512 e2bd55da9c76e8dca34d86097a6cba04c859885632aa30ce977ec331a62be9be00cf0178e8b3779b66005b91006e7f13f1444fe5cab99d4c588a76fabd7f9f6d
+EBUILD squid-4.14.ebuild 8346 BLAKE2B 42885b35dc8d188515d6cc143ff0dfd2ede4b4ac95d4036c652761b2b5910d8933e189fc411126f4045d216c51da935c28c92370c4b0aa8bbcb2a1aecaf13290 SHA512 517b4187ad5827c4dc8a03b70f189cc9fcce598c6c2693ca7ba662d2de1c3223970d3b1f10d99c3cfdc8b2073ac0dabed5a9c913b2eab36230a66ef0c9a009b0
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/squid-4.13-r1.ebuild b/net-proxy/squid/squid-4.13-r1.ebuild
index 3b6b5c6f58f4..ce0034568696 100644
--- a/net-proxy/squid/squid-4.13-r1.ebuild
+++ b/net-proxy/squid/squid-4.13-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-WANT_AUTOMAKE="1.15"
-
 inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
diff --git a/net-proxy/squid/squid-4.14.ebuild b/net-proxy/squid/squid-4.14.ebuild
index 9f2974e7de31..68b0c1d35014 100644
--- a/net-proxy/squid/squid-4.14.ebuild
+++ b/net-proxy/squid/squid-4.14.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-WANT_AUTOMAKE="1.15"
-
 inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index dacd427624e2..2a816e293860 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,3 +1,3 @@
 DIST sshuttle-1.0.5.tar.gz 88823 BLAKE2B 6a68be71a92c8245e2e60df1f425c6959547f8c2b972bdafcd774449c3779698c2549f2c7a3575c102158962ef9dd2edaaecec564f36f7f5cc84ed3f53b3daa3 SHA512 a9ebc8f8cf5ccc351796c2eb5b224b5d76908d23a367b768fa4e7b9cd8517ee7ff9c232c92ed4332f46d02d890ad8114f8beaa66876a8c0d7d4850c18ff4c2b3
 EBUILD sshuttle-1.0.5.ebuild 1251 BLAKE2B 5dbaf04536eab669f1525d69c5c58948c8d8abf9bd8b5c51a62949683cbe2dd4df2a6692f8e28de95cbde3de95c57bb83984ae0986da80ad86cd5b0db0e3f012 SHA512 9f6116c3e7483e8101b99a2e99fc91b3280199a808c5060588b162f9bca0dc41814eb1e8e55fcd1484e9fa9da0cdf7f466365d818d561b11c25697de8d79bdc2
-MISC metadata.xml 302 BLAKE2B aaef94f4b028c3f346523d5bbd42876e24fa82ab119c03a3db5c1ca40237efdbec97377b27584d3c307491a1c542d1194ac066a8c532cfbdf1ff9a9c1d06a6d3 SHA512 7e81df3d00fdf3c231e968d844a693c3d90e6e64c73f90b93d437331a2dafbc5d4f48bcb46596f9efb36ecb2c1d16ef2e37f50bdf8fa8e41e3a0ae3e3eff3985
+MISC metadata.xml 367 BLAKE2B e6db2a33d62c995db709010a0ebe2a50dc0307a1e9d7f5554d4a7e95f571b9323277bb7842394ddfda09f69b7d6f7cad44d31f6e3f233dbd488a951a225ea242 SHA512 cd75ae162e2d7142e3af61e9df65d5bb9f1b857ac299d5f05d7f1b2bf7adcf1b05fd55496ffbb4ed9579a3fab31f16295793a50c0475c75d6c7348d4c7794e9a
diff --git a/net-proxy/sshuttle/metadata.xml b/net-proxy/sshuttle/metadata.xml
index 7597a9dccda3..b08f0112cd6f 100644
--- a/net-proxy/sshuttle/metadata.xml
+++ b/net-proxy/sshuttle/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">sshuttle</remote-id>
-    <remote-id type="github">sshuttle/sshuttle</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sshuttle</remote-id>
+		<remote-id type="github">sshuttle/sshuttle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 860228e347ad..5c3b3342f375 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26c
 AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
 EBUILD trojan-1.16.0-r2.ebuild 1401 BLAKE2B 21d9c6dd44b740e96589dcad0b66d5cb5bbd0d92d9b8d19eefcc8e4860e1181ed3ceaa34126a11eca86d8093c41a77de01c3e819bc254ec5bc9ab051eab185fa SHA512 720b67a3c3a3b1eb1f599d94399e1f6d88267b949c002dd925f881b754fc180234d6fa30c47b239998b39058f1074c01ce0a2fea84180c4880d283ba54e62234
-MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30
+MISC metadata.xml 1154 BLAKE2B 1c11e1bfa8e0e6145f64eab2da457caccaf5eb610d2d58afe122bcf108b672264e01d1d69683ecf43a42d0c4dacf59ce82dc128b8f6bab954b6f154bdfc880e4 SHA512 ed2cb5b0305317aae0b1f32a59d0b283b1e2353bec1f5b2b444e1cef6a535f093d23d585c63512fa4f77ae8b734f5d8ddba833aa9b71f6361219bc0b194e8744
diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
index 097dc1718605..b8f40b3acec9 100644
--- a/net-proxy/trojan/metadata.xml
+++ b/net-proxy/trojan/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>yangmame@icloud.com</email>
 		<name>Xin Yang</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>