gentoo resync : 06.04.2022

3 files changed, 11 insertions, 118 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index c9c43bcb8601..b2fe09873ad8 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 0f49a045e74a..258ab4332b90 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -2,21 +2,18 @@ DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.zip 268257 BLAKE2B fd5ded7eb3aac03b098895d8efbd8bbba306b411dc58033bfb9355441e6f94268c4ea44ab6b52894929493ae19f4b605433d6a0aa2a1eed7c9ec15d1ef0d3de6 SHA512 bae490d3f532680ce28d3230fd76b3dd6100725056fdcda4588d88d6be212ac59ff449bc9a08a378f0743e45dd45ad5aa0d2cc18b762e3e715ea9e30f8be8dd5
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.1.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.1.zip 271753 BLAKE2B cccc7008adba51c52fac08e94dd38ecb44b47917af709808056219efba166ff1f7b1e5be29a132e800a67cc5b5f5238ec0a5d3e2cf5f6f516fcdd20da016b433 SHA512 bf46c66ed50afa151505f5bb0785439fc9b9ac90e056385a15aef9c62b0f95aaec26efb364f69533ff94c152b874ec47615d87e48d4660ff98f9b7d5ffba8362
+DIST go-tools-0.1.10-deps.tar.xz 16247548 BLAKE2B 7dc27e377eec3c7fa49d37614d2b7b826735228ae3b22b9481bcba4e344afd51145e98a885c33b5b732d9e6382a5f50a94efcd6f3a820088dd528e561bd5fae0 SHA512 a7bcb32b0393640dd603e07958dc70abba750d219b46f2de649d7e3644432364798c5227df5d764ab6e62d01b60f10d74668914ea09f469ce19134bc934d17ba
 DIST go-tools-0.1.10.tar.gz 3014465 BLAKE2B f3b6129ad00385539eab3426bc542a120bd41d3984174d5d8b91bee6435d7a179c0058f2a50de3235a07e5b67f6d9657288bd578591d61187447441bb6408e76 SHA512 9c817c98739a1788b7fb459728528b5c647226e64df495661c1b3027bfa571e884d6c28d8796558b65e2ba54774976897bddcd052568f33d4e30ce8ee5d883e1
 DIST go-tools-0.1.4.tar.gz 2822942 BLAKE2B c935233c9664dde773be4fe08580b5040a842548caa57bf43846bc5e9c96568fafda8399f3e118cc6e2bd613025b90f0cb35e1cc000b113febf5d09cfdaf91d7 SHA512 2bf15fcfc2543ef68b723a71363edff80d549eb6ff4cb2353b51dc4a83e8fdb6afbb88d93af1feb516f10e1b847388bf8867d3f294f6f8f31bca7a93f48f91c1
 DIST go-tools-0.1.9.tar.gz 2939407 BLAKE2B 3f610322c6f2d088039a66eaa2ae1ff01ff5bd24adb8ae8a028b11b10cd66ee7aea274d24b4e97128eeb24d9ee65db5491b21415c1c76f198532d0d54c7541f4 SHA512 dda788aa91db9c3e7ec2b09b8742055259ffaa74d1da971060458b3545f12336116fc65f30b3237209aa024d721c54a9a9d92007ae6d0254e9c14ecfc8749012
 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-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.mod 214 BLAKE2B 06631482606d93f3622eb79087adb11f0fedc16eeee47c327d9542003c05828faca6ec89fb5a7b6479dbbb951126f85d3b11afff772bdddba37db3d99c0174ec SHA512 8ad3d2d81f0192ba3215650546e1cc1eb2d58f2c9898929e565233388d95bb2d1a334d038e9807a44733fe6a218ac0b32de24d16fe9d208addcd67cdc2ae8f79
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.zip 150900 BLAKE2B a376dc6f6413f699d69f6ee1c25f85e457fc602cc8cb23841aad223daac91598a98535ad9398bba2e8346c4450a5523129628546a6db69dbed84894c3bffdff2 SHA512 71dd98468c11a0b56877ec92ac220d0b34136e8c85075dc9aeb413cdab0fdb7937fa3000c370feff3e43b9466ee8541fc3aaadfa46d900616378b7fe7dc3fecf
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.6.0-dev.0.20220106191415-9b9b3d81d5e3.mod 214 BLAKE2B 16182f3f568cd09aaab4ea54290e9c0242ff47003d7160932ced3b2bddf2f333c331d600aae49aad6ec7901f2c7c71d08f8fc93e2c5e04e0d37c115b0c814800 SHA512 8ad9ed616127b7e63049d470e02d2ab91345b3feaea4848702a67d1d39069e2a50743d7684cf35341bc0acf5594409025f6dd67d1a61edfbaf68b5e51ff4e8db
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.6.0-dev.0.20220106191415-9b9b3d81d5e3.zip 169189 BLAKE2B cc2885cf1633e00ed387b67f7139d8f95d768b7d1b17a5fe90b88fb39d513766db08fbe75f0cf06e4b3bbbad4375716cfc67789a5634af51c75ebed3db60870c SHA512 3aca63d656dc70e1ad3e4a74917cc43f97ca42ca0491cd526632f70a3ca65a5aedd279d4efc6e276b6678070d4d31bc47df371fa256e7167fae484418a611c12
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-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-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip 1565731 BLAKE2B 25099f5d276bba9b2d3c5e75c603dac06f3364fd09d2a2c53aaf5030d4698fc3638758d23c0a82fc118a05661b40377b74ea55c2e8f5d9add2d03527104ae80b SHA512 23da0e9ed2c647eb043e4b57e384ae335119b3766411f84cb009496a1fae85c7cefed14a92154b3e8d7e93d92187dbfde9b9cc07236ea3a7ca4052b93c6dc0dd
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20211015210444-4f30a5c0130f.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
@@ -31,7 +28,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip 1634371 BLAKE2B b13afd43d8734f143af16046780b9225a874157e0562068c8c3198dd23f7ff4b3e14f6654b578bc7520dd3c299411ca2d77999a8ab8459a765d05e74d03e81db SHA512 b7c4ff1752cb582263b837048e28b52fa219db5f7316739692d4c2d20bb2a9b8ad3645e92b3b1a72cba0817e4587ae04465dd351bb17a719bc92e193cb29cc76
-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-20211019181941-9d821ace8654.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211019181941-9d821ace8654.zip 1667445 BLAKE2B a9a8930675519b134e8b1227b18fc8af991ebd531ea1e4cc66b51d5f9989e295e156c46b4662b37b44ce750987ca7b5385cb7db2e511bdaeebaaedd31e51e833 SHA512 654a5674688eb771be446b9e163796fd709b2b742cdc2179a981a03127bee29f2e47b50da73c73021c6e1ec0a00dcca4cde53312f7ce5a30ec7d8a3c7cb5a466
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -46,7 +42,7 @@ DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 B
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
-EBUILD go-tools-0.1.10.ebuild 5881 BLAKE2B dcda76d9173a7518be2cbf4e760cb28629f264b261d6ed88931714d208d909658e233b98bc6a92fea142d33388fd3bdc44fbd8e500fbf5e427f1c7cc7731ec5f SHA512 56ce3b6bbe15b4ee674c8b95de897e99b38ae3335fd8a884fdce4c7f030d8acb660691d392fe0e13af617df9e87bd8960c554253929f676d1e8ed556403ecf8b
+EBUILD go-tools-0.1.10.ebuild 3103 BLAKE2B 096345de8c552763953fc717fd891c5f12b477bbf322523cec1eab8eb0b7ad035745d25f33eed922a7a51190a5c807dad4ed2c0b7bbcd651577635ea3f3f8a80 SHA512 c00bcb7256c5add3b58e6ec93c77c606bdc8f93428107907d00155f0e50a16f3bbdbc35d64af511782900de4e7b70089fb0f693237d2ad007bffb9ef2834a277
 EBUILD go-tools-0.1.4.ebuild 5504 BLAKE2B 23c260b6168d29d53d1e757a829bc68840ac8d79c768dc3a8446cef2675024177ab7740c22e6bb3e6028906d4120f6a1c023d9a0426834b82d7186428f4b13f4 SHA512 b1d23996599b2df2b54cd65a61b7abd2ca4bec6f3bbb476df7aade6ed5ddf7bd6e85ae5c416277566993a09e15955e6dbea025b1edd389a57d0360b130371fb3
 EBUILD go-tools-0.1.9.ebuild 5737 BLAKE2B de4743b3b8d1fcff482d2e3014fa505af3658a0d84a712e9e06c3720e8bbe49e90f948f09ca16c4dac094d20b4360d036fee188bd1aeadd132b8863338e91fe7 SHA512 968f889c0a8a27b76f7d89e45bb1f5bacbe3858297c5c1c9e1a77044372f691d78e19d9b01146025cc25636d87d0aa187c254f0d4fa7f92a5cecf0f8a249524d
 MISC metadata.xml 304 BLAKE2B eb25bd6c86489f23152684d6eddeabebeb5bf9b2988b386d43d163286b9f38c8f0fe58a9103c45843280cd089d735e73a30e80e0368c3fe53e7bc2b4717603e4 SHA512 81050d8cfe2a1d8f1212613f4a043f0207c192026390bf7abfb68ea6262c12e0f0cd9f4f8c2ed23e62c47666bdb8498cf8fa58e57be5e10a7cd567dfc59e47ed
diff --git a/dev-go/go-tools/go-tools-0.1.10.ebuild b/dev-go/go-tools/go-tools-0.1.10.ebuild
index c90a9d3fd6df..f0cc27e54838 100644
--- a/dev-go/go-tools/go-tools-0.1.10.ebuild
+++ b/dev-go/go-tools/go-tools-0.1.10.ebuild
@@ -1,115 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit go-module
 
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
 DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
 HOMEPAGE="https://godoc.org/golang.org/x/tools"
-SLOT="0"
-LICENSE="BSD MIT"
+SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
-EGO_SUM=(
-"github.com/yuin/goldmark v1.4.1"
-"github.com/yuin/goldmark v1.4.1/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod"
-"golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3"
-"golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-"golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f"
-"golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
-"golang.org/x/sys v0.0.0-20211019181941-9d821ace8654"
-"golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/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.0/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.6/go.mod"
-"golang.org/x/text v0.3.7"
-"golang.org/x/text v0.3.7/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-)
-
-go-module_set_globals
-SRC_URI="
-	${ARCHIVE_URI}
-	${EGO_SUM_SRC_URI}
-"
-
-GO_TOOLS_PROGS=(
-	authtest
-	benchcmp
-	bundle
-	callgraph
-	compilebench
-	cookieauth
-	cover
-	digraph
-	eg
-	fieldalignment
-	file2fuzz
-	findcall
-	findtypeparams
-	fiximports
-	fuzz-driver
-	fuzz-runner
-	getgo
-	gitauth
-	go-contrib-init
-	godex
-	godoc
-	goimports
-	gomvpkg
-	gopackages
-	gorename
-	gostacks
-	gotype
-	goyacc
-	guru
-	helper
-	html2article
-	ifaceassert
-	lostcancel
-	netrcauth
-	nilness
-	present
-	present2md
-	server
-	shadow
-	splitdwarf
-	ssadump
-	stress
-	stringer
-	stringintconv
-	toolstash
-	unmarshal
-)
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
 
 S=${WORKDIR}/${P#go-}
 
-src_unpack() {
-	unpack "${P}.tar.gz"
-	go-module_setup_proxy
-}
-
 src_prepare() {
 	default
 	sed -e 's:TestDryRun(:_\0:' \
@@ -172,20 +77,12 @@ src_prepare() {
 
 src_compile() {
 	local packages
-	readarray -t packages < <(go list ./...)
-	(( ${#packages[@]} > 0 )) || die "go list failed"
-	GOBIN="${S}/bin" go install -work "${packages[@]}"
-
-	local expected_progs=("${GO_TOOLS_PROGS[@]}")
-	local progs_diff=$(diff -u <(printf -- '%s\n' "${expected_progs[@]}"| LC_ALL=C sort) <(find bin -type f -printf '%f\n' | LC_ALL=C sort))
-	if [[ -n ${progs_diff} ]]; then
-		printf -- '%s\n' "${progs_diff}"
-		die "difference in expected vs build programs"
-	fi
+	readarray -t packages < <(ego list ./...)
+	GOBIN="${S}/bin" ego install -work "${packages[@]}"
 }
 
 src_test() {
-	go test -work "./..." || die
+	ego test -work ./...
 }
 
 src_install() {