gentoo resync : 29.06.2021

4 files changed, 217 insertions, 218 deletions

diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 205e0682e2b0..6179cad878f9 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,9 +1,31 @@
-DIST github.com-golang-net-3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b
-DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
-DIST github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
-DIST github.com-golang-xerrors-a985d3407aa71f30cf86696ee0a2f409709f22e1.tar.gz 12271 BLAKE2B cdcaf0bbf67399c9176786118a622fc0912036b9b0611922dd3d32ace2cac65ac288136ef228ff526e626d36c16e6f8442ffbb5df0c84fd713a669c326fa350c SHA512 719b3a3e432a928f641e15b8553d3e2c2015b1c68c633e9f13f1d57cee634544bb857518fcd75124e41a448b4c219b80dd0c1823329eb4edfc715994d40331d5
-DIST go-favicon-20181103162401.ico 5686 BLAKE2B 331d7684a569fc40fcd147eb812661f42b0ee3ca4c017515c33523b588b012763ce29f24bfce5bc7274e7560ff7dd8e872af43d2b51dc0722ac416b43c11f841 SHA512 0a6fe8bddbce99ed7fd035a3dc998dc9e893060854eee9d1c70bcc8de77b71fd3bd203b2de0f1c9a146f7d47555ab856389e16a372ee41f4ab57be611877fc16
-DIST go-tools-0_pre20190911.tar.gz 2264380 BLAKE2B 049d961191eec5b3bd75d9ab1dea576a9b3700cdcd06fce39ae34844af7dc045d61cbe604c16c1fd355f38c0a3e5523c0162ca37c49bd7a7d28642fa2a5b4e5e SHA512 d72f71a8d3f1b14b165d60279dd4dc110ee59ae0e716cdfa9d23610d65972c03fea7191848e5a1b38dc6a2ce96050fdd919f3251e39c0dced11be9d47087a50c
-EBUILD go-tools-0_pre20190911.ebuild 3952 BLAKE2B ef5717a0cb484d2c84b21017223098cc49ce8e79a9ddfc0810d9eee7d3d5ee7ce8631fb993a6c2ebe4284dc77300392c9671b5bd2cd6c00fb803e3c9b002a580 SHA512 7a232bc4cdf1815d217cd54fc855280a146f002f51f772517dc0934f6aeec04561301cae29c239ce7baefe9cb477291db0043eeb04e68548ba92223378a95ac8
-EBUILD go-tools-9999.ebuild 3216 BLAKE2B 119f173e1c3a5c325cd7b909b870ff805b865e6fe32591df571f5219b411b275bfa3c8132c07bdf9aa78492e182c1f23582ab3258c9db27d3911654b9a88a6a1 SHA512 b6bce78a41d6c875d9cd5aac8085f7d2debd14ed7135397211915675d22e40dc63c6c969a03e2d8e1346aee3da656774059deb8542400eae033dee630c0cc642
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.zip 268257 BLAKE2B fd5ded7eb3aac03b098895d8efbd8bbba306b411dc58033bfb9355441e6f94268c4ea44ab6b52894929493ae19f4b605433d6a0aa2a1eed7c9ec15d1ef0d3de6 SHA512 bae490d3f532680ce28d3230fd76b3dd6100725056fdcda4588d88d6be212ac59ff449bc9a08a378f0743e45dd45ad5aa0d2cc18b762e3e715ea9e30f8be8dd5
+DIST go-tools-0.1.4.tar.gz 2822942 BLAKE2B c935233c9664dde773be4fe08580b5040a842548caa57bf43846bc5e9c96568fafda8399f3e118cc6e2bd613025b90f0cb35e1cc000b113febf5d09cfdaf91d7 SHA512 2bf15fcfc2543ef68b723a71363edff80d549eb6ff4cb2353b51dc4a83e8fdb6afbb88d93af1feb516f10e1b847388bf8867d3f294f6f8f31bca7a93f48f91c1
+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%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%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-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%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+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-20190412213103-97732733099d.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-20210330210617-4fbd30eecc44.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%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.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+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.4.ebuild 5458 BLAKE2B 1c1754156b8013d04dc5e6e6a0699987ff83ceebf6e39d583f2bbe37576abcd21beaf6a81b01885bb2539e83e87874773b88bf1f92a4429d8978bf4beee11e5a SHA512 560d237e2a2af8cce6f45a6e8c1a514654a25faca6fd04c51454359107ce59dd65a552bfc419e578dfdf1fc66a0f68d1f5b04cee731c50a65ee30316a03c1e5a
 MISC metadata.xml 303 BLAKE2B ca3493d6189da59891e1f4627c08bdeb6eddce60e7c9dc4a6b90118b76cccdc67d0be1b3ecc62acf37da168654b21f1a0dd0e8968901631850599f02caf3bcbc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf
diff --git a/dev-go/go-tools/go-tools-0.1.4.ebuild b/dev-go/go-tools/go-tools-0.1.4.ebuild
new file mode 100644
index 000000000000..2807b22e10a6
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0.1.4.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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"
+
+EGO_SUM=(
+"github.com/yuin/goldmark v1.3.5"
+"github.com/yuin/goldmark v1.3.5/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/mod v0.4.2"
+"golang.org/x/mod v0.4.2/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/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-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
+"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/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/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
+	findcall
+	fiximports
+	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
+)
+
+S=${WORKDIR}/${P#go-}
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	go-module_setup_proxy
+}
+
+src_prepare() {
+	default
+	sed -e 's:TestDryRun(:_\0:' \
+		-e 's:TestFixImports(:_\0:' \
+		-i cmd/fiximports/main_test.go || die
+	sed -e 's:TestWebIndex(:_\0:' \
+		-e 's:TestTypeAnalysis(:_\0:' \
+		-i cmd/godoc/godoc_test.go || die
+	sed -e 's:TestApplyFixes(:_\0:' \
+		-i go/analysis/internal/checker/checker_test.go || die
+	sed -e 's:TestIntegration(:_\0:' \
+		-i go/analysis/unitchecker/unitchecker_test.go || die
+	sed -e 's:TestVeryLongFile(:_\0:' \
+		-i go/internal/gcimporter/bexport_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i go/internal/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestIExportData_stdlib(:_\0:' \
+		-i go/internal/gcimporter/iexport_test.go || die
+	sed -e 's:TestCgoOption(:_\0:' \
+		-e 's:TestStdlib(:_\0:' \
+		-i go/loader/stdlib_test.go || die
+	sed -e 's:TestCgoBadPkgConfig(:_\0:' \
+		-e 's:TestCgoMissingFile(:_\0:' \
+		-e 's:TestCgoNoCcompiler(:_\0:' \
+		-e 's:TestConfigDefaultEnv(:_\0:' \
+		-e 's:TestLoadSyntaxOK(:_\0:' \
+		-e 's:TestMissingDependency(:_\0:' \
+		-e 's:TestName_Modules(:_\0:' \
+		-e 's:TestName_ModulesDedup(:_\0:' \
+		-e 's:TestPatternPassthrough(:_\0:' \
+		-i go/packages/packages_test.go || die
+	sed -e 's:TestCgoOption(:_\0:' \
+		-i go/packages/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i go/ssa/stdlib_test.go || die
+	sed -e 's:TestLocalPackagePromotion(:_\0:' \
+		-e 's:TestLocalPrefix(:_\0:' \
+		-e 's:TestSimpleCases(:_\0:' \
+		-e 's:TestStdlibNotPrefixed(:_\0:' \
+		-i internal/imports/fix_test.go || die
+	sed -e 's:TestFindModFileModCache(:_\0:' \
+		-e 's:TestInvalidModCache(:_\0:' \
+		-e 's:TestModeGetmodeVendor(:_\0:' \
+		-e 's:TestModCase(:_\0:' \
+		-e 's:TestModDomainRoot(:_\0:' \
+		-e 's:TestModList(:_\0:' \
+		-e 's:TestModLocalReplace(:_\0:' \
+		-e 's:TestModMultirepo3(:_\0:' \
+		-e 's:TestModMultirepo4(:_\0:' \
+		-e 's:TestModReplace1(:_\0:' \
+		-e 's:TestModReplace2(:_\0:' \
+		-e 's:TestModReplace3(:_\0:' \
+		-e 's:TestModReplaceImport(:_\0:' \
+		-e 's:TestModVendorAuto(:_\0:' \
+		-e 's:TestScanNestedModuleInLocalReplace(:_\0:' \
+		-i internal/imports/mod_test.go || die
+	rm -f copyright/copyright_test.go || die
+}
+
+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
+}
+
+src_test() {
+	go test -work "./..." || die
+}
+
+src_install() {
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+	dodir /usr/bin
+	ln "${ED}/$(go env GOROOT)/bin/godoc" "${ED}/usr/bin/godoc" || die
+}
diff --git a/dev-go/go-tools/go-tools-0_pre20190911.ebuild b/dev-go/go-tools/go-tools-0_pre20190911.ebuild
deleted file mode 100644
index 5a326334fe15..000000000000
--- a/dev-go/go-tools/go-tools-0_pre20190911.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="golang.org/x/tools"
-
-EGO_VENDOR=(
-	"golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net"
-	"golang.org/x/sync 112230192c580c3556b8cee6403af37a4fc5f28c github.com/golang/sync"
-	"golang.org/x/xerrors a985d3407aa71f30cf86696ee0a2f409709f22e1 github.com/golang/xerrors"
-)
-
-EGIT_COMMIT="6bfd74cf029c99138aa1bb5b7e0d6b57c9d4eb49"
-ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
-HOMEPAGE="https://godoc.org/golang.org/x/tools"
-GO_FAVICON="go-favicon-20181103162401.ico"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}
-	mirror://gentoo/${GO_FAVICON}
-	https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-	default
-	# Add favicon to the godoc web interface (bug 551030)
-	cp "${DISTDIR}"/${GO_FAVICON} "godoc/static/favicon.ico" ||
-		die
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
-		-i godoc/static/gen.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
-		-i godoc/static/godoc.html || die
-	sed -e 's:TestDryRun(:_\0:' \
-		-e 's:TestFixImports(:_\0:' \
-		-i cmd/fiximports/main_test.go || die
-	sed -e 's:TestWebIndex(:_\0:' \
-		-e 's:TestTypeAnalysis(:_\0:' \
-		-i cmd/godoc/godoc_test.go || die
-	sed -e 's:TestApplyFixes(:_\0:' \
-		-i go/analysis/internal/checker/checker_test.go || die
-	sed -e 's:TestIntegration(:_\0:' \
-		-i go/analysis/unitchecker/unitchecker_test.go || die
-	sed -e 's:TestVeryLongFile(:_\0:' \
-		-i go/internal/gcimporter/bexport_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i go/internal/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestCgoOption(:_\0:' \
-		-e 's:TestStdlib(:_\0:' \
-		-i go/loader/stdlib_test.go || die
-	sed -e 's:TestCgoMissingFile(:_\0:' \
-		-e 's:TestCgoNoCcompiler(:_\0:' \
-		-e 's:TestConfigDefaultEnv(:_\0:' \
-		-e 's:TestLoadSyntaxOK(:_\0:' \
-		-e 's:TestMissingDependency(:_\0:' \
-		-e 's:TestName_Modules(:_\0:' \
-		-e 's:TestName_ModulesDedup(:_\0:' \
-		-e 's:TestPatternPassthrough(:_\0:' \
-		-i go/packages/packages_test.go || die
-	sed -e 's:TestCgoOption(:_\0:' \
-		-i go/packages/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i go/ssa/stdlib_test.go || die
-	sed -e 's:TestLocalPackagePromotion(:_\0:' \
-		-e 's:TestLocalPrefix(:_\0:' \
-		-e 's:TestSimpleCases(:_\0:' \
-		-i internal/imports/fix_test.go || die
-	sed -e 's:TestFindModFileModCache(:_\0:' \
-		-e 's:TestInvalidModCache(:_\0:' \
-		-e 's:TestModeGetmodeVendor(:_\0:' \
-		-e 's:TestModCase(:_\0:' \
-		-e 's:TestModDomainRoot(:_\0:' \
-		-e 's:TestModList(:_\0:' \
-		-e 's:TestModLocalReplace(:_\0:' \
-		-e 's:TestModMultirepo3(:_\0:' \
-		-e 's:TestModMultirepo4(:_\0:' \
-		-e 's:TestModReplace1(:_\0:' \
-		-e 's:TestModReplace2(:_\0:' \
-		-e 's:TestModReplace3(:_\0:' \
-		-e 's:TestModReplaceImport(:_\0:' \
-		-e 's:TestScanNestedModuleInLocalReplace(:_\0:' \
-		-i internal/imports/mod_test.go || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678964
-	export GOPATH="${WORKDIR}/${P}" GO111MODULE=on GOFLAGS="-mod=vendor -v -x"
-
-	# Generate static.go with favicon included
-	pushd godoc/static >/dev/null || die
-	go run makestatic.go || die
-	popd >/dev/null
-
-	go install -work ${EGO_BUILD_FLAGS} \
-		$(GOPATH="${WORKDIR}/${P}" go list ./...) || die
-}
-
-src_test() {
-	go test -work "${EGO_PN}/..." || die
-}
-
-src_install() {
-	rm -rf vendor || die
-	pushd "${WORKDIR}/${P}"
-	golang_install_pkgs
-	popd >/dev/null
-
-	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
-	exeinto "$(go env GOROOT)/bin"
-	doexe "${WORKDIR}/${P}"/bin/*
-	dodir /usr/bin
-	ln "${ED}/$(go env GOROOT)/bin/godoc" "${ED}/usr/bin/godoc" || die
-}
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
deleted file mode 100644
index 7b130f58c15f..000000000000
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_SRC="golang.org/x/tools"
-EGO_PN="${EGO_SRC}/..."
-
-# vendor the net package due to a circular dependency
-GO_NET_COMMIT="aaf60122140d3fcf75376d319f0554393160eb50"
-EGO_VENDOR=( "golang.org/x/net ${GO_NET_COMMIT} github.com/golang/net" )
-
-if [[ ${PV} = *9999* ]]; then
-	ARCHIVE_URI=""
-	inherit golang-vcs
-else
-	EGIT_COMMIT="7d1dc997617fb662918b6ea95efc19faa87e1cf8"
-	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
-HOMEPAGE="https://godoc.org/golang.org/x/tools"
-GO_FAVICON="go-favicon-20181103162401.ico"
-SRC_URI="${ARCHIVE_URI}
-	https://github.com/golang/net/archive/${GO_NET_COMMIT}.tar.gz -> github.com-golang-net-${GO_NET_COMMIT}.tar.gz
-	mirror://gentoo/${GO_FAVICON}
-	https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-
-src_unpack() {
-	golang-vcs_src_unpack
-	mkdir -p "${WORKDIR}/${P}/src/${EGO_SRC}/vendor/golang.org/x/net" || die
-	tar -C "${WORKDIR}/${P}/src/${EGO_SRC}/vendor/golang.org/x/net" -x --strip-components 1 \
-		-f "${DISTDIR}/github.com-golang-net-${GO_NET_COMMIT}.tar.gz" || die
-}
-
-src_prepare() {
-	default
-	# Add favicon to the godoc web interface (bug 551030)
-	cp "${DISTDIR}"/${GO_FAVICON} "src/${EGO_SRC}/godoc/static/favicon.ico" ||
-		die
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
-		-i src/${EGO_SRC}/godoc/static/gen.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
-		-i src/${EGO_SRC}/godoc/static/godoc.html || die
-	sed -e 's:TestVeryLongFile(:_\0:' \
-		-i src/${EGO_SRC}/go/internal/gcimporter/bexport_test.go || die
-	sed -e 's:TestLoadSyntaxOK(:_\0:' \
-		-i src/${EGO_SRC}/go/packages/packages_test.go || die
-	sed -e 's:TestCgoOption(:_\0:' \
-		-e 's:TestStdlib(:_\0:' \
-		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
-	sed -e 's:TestWebIndex(:_\0:' \
-		-e 's:TestTypeAnalysis(:_\0:' \
-		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' \
-		-i src/${EGO_SRC}/go/internal/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestVeryLongFile(:_\0:' \
-		-i src/${EGO_SRC}/go/internal/gcimporter/bexport_test.go || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678964
-	# Generate static.go with favicon included
-	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		go run makestatic.go || die
-	popd >/dev/null
-
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_test() {
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	rm -rf "${S}/src/${EGO_SRC}/"{.git,vendor} || die
-	golang_install_pkgs
-
-	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
-	exeinto "$(go env GOROOT)/bin"
-	doexe bin/*
-	dodir /usr/bin
-	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
-}