gentoo resync : 04.01.2022

8 files changed, 100 insertions, 158 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 1ae7ef8f2980..af51b0cee45e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 861c0cd18d53..1387dffae8ef 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -1,3 +1,5 @@
+DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.0.20210721174708-390f27c3be20.mod 40 BLAKE2B 895e3b61e3e272387257e288b70e2a7d461c0de2ed2284e1909ac2bf2eedf841246e175ed848174ec510c53ae207d801cff7a39c560fd2b0c0b4dc08c67f4856 SHA512 2a56ce66f7ba29cd8f975014291690c2f929738a4a8b93529c2c367c0236b767f92e4f6dfda9fe1fdf981926302d7ab26665f7d64b022a22e5305aea693ad2dc
+DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.0.20210721174708-390f27c3be20.zip 50968 BLAKE2B 3660653454dc8bfae76169617e3e1bc5f1f791314b159331c97e7dc9b19fa1721fba91aa37cda19b902195e8851222010d1b88c02b88597860b91032f2c30f43 SHA512 1435eed0de11c7669d224488b9f6b28710a48c7b0a2cdb43b2a9ae4779bda5c23a0c1ff0b854f4c854ed4ec5862a4fdaeffbb28fdc9fcb50092a21e5a6484105
 DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.mod 45 BLAKE2B 2eaf520004fc4a4a3283bba8b12bca561c042fa9ac35be8d152f232b71f8431b099f452edaa2ecdfc54e56d8de989eaa46f1d21428fbd1431d6e52fe353aaed4 SHA512 7f919bb78329c34c2e2c667fd4621885fe8ef3ed7b916de65ceaf4d6fa739fb540c2f453a16cf6f5add0f0540d06e0c7cf1eb92a2d3751bba2cc26ea285756a7
 DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.zip 39367 BLAKE2B 451710920a0fb77caa7cc1a22284faced216d54eb0fe77d70e375ac063c91d7c5dde17a85bacecd06092f1dce7d28e19ddaa28408a95954e76c6c4d4fb4a2bf2 SHA512 6b0f5ab0b9d99f2bd1acf140a8d16ad247743a3989b1a69ef9377aefb860f6d73cae911aaf5c21a251aa668b45da946d6a82321bff9918efb8044794c69d5697
 DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.mod 59 BLAKE2B c741382a34677abe777f42d88210a2da3ba6dfaebc557e28d1a49a5f46822d94838469b7d7b72476b45b55b0c557ec132cbee805173c5607a6cfcd2b2e090c1c SHA512 15340017e0579bd8d102bda61ea62c5b894fcaca9f320efabacd7a2158fc2beb28b686302a3002b53765004e9a0be08deee8618f8ad662ddc2430d0b2d78d91e
@@ -12,18 +14,38 @@ DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 30
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
+DIST gitlab.com%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190805113838-0a714cd429ec.mod 106 BLAKE2B 9698cf1b08dd48a6c3b9b80920d192155b082bd201778854e1ff037ee7147c6fbc978952f6fd2715855717c5a12b8a08ef91d59b8e2c3c16c089a1d8f9e7f4b5 SHA512 1c223f68782486addb8088fe4ed2b847f50646691bd8f974feca7727fcd3430e3e7cf91b7af0a5c4c451ea65b249092c1e43ca353c96b972be6af7b6a2424f96
+DIST gitlab.com%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190805113838-0a714cd429ec.zip 39071 BLAKE2B b4190d9263ae0a1353d6708a1f2774372255d4d83f3b9a7ed2755a28d55e1dd148658c3f8e5537d15d28263b16873b03ac2cd96020dd05b047053fd145fc2b84 SHA512 7d3caeba6dcb8ebde89642affb2bbc0712945db87e4a322e777f60b1c4cf142fc1962257250840daea4089dad42239369316aaf3edc5f60039448a9133a9d665
+DIST gitlab.com%2Fyawning%2Fedwards25519-extra.git%2F@v%2Fv0.0.0-20211229043746-2f91fcc9fbdb.mod 194 BLAKE2B ef0e8bc542c278ce7b3dd1c62612a609130136c9b1fea83b6d77066273b16c413b5dd78382b03056483cb817f78160afce317a07b62b6dfa3af8eded82ebace8 SHA512 42237f8afffd3eda060f17b8da2de9705709037bd514868df28d4b13aee22a3e5aa5827498a3608f50e52b98fa608f454975420d1b142a6384b2e14309c96276
+DIST gitlab.com%2Fyawning%2Fedwards25519-extra.git%2F@v%2Fv0.0.0-20211229043746-2f91fcc9fbdb.zip 52334 BLAKE2B 2d44fa868b5db5cfc4f6b3978b299ad97be7e3c183d051b6d1afa7b42e0bc1177fc001a3c97ae91ac0bd1f3dbd03a164d781f4c3e6d70e6f807041b3cd767d60 SHA512 00f6a84605943b39d4ebd269eae6dcd525fe10456e8571fa99ca59d01e281aa89df5dd20dff36a1ef7be9d69fbc33a31cfd5053ddef7f97deb52ab241b8ff70b
 DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.mod 330 BLAKE2B 12d6ca5517b27cb05da57741c8bde2601c14a0fea76a8df627681038e03095cd3f9a6cc0975837271deaf469715b510ea8d04d943f8ded8a9b36198bdfcd5b1a SHA512 db40c5be3fa8f7320ec134b3b801022dbc1b5d80cc9eeeb9366724bcd0df479e702d72a42f28cd2c9353e35b2e78a2ad95c0b575bbb5cad0ed04fd1cb629c84c
 DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.zip 818363 BLAKE2B ae79d47071ecded190c34851f4e82786d7db51cdd8cacf664fac543b95a77a55e7d1a308b2b9b09eb40ae0dfe8d55e00d4c8928ded0ec798e5a52ddd3f777f53 SHA512 dcb0ef6aa71b7d88fc2a5ee2b197e46c33d490dabb84a0a8cead68bbecb5b8bc36928eeae691754a7771f84c9a48975b0971c335d5b5086a013549b42cd87f44
+DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.12-1.mod 256 BLAKE2B 7a1b8b03ab4bf73f5452cd62b9c9ccf030169af78bb2c3ad8f5a878c4661dc496bd6b5f2672207b9b157cfa230af09dc1cd9bfa5d94163259c202b20a4f12037 SHA512 e9f47fd67ebd544dfaafbcdc1ca95f350b958e3289c91a8c07320974ad1a413b9b0c280bda5246afb33886b92aed46df59c41cacf126b542fe310a8c5b9d321f
+DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.12-1.zip 826736 BLAKE2B 6c5d7fdbe80d759a8797c05f0f056fd5de02f5960ea11a637814cccebe368748944c2727db366bacbc04c772759a9048f94e213b64e74f4047977527aa93c86c SHA512 0e868676fcc12870293656da017637722a2b8596b7ecc86d03d5eb63a1e8e2ad29079ee18f1564d6df2846cafaa7a32580cb1f0124aa320a47c8214bdc26493e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.zip 1781592 BLAKE2B 13d91c26bc1b3f13d8deb7ce2572853fae269db0f8384f94a8b59436d3351cb79f2e2b3ce3664b5c38e696be8ee67a7860aaedacf3019aa94079c160fb991fbd SHA512 42da234a20b3c6a8cfc83b3dce98d3fd11c07912e79d7943bfe6fd8baefae4756cadf5ec1688d4227d7151653fab29fc4a27fd562766f9fb10c758602d5b6f57
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.zip 1874721 BLAKE2B f6374336811be4922eca9207154b37d67479968a570768a88d77c3fdaef70e4573e59ae3e2bc09e15262651e414eeb1d0c5a9c5faf558f013e355693cb1589c5 SHA512 dde077a273c3b6851385e64c5621a084287b92b62e2a96ef6586cc2fb7e8e84517a54ce1d6354a0b64d8d3df1de6c3081699730a30ca61dd0b082f0993725f86
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.zip 1276380 BLAKE2B 95b24bac24917089c0140ff02154cdf170b1d459cf77b0ca11b15c778040d58e1b4369d7f7c5e913cb3b19b8cbedf202eca28b8045df054317a8a3bfdd14759e SHA512 ee4d522713f90dd3bd7942655b0b2e9a64b0f6b8cfa491be7f22216c9e016b3b1131da5dee2ff0eefbdef000ab041e64e0a9385239db20135cf6101e8d2c23fc
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip 1605582 BLAKE2B 35ea8cfc90f9986ee687b6f4d644d7af2ec786740e427534aefcbe8e5b7c725b4fec2d8323d09193aa4fdc98c8baa0ae42503164f6920e5de05bdb551e33bf35 SHA512 160668e809021d409e7447d83235b127275edd1601ed61f9975c585ea4b9900b2c3fb70c98d1a8addd0e5cae27840da3276caecd77bf168f1625641b03ed689f
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip 1644123 BLAKE2B f0bdd5627a676ea72767542669e8d0ad43ab0fd82386c6fe08da83e60a478c46d3899843703f9026cfecd416056d8dde242954faf5f3134f2b975dc8e61ca0e3 SHA512 ea2b0c8163b22097a9e6c57c9d2dfb75548f2b6004a775a6c97fceb1d2e3e1dbd4cb2050a36cd4e1e9cd0386794d7bd3a3b6b956b8a55009217b06e9b72f64b5
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
+DIST obfs4proxy-0.0.12.tar.gz 91214 BLAKE2B a4e4ddd0055f3e914beba227f977a896439357b8f14798539fcaaf628d57f69c085c6fb631168aa8678f108732b10aee33ef1c4faba8392005f7d9083756e132 SHA512 7a00fcb4d90e372c9db13effe0e490d4bb7c6ba250451916419efed47b507b5da51b0edf4711eb5433a8c9fb626cdb2040ce066189584fd0625215df9cc06496
 EBUILD obfs4proxy-0.0.11-r1.ebuild 2221 BLAKE2B 80035d87fb0628021b952b49f800d62fc217aa65182178f3db99b3a96b2710d2accb047a51c9b9b2d55ab4021ecf03565aa6458ee47ac3dfdf17fb20f8382bb1 SHA512 33885e4ca4653a6458fc560c88fc1921b6018361cf4bf89bbfd7401187e49910566357eb566bdcf13e6e8736c4b0d64c105d7ec56b1305b8f3c2bc1b77357160
+EBUILD obfs4proxy-0.0.12.ebuild 2801 BLAKE2B 9ac648a83713d447f9cdc1f9cd7c2045afc0540b7c4c162bd90a55d9a9f5be705565956cb7ff1aa2eed704890d2a466eec43eb8239a50032d0da60140df0c5e6 SHA512 3d61d9b0e2253e8fa094fdaed41bacaf5456531dc3bbaa8f4f9734b97b820a8932ebaa4cc88a48526dc5be84b5c8ac31debfe0c8d505e6f97334c8ffaee3520a
 MISC metadata.xml 437 BLAKE2B aad226fe4a4891683070aec2c5726682c0622dbb85b69c94caf0c830ac9f3b891341f80200fadae3b71ca1bc545a6269237cf90c6413ffba98462bdbf64dfdff SHA512 cd0d8f64fbb0fda5f55e6bf2f0bd9e2d1b13e5c8b7b5934bb7a3180219fba7c63f2c2a16abb5906d4d2a4e5222473fa67723c9ae3be0fac08321235b96f4d845
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild
new file mode 100644
index 000000000000..26e476080db0
--- /dev/null
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGO_SUM=(
+	"filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20"
+	"filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20/go.mod"
+	"git.torproject.org/pluggable-transports/goptlib.git v1.0.0"
+	"git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod"
+	"github.com/dchest/siphash v1.2.1"
+	"github.com/dchest/siphash v1.2.1/go.mod"
+	"github.com/dsnet/compress v0.0.1"
+	"github.com/dsnet/compress v0.0.1/go.mod"
+	"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/ulikunitz/xz v0.5.6/go.mod"
+	"gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec"
+	"gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod"
+	"gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb"
+	"gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb/go.mod"
+	"gitlab.com/yawning/utls.git v0.0.12-1"
+	"gitlab.com/yawning/utls.git v0.0.12-1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97"
+	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod"
+	"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
+HOMEPAGE="https://gitlab.com/yawning/obfs4"
+SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+# See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification
+LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+S="${WORKDIR}/obfs4-${P}"
+
+DOCS=( README.md ChangeLog LICENSE-GPL3.txt doc/obfs4-spec.txt )
+
+src_compile() {
+	go build -o ${PN}/${PN} ./${PN} || die
+}
+
+src_install() {
+	default
+	dobin ${PN}/${PN}
+	doman doc/${PN}.1
+}
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 28b0c30fdd18..a3b05396609a 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -4,8 +4,6 @@ AUX privoxy-3.0.33-configure-msan.patch 525 BLAKE2B 0d48ca986762a37478284653b509
 AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b
 AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9
 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0
-DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd
 DIST privoxy-3.0.33-stable-src.tar.gz 1579540 BLAKE2B 4b76aa2e84160bab346d0548019158edb5562ca1dbf5356f765a6b91967f352f99c45c852254acf3d8e85cf8e8d210c050d1cf69ace3e5dbda8cdd13c1138df3 SHA512 9684455dbce7f6d8f5defd31aa9a7316e0c1dc896525ab4d562d0359462b541b1c366dea9db07b798f3e00b9cbcc44f494d8c431bcb10f2cb05b5bca3cfeaf75
-EBUILD privoxy-3.0.32-r1.ebuild 4005 BLAKE2B 9530c718ad70a70666ae43e0fa4009ddf58c901a245b870ff8f14e89be26d582e63f24f8d448f92d8df997a3b4d649ae0e8df2da5bd096da9b707e4e2e6e5376 SHA512 026a896d14549d3f904598588dfc5eadbb690b61bc39b9315f2219a3991b41f011b2ddc3aa2e7199fc7bfc9563ddadbd4494acf35203d69f7dc4cfcf658f150c
 EBUILD privoxy-3.0.33.ebuild 4429 BLAKE2B 40958b54ec53f6a45d1d25f38fa03904322dbcc61f7d32a66541f57cb04ee2fae89177724c17fe09ff4dfc79af6f109ad49a12a78c77fe697dd8ee1e7d65d8f0 SHA512 201363638066144b7f57cad0045514f2b5a4be74d5c5ed66caadd55ae9350b8b0d7a400147d74a41188cbdd66753bfab40a6c91c26634e94d4781f1d76e7f03d
 MISC metadata.xml 3093 BLAKE2B 58650d47956558fb62caf8e39420983c2c49ac1632a3636813dee4a458ca9e3094bb528f01f166507861a56bc2b44d1cb5c19464e15e5f93ebfe6f5d21bff227 SHA512 684ab8be2109f3bcfc8ad6868e221cd7046b06cf65ee66e82b69cb2e6a4b4d16bd96e978968461f2044c984abc2331e1963b4b61169b65b68e9581b4d25431d7
diff --git a/net-proxy/privoxy/privoxy-3.0.32-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.32-r1.ebuild
deleted file mode 100644
index cbcdc645d5f6..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.32-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd toolchain-funcs
-
-[ "${PV##*_}" = "beta" ] &&
-	PRIVOXY_STATUS="beta" ||
-	PRIVOXY_STATUS="stable"
-
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl brotli client-tags compression editor extended-host-patterns
-extended-statistics external-filters +fast-redirects +force fuzz
-graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
-png-images selinux ssl +stats +threads toggle tools whitelists
-+zlib"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
-LICENSE="GPL-2+"
-
-DEPEND="
-	acct-group/privoxy
-	acct-user/privoxy
-	dev-libs/libpcre
-	brotli? ( app-arch/brotli )
-	ssl? (
-		mbedtls? ( net-libs/mbedtls:= )
-		openssl? ( dev-libs/openssl:= )
-	)
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="${DEPEND}
-	extended-host-patterns? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-privoxy )
-	tools? (
-		net-misc/curl
-		dev-lang/perl
-	)
-"
-REQUIRED_USE="
-	client-tags? ( threads )
-	toggle? ( editor )
-	compression? ( zlib )
-	brotli? ( zlib )
-	fuzz? ( zlib )
-	ssl? ( ^^ ( mbedtls openssl ) threads )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
-	"${FILESDIR}"/${PN}-3.0.28-strip.patch
-)
-
-pkg_pretend() {
-	if ! use threads; then
-		ewarn
-		ewarn "Privoxy may be very slow without threads support, consider to enable them."
-		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
-
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--without-mbedtls --without-openssl"
-	if use ssl; then
-		myconf="$(use_with mbedtls) $(use_with openssl)"
-	fi
-
-	# --with-debug only enables debug CFLAGS
-	# --with-docbook and --with-db2html and their deps are useless,
-	#	since docs are already pregenerated in the source tarball
-	econf \
-		--sysconfdir=/etc/privoxy \
-		--enable-dynamic-pcre \
-		--without-assertions \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		$(use_enable acl acl-support) \
-		$(use_enable compression) \
-		$(use_enable client-tags) \
-		$(use_enable editor) \
-		$(use_enable extended-host-patterns pcre-host-patterns) \
-		$(use_enable extended-statistics) \
-		$(use_enable fast-redirects) \
-		$(use_enable force) \
-		$(use_enable fuzz) \
-		$(use_enable graceful-termination) \
-		$(use_enable image-blocking) \
-		$(use_enable ipv6 ipv6-support) \
-		$(use_enable kernel_FreeBSD accept-filter) \
-		$(use_enable lfs large-file-support) \
-		$(use_enable png-images no-gifs) \
-		$(use_enable stats) \
-		$(use_enable threads pthread) \
-		$(use_enable toggle) \
-		$(use_enable whitelists trust-files) \
-		$(use_enable zlib) \
-		$(use_with brotli) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/privoxy.initd-3" privoxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-
-	use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
-	if use tools; then
-		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
-		newbin tools/uagen.pl privoxy-uagen.pl
-	fi
-
-	rmdir "${ED}/var/run" || die
-	chown privoxy:root "${ED}/etc/privoxy" || die
-}
-
-pkg_postinst() {
-	if use extended-host-patterns; then
-		ewarn
-		ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
-		ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
-		ewarn "privoxy-url-pattern-translator.pl is available."
-		ewarn
-	fi
-}
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 3175071712bf..bbd22a974c92 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.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50d006eb3f84bbc5b894ee3641929551d00a1800d6676add62f967067ec62b5b7c41d767766eeab5dfc17980e SHA512 8f0ce6e30dd9173927e8133618211ffb865fb5dde4c63c2fb465e2efccda4a6efb33f2c0846870c9b915340aff5f59461a60171882bcc0c890336b846fe60bd1
 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
-EBUILD squid-4.15-r2.ebuild 8370 BLAKE2B c98374f6f37df8f16fab476306d9ff40ffe0e340968ff601c6334aed0fae5cb573fad9ce6791228516d534192d5af0494ad10fc2227772b3842cc3c15de0da2b SHA512 36667f7c03d18c6ae7088c0be53ea3733abba540764a18130fe7498cde9533715eef39d88155c2a6fa625d4515c08eb0613ee988e8cbd046df84ec6a07bfc2ab
-EBUILD squid-4.17.ebuild 8375 BLAKE2B cd9a8311e4a709885cec5342cc8744df927a533a8373db6e26c59fb2738864feb81d24a0a21901323f509aa700c1569aa030843dc3678ba32d02e72f6de41848 SHA512 af2e825f11da19a39be91d1f5bc773514f6db4774d51a2e6ba07f46b532c0af1be9f438dc93f94ee867249bc0b98834acd45d820dd59d8037a3098611a668e76
+EBUILD squid-4.15-r2.ebuild 8335 BLAKE2B 601c1b0280abf87634deaa4a180af9bf7fd2ddfe544c342b0ea0d7af375f400a294353579ceb4f8b158cb7d3cbe43aab3c84d256119abb73739959b074074b83 SHA512 3b6b846784d4c05d7ccf51e42c909bb3615baf27b3cb91269df7e1ed910383cf06b4bcce9d406f6d36498aa541097de689d89488986c96c44a97b35156c34b97
+EBUILD squid-4.17.ebuild 8340 BLAKE2B 03234244bd620577345f143eecd3d629b077dcc677159ed2c000a7e2020259eabec0055449493d520722a8fe1782066f2cf81c82cea6665873269d5b5c797b0f SHA512 22c615afbdafd4500a6ce5796ccdfd7e8463bc62eea1f2cade56f11888099e7ac49190d9feb966d8366e17ac04b9d55d2e4988d1101cca616b96bc525e1400bd
 MISC metadata.xml 1473 BLAKE2B 9220167bb398dda2f0e047d6f4b7841544a077745544bc117eb2a6db7230b3e2076d177c406b86444de0b2843c51f5de2e7df43a9dcde7bbbd600087ab96c575 SHA512 504ce7a1c7e2e5b862607dcd8ead69b130a058ea3b887ff11067495f7da372c3fc073169a2455e894a5657691f1f1abad2313afcaf9751114658b872e93f98d8
diff --git a/net-proxy/squid/squid-4.15-r2.ebuild b/net-proxy/squid/squid-4.15-r2.ebuild
index 06934d604038..af49050da0f0 100644
--- a/net-proxy/squid/squid-4.15-r2.ebuild
+++ b/net-proxy/squid/squid-4.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux
 	perl qos tproxy \
 	+htcp +wccp +wccpv2 \
 	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
+	kernel_linux"
 
 RESTRICT="!test? ( test )"
 
@@ -121,7 +121,7 @@ src_configure() {
 	use ldap && basic_modules+=",SMB_LM,LDAP"
 	use pam && basic_modules+=",PAM"
 	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use nis && basic_modules+=",NIS"
 	use radius && basic_modules+=",RADIUS"
 	if use mysql || use postgres || use sqlite ; then
 		basic_modules+=",DB"
diff --git a/net-proxy/squid/squid-4.17.ebuild b/net-proxy/squid/squid-4.17.ebuild
index a5927ae75891..ab6503cc44ac 100644
--- a/net-proxy/squid/squid-4.17.ebuild
+++ b/net-proxy/squid/squid-4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux
 	perl qos tproxy \
 	+htcp +wccp +wccpv2 \
 	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
+	kernel_linux"
 
 RESTRICT="!test? ( test )"
 
@@ -121,7 +121,7 @@ src_configure() {
 	use ldap && basic_modules+=",SMB_LM,LDAP"
 	use pam && basic_modules+=",PAM"
 	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use nis && basic_modules+=",NIS"
 	use radius && basic_modules+=",RADIUS"
 	if use mysql || use postgres || use sqlite ; then
 		basic_modules+=",DB"