gentoo resync : 21.08.2021

13 files changed, 14 insertions, 435 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0432fd2d2d91..5664ebe34d75 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go-bootstrap/Manifest b/dev-lang/go-bootstrap/Manifest
index 47ac351c69a0..11b12266eebd 100644
--- a/dev-lang/go-bootstrap/Manifest
+++ b/dev-lang/go-bootstrap/Manifest
@@ -1,22 +1,12 @@
-DIST go-darwin-amd64-bootstrap-1.13.6.tbz 119340642 BLAKE2B 93d1d2fdd24e6a56d9583d90e64788fe28284302d1e1346a2009dcba8f80917bf113398f269922277bd066b068f62fffa146523bd57a5b7b178f0008f3c4d154 SHA512 1f27885d454963e88f73d3b6ef4d0167a5df6ad81c4725fb3b2be19e2c7bad13ef36ff6c100b8788fa2085285e462f0d2b3dfaf8bd67b0804a137969054cb5ae
 DIST go-darwin-amd64-bootstrap-1.16.6.tbz 127674985 BLAKE2B 1addecf6c3c59771d27c9ae38bb1348632b0840a5fc5a8f88ef37f3882e37810f6851d56c64a171c47d2ba9da6c00e5876aa10d207d8a6e907aa53861c0ff54b SHA512 4d1107cbf2b467a3cf7ebeb868d300df1955f376f016dc1aa0ec6b823c69d4cd80f327f90819f54b235ea9e6d4c4fa8a355325c28c5149aabd7af72fb563a493
-DIST go-linux-386-bootstrap-1.13.6.tbz 116991833 BLAKE2B e15c4dd3c9bfb233f81d318591df5cb2a73e033a088cd652371f6933b8732c7d5c1292ec8110b23f85b30d5afdea97e798b264c61f5651db08c7ac903e8dcbb6 SHA512 114c2f670f21624f0dfefabb99b7263e2133e58c2072ce341a6ea604278e22361779f2e0d3771b7a427e979d7e34f3fc3afcd0f8297d778c3552858ce64ec0c8
 DIST go-linux-386-bootstrap-1.16.6.tbz 125879388 BLAKE2B e0813b451b41c474617543688d105b19aa7cdd6984be40b0fddf12709af4c6e4382d3b3e1f65c0a12ca24896bb2ad25fe0a2cd3b7aeefa4f55354e939aef4c29 SHA512 eb4a013b7f53f9b6580afcae75b98df32982f19c113be58540871f36570e00fced1672ad85894660ef6c72c10392fec21c3d8e3db98ea8074e00b07e6ca160f3
-DIST go-linux-amd64-bootstrap-1.13.6.tbz 116924754 BLAKE2B 3a28ded6df7e04081c727ad90ad2c8b67e1171aea8cd86b9570d65b275c2a4f1a84084d65a6c3e2efbece5594ba1aad3efc1a2fba36aa2dc68902c5c228c05e8 SHA512 3ade49da050d132309357a190628c3ff3a93cffa88f56e1d771f53358c825f210b6870870a96fdbc27717f1b464d904a6f605073377de2f0516cf635a1ce8241
 DIST go-linux-amd64-bootstrap-1.16.6.tbz 125758119 BLAKE2B fe653fbb47d22624a24bbf1fc52f5158830726e3bc93a8b0c5ab4811daf082b02130b834031af19dfc929860417b4b734f54125fbbaaeed0e3c35fdd686e4991 SHA512 6feb11c3326199db296ebcb68b81bcd21d456c3cffca1e8f30dd6303c3bdccde410b38d49f0ccec47e397e5d7a84aba91b91e85afd44a14150c6e20046bff8df
-DIST go-linux-arm-bootstrap-1.13.6.tbz 112324731 BLAKE2B 18166e279b1d30f48e08007df8639775b58081805a7e5799dae14e0b357330cf69997f4a5c844bd10a9eeef44225d52f26197e07d16bb7a42fe5a6185634f4b5 SHA512 4d502e2231c1822dacb62cd00b435d52710b1511715385c0b3ddf9f66a446ae90e9b1628b501ba8e1d1a94ca5c28249a323da56f869e88480aa6c249ca001c6e
 DIST go-linux-arm-bootstrap-1.16.6.tbz 121505187 BLAKE2B d732fcd1b8c9696aca70608813be1d99aa097aa51a709c3580bb1c5b3548e38b52bbcae7e958b00632dcaec6c1083d90f13a3bc2682e0a743bfae9055164d15b SHA512 25ed02b4a1c3b42a6b97a7d1fbfd0c6304ab784b69cadac15ae0fb1d701767ff2614fa7ebf070b8430510745e2d0d3f612a3f383e836fda4ca80c3398175c46c
-DIST go-linux-arm64-bootstrap-1.13.6.tbz 110290994 BLAKE2B dc8985a305d1ef3ae683de9787333f0be3d43d5e642a3b5a315cf003311fb47e55588eb1acf816e5eb4215802832a43445ebecedfd2d680d350cb65e0ce7394f SHA512 bc5f4c4554987a5df735bb96c9b8ae78624169d847ab17ea9b0e969ecaab109311892cf1985d576cd46bf271562b724c6a3796472e197a2c8bb48da0d51128a9
 DIST go-linux-arm64-bootstrap-1.16.6.tbz 119471617 BLAKE2B 518ed7baf7c74aface2f458e5f3ed6e8c0f9aa2314d59f83688818fda8acb1d15e8d9288210eef916f09773868253661c30ffc259570e2f2e3de829cc49e91c4 SHA512 4e3b968188c6d7882568d24919baa1a80b07097a0ec8cf87c40e012db61eba58107edcedf67801868c93e5263cbf62eccfb2c2163d33018e6a82ffcd61e2872d
-DIST go-linux-ppc64-bootstrap-1.13.6.tbz 110762916 BLAKE2B 19d44da5bcd1f4832772469beed509475f9a38ab55b386490faf1b270ffd7cc13d315dfe4746b3b9ca6a324c0e6f2e0144a3146d43bd6210d0479063f8627e34 SHA512 2a76c6168d7ba0c7eb020a1af4eccb2a5aee510a1f8e4bb438f5ea769677724c1450209c2fc9a4ccff1084f1a091a568e667ec33a5d537539a09ece426cf82d8
 DIST go-linux-ppc64-bootstrap-1.16.6.tbz 119549132 BLAKE2B 26131877025faf0a1b09abab9d229940532b52c7d994d001b7e91dbde0fe760a520e3337f6fe3e413aa3abc49096fb47883fba0cc247d8e0c93a6698947a4567 SHA512 a55d1a5da5a7b6360485101fc051aa34aecdc2e73be3690df16d132068c390a522114c890f942f504d197e7d00b97a95ea7cca6e74ae23719c6ab80deea4e7da
-DIST go-linux-ppc64le-bootstrap-1.13.6.tbz 110086770 BLAKE2B a3f2c1b840f85d7726336285a56d1850fd10f32d90341836a4124a7d181778c3a1cff1d576e4a19a4f3556e961d84fa77202891725b5237121040bdd020af339 SHA512 6c4bd54fafea65fbb16a3e6c57b721c10654a5f18879c164f6889a01ec6581b13b450622e83897032ab3ed43a9ff4a7edb6d30c56d41dd23991e8453c1bae359
 DIST go-linux-ppc64le-bootstrap-1.16.6.tbz 118880332 BLAKE2B 364f193b0e21ba330effc07ff8fd6b8e1b63519fdcd44c0c0c5a655a95739263a5a31771f04f3b682097bef41144ae7b31d28eaeae9c95505c187673a7289e3f SHA512 56ed74c7b6a189fd477c8ec6a5d5af1cc628fe3816f562dfb0702bea743a55e61d36a06f3d8314576ab690eeaab09a6d076549c74cd8f2a99cd2531e82c09e7e
 DIST go-linux-riscv64-bootstrap-1.16.6.tbz 125444157 BLAKE2B 67829fcab383445a228e9e5f6d55f5c17869394201ff818ef9f15143225d889ca82da0e2e7d11f11d6b1dd37af3ef0070784eb1d832c8d11c9c41cea9082f368 SHA512 97fcc6b061e8819d6e0876521457c344306927c9fe04ccde2b43bba143255feb2eddbc2416df6e44c9b5477dee6491c25fc7da2800a8fa40cedf1f21089d4816
-DIST go-linux-s390x-bootstrap-1.13.6.tbz 115641137 BLAKE2B 7ab94a8f7c839ee8fb58673ed5ad00a569a0bae7a13bb214098154aedb1c272837d0903c226cb87b5eb46475589ddcd56e1afafc81ddaea988ce3c3ddca686d1 SHA512 794b72f48634a7f7dfb41c64607d66974ef9413a68e39a3959a981e2aaf356fd2cec9e2eb0c25d1b7b3d179c0a72ce053dc9c69463bde0ec893ab472f7076204
 DIST go-linux-s390x-bootstrap-1.16.6.tbz 123611555 BLAKE2B b60509d2475640be6d029fe9abe2a244f9e5f7d050b9d62648817f5868bd70850a28494703e51116d2c00a99ddfd7e899b26f6d9a1d9fb18347ab958749014a8 SHA512 519dea7328ce5bf4f5ef769dcc22bd5b09537b3d796b682d094326260385c50ca41a3bbb9cb33a45d4ec979e572ef082cdb5c82ecb595faa8fcd2aa984403154
-DIST go-solaris-amd64-bootstrap-1.13.6.tbz 116214396 BLAKE2B 3f5d6fcf2131a0944b2846eab2fc069f5d90fea1e7d98e8bd50ba5091d4b2ae01964fa71c29310fa7ff7c990ca0dd1afc83577174a46552d58d611716fedb854 SHA512 2d2c281c196729dd97f338fe3bd7396268c0b6fcfc8241b99a939f647201ed39929a5b0a096b9d1f7ffb20f79fd7b3cc25127d7a93f9836f6f0d1e5dbc2c6235
 DIST go-solaris-amd64-bootstrap-1.16.6.tbz 125045916 BLAKE2B ab3645495b7bc17fd5d1612e1ddbc86f8053b393185909526eadd74158215664119849a8727d5e8b3142a4302dbb38aea505a4f6864d7d129b4d8f6d6fce174b SHA512 ee9bcf0a118935083c306b800adb1bdd51d77d40e8158dc0f7a16a37dd5d04ec78495b0467042d60e9165117ab53831b839640ed2adb5a8f7468c0b86ddc27f5
-EBUILD go-bootstrap-1.13.6.ebuild 1142 BLAKE2B b7d1fcca63621309b8203874f49ef152fe441b0415229b4cf97488f379e801d8bc0716b5325e9e81588af212073bc58fcae32a0ad94cb676a30891403dcc1f08 SHA512 31642857136205dedb259282c6ea69c9c0a9a5aea45f4d9b57f60c1e25c78e7a8289a354a70ef709c1cd71e6cea722cb6da5083136be8b6d9ef502c9d889dd81
-EBUILD go-bootstrap-1.16.6.ebuild 1358 BLAKE2B 09f3bcebfb3be1c8b241aa58e55b748a482adb94fbaa332bb8ff6be80824ae8c573ae7c1e46ff1ab311b74eb6b7b22cba7bb5a843cd009925d6b90d3b8c76dda SHA512 aea7946d1feccdc35c547c760199d5715bc2162f4fae8d3af35f0fecfc9fba9ae95d41f9b88d458e25a9fff5b3d134f2b8b2db013bb5e8633bff052013891f74
+EBUILD go-bootstrap-1.16.6.ebuild 1354 BLAKE2B da79bc6c5f6a17d4bea052ee731781791c7a7ffeb8dd0b743b0393c99a652f0fdd924928feed92ca482ba36fa2d49319f6000aa324f853c52312327a68682fa6 SHA512 e0f6ec27efc357d5371abb305f79b9a96966bb902b550e5bd32d27d94afcdf79b658b070f39440d046ded63a8d9d27d788917619776d3816ae6ce91b525067da
 MISC metadata.xml 415 BLAKE2B c99598f99c4641694f4855251e64805ea804a722bfd74224682318b28dd409375c2c561516c7961748d5c6cb8dcfb1d91dc0c04615516abc216c31084710077a SHA512 b019c242cc054e7c3fcdfd9254f0f6742f9250d154436f6d43d0b124fb6d87acf8ca09d00eb7491eb75be84b55e78f1179382bbb2a45db0e18560d4f2272e4f9
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.13.6.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.13.6.ebuild
deleted file mode 100644
index 5016ef7341e1..000000000000
--- a/dev-lang/go-bootstrap/go-bootstrap-1.13.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Bootstrap package for dev-lang/go"
-HOMEPAGE="https://golang.org"
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-SRC_URI="
-	amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap-${PV}.tbz )
-	arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap-${PV}.tbz )
-	arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap-${PV}.tbz )
-	ppc64? (
-		big-endian? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap-${PV}.tbz )
-		!big-endian? ( ${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap-${PV}.tbz )
-	)
-	s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap-${PV}.tbz )
-	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-${PV}.tbz )
-	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap-${PV}.tbz )
-	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap-${PV}.tbz )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="big-endian"
-RESTRICT="strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-src_install() {
-	dodir /usr/lib
-	mv go-*-bootstrap "${ED}/usr/lib/go-bootstrap" || die
-}
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild
index fcf1e6e43fe0..c756f746202f 100644
--- a/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="big-endian"
 RESTRICT="strip"
 QA_PREBUILT="*"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index fda088f97648..dc2e9a7c15a9 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,13 +1,9 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.15.14.src.tar.gz 23041432 BLAKE2B bcc79756b77cb7c435360a91da853b723ba33287a803250ff6bc36d523eddc293265797dc63df2ca6c504050d56c34336dbed205025f2efdda9247fc9a07f7e3 SHA512 2bf18efcb3a5f9e54de0a0e7ee27a689c2dc895d9403bc6f66e500358e70d1d664d7f17102126c98bd26fa2a3346ead358684e45b1a354cde8764c715064dd92
-DIST go1.15.15.src.tar.gz 23042945 BLAKE2B 4787b9b1c22d5e0bf35350dc075cbdb51d838aff7972cd4c8d821ad495e712527499e28fcfb1f04738b8d749d01f432ec5d254d9d69762234a7f12ff94933e7c SHA512 bf8a6f669d024ce77271fbc8dc1d7a727c4da85c70cad00d0baaef157e7c5d7879ea9ae71cdb04e55f9c07f5ae76655264ca8a159c971eab1cf8a8861b74e69b
 DIST go1.16.6.src.tar.gz 20923044 BLAKE2B 7a46d33f947c1d7f2c6f5e0085cba89520fdb8859fc804c8318b85d0b0e888b74ca074affcf3119c2d80157485e8f679e37390cbd58c644b38948f7d15428b7b SHA512 82634763dce636c9e9cba1bbf74a669e8b88e6df095e80672f295edb82cc1fc4b8ffde91a1f56c3470f2c4d9ee0404f65146d7478b645890623f6c463513a61f
 DIST go1.16.7.src.tar.gz 20922206 BLAKE2B 65e53684f66975313caf4661a7c52b178dde8b32ac40f98fe8164fe035c835e1407ef442d41c7cbf907d5093703e440d0e62c398f8ed541bad074b537f6dd6ff SHA512 1aab6f3dcbae71ebfa29a1d9a46613a3aa48de01cee82b48842d92abbb4ee57db019a4d47a3f12af9553c8e2a982e90114a06ee187f908f7c29245d9786b9186
 DIST go1.17.src.tar.gz 22178549 BLAKE2B 86cb84ff782eaee3fc0411b1f31cd985f3fdcda7b2709f3a94cba0fbe827ac13632d0476e1f67deaf06d2352c2ea3ac9217db7d170702dffff6a64beabdb0814 SHA512 bb94d69555faa103bc092ce85b73168954a553a5c72e4b38c39bd99a3eb4db679f352685e66507b0945ed12676eb2a0c51674e456f68a9a5b98c3ec6a948d35b
-EBUILD go-1.15.14.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
-EBUILD go-1.15.15.ebuild 4576 BLAKE2B 65f5e98a13774b0ca8c96909df8f09d0cea265245f172e79db3fafb65774d3f78a583eed1d974b4abbfa5ab2aac53cfa89e2a57d50d4b2d65bd7738592bb0c96 SHA512 c327ec1e99b67fd977643f3232f11a296288d832722e350c37985c5e55f62716c4ea6d9935efdd703c565168fa875b612ad6b952c6f20afc143a7b04912dc89c
 EBUILD go-1.16.6.ebuild 4794 BLAKE2B 54a75927b9d5e7fd50a83de625087f34ec4f0abbdaed135ab709b9581e141f0e96b52cc9fd64b797a3092e8e057fd84c9d9db3ad74de9945a72253c23a7d328f SHA512 02ff8dd6f4e225e3c414ef6e3d7792fb6a8e95914e8ef75caf8606c3f931bce72e7e2c77d54d6f350b743bc5de7f441ba405a5b8ff758b5a3be64a7922b2e41c
 EBUILD go-1.16.7.ebuild 4796 BLAKE2B 3748fc2a094b1f8d755948f4e245ec0d1ea73d528d4d067db81ba3c27fb25be85828648901f806e00a3fd79c1f0697632847afea9cc831020873dbfbae17ea12 SHA512 89f922003412c0d064b497dbe2eea3d755121876dcb3ab78a6430d6bbaf4982ac597d93db592bada28a96b9928516ad80d396d5a7b664e5f277858b30d11f076
-EBUILD go-1.17.ebuild 4799 BLAKE2B e4ab02babd5f6d6020b5a67c5640c7c5b0661c6ecb9832ce0fc702f2f91da7ac5f430fc76e2feb94ef8f460cda6262765adba361c796232a28a15d2728de310b SHA512 5a54c5120a8c08cd58ab6a7497c1cf5ed07c637c69994bbf437c7d4c50b01b3ec6744f04e2644bfa316ace7237fdd84ee304affa18a0d2d5dd3e4380a58d1dd9
-EBUILD go-9999.ebuild 4799 BLAKE2B e4ab02babd5f6d6020b5a67c5640c7c5b0661c6ecb9832ce0fc702f2f91da7ac5f430fc76e2feb94ef8f460cda6262765adba361c796232a28a15d2728de310b SHA512 5a54c5120a8c08cd58ab6a7497c1cf5ed07c637c69994bbf437c7d4c50b01b3ec6744f04e2644bfa316ace7237fdd84ee304affa18a0d2d5dd3e4380a58d1dd9
+EBUILD go-1.17.ebuild 4873 BLAKE2B c22ce3b3a554a8936decdef9d1c58578eccfdb44fe44316bd36c3fe232d14e53766c1e85a616b1758ef992754ef5bcafc045e7b1166ef35c6d8424642442437e SHA512 74b629a6055047dfc58cedc9e0848b76b2544675e20e76d702a0d0e00f64d84644e1df034d5959fccd26b6c4b230cb4a56f526f1d4a19e4172e85ab450d718b1
+EBUILD go-9999.ebuild 4873 BLAKE2B c22ce3b3a554a8936decdef9d1c58578eccfdb44fe44316bd36c3fe232d14e53766c1e85a616b1758ef992754ef5bcafc045e7b1166ef35c6d8424642442437e SHA512 74b629a6055047dfc58cedc9e0848b76b2544675e20e76d702a0d0e00f64d84644e1df034d5959fccd26b6c4b230cb4a56f526f1d4a19e4172e85ab450d718b1
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.15.14.ebuild b/dev-lang/go/go-1.15.14.ebuild
deleted file mode 100644
index 0d4ac09e8905..000000000000
--- a/dev-lang/go/go-1.15.14.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.15.15.ebuild b/dev-lang/go/go-1.15.15.ebuild
deleted file mode 100644
index e252c4e94fc8..000000000000
--- a/dev-lang/go/go-1.15.15.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.17.ebuild b/dev-lang/go/go-1.17.ebuild
index 75bf3b4e5a80..9fe46e9a8049 100644
--- a/dev-lang/go/go-1.17.ebuild
+++ b/dev-lang/go/go-1.17.ebuild
@@ -38,6 +38,9 @@ BDEPEND="|| (
 		dev-lang/go-bootstrap )"
 RDEPEND="!<dev-go/go-tools-0_pre20150902"
 
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
 # Do not complain about CFLAGS, etc, since Go doesn't use them.
 QA_FLAGS_IGNORED='.*'
 
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 75bf3b4e5a80..9fe46e9a8049 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -38,6 +38,9 @@ BDEPEND="|| (
 		dev-lang/go-bootstrap )"
 RDEPEND="!<dev-go/go-tools-0_pre20150902"
 
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
 # Do not complain about CFLAGS, etc, since Go doesn't use them.
 QA_FLAGS_IGNORED='.*'
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index e1a9d0839d8c..7c0ef6f48946 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,4 +1,4 @@
 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
 DIST mono-6.12.0.122.tar.xz 292266176 BLAKE2B 07043c5fbca33edf64ebca0392b47af9b9ab502be772efb5afbe5ec9e8683b7f4e96a305ee906dff617842bdba2819c2abc130d7aff23b12779f403bbd88f3bd SHA512 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
-EBUILD mono-6.12.0.122.ebuild 3278 BLAKE2B 8df76c4cb507c70dcc2fd237f7207b288ae4f1178645a5421319bd694000a0bacdf50686c2ef4d8d8d1d1100630032aa21b1fe888682c73795ddd7d945b971ea SHA512 b654423b24a6f44457a60ab60b3189d940ef9b421bcbe0af2adf50e0211d6dfe05f3a6a8f43e73151737c7932a5a762ddb6e8657e9105691dafe8af2eaae190d
+EBUILD mono-6.12.0.122.ebuild 3285 BLAKE2B 21b8c9a96de5bbb6a60567fef3560a68a582c91c7dad438cb58408e153ca9d1044e0249688defd15d98ef8997a0985f522386f11eab93060d97992c5a9d0753b SHA512 4a4ebb8c6ca91023ae9965cc55924ec682497a3ffb67af28864df5f77b6ecf0ce31afe900798db30e8417ef14bf9edebb390a44db4785e71d4332e12efb6946f
 MISC metadata.xml 581 BLAKE2B 1dd22508ef6e7287bbf1826a70c7a4f257e83f6028040d732cb05cd86e217a9854eaca9ad66035aa73409bebf470a4fa76ef38955b4663cc00438caec491638a SHA512 033b8ac8df5b976e0328bb2022133006bde24caa4dd88d1db44d3da810dc13caf3d9f9e95c1b1aaf4c1d9f988d198cdd1c0b247b1faa46eacec2dd9e80856e4d
diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild b/dev-lang/mono/mono-6.12.0.122.ebuild
index b1486e782657..449d4aebe3b2 100644
--- a/dev-lang/mono/mono-6.12.0.122.ebuild
+++ b/dev-lang/mono/mono-6.12.0.122.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz"
 
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86 ~amd64-linux"
 IUSE="doc minimal nls pax-kernel xen"
 
 # Note: mono works incorrect with older versions of libgdiplus
diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest
index b390cef171a8..5555abcf5bb9 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,3 +1,3 @@
 DIST sassc-3.6.2.tar.gz 26637 BLAKE2B 97699b1235dc955ef976c2ee87a42b5153effca4703c1003363bb192eaae5fd2519d7c8ae96bb94a53ea98de95a208b44f680dcedf8334b1d179a3484261319d SHA512 fff3995ce8608bdaed5f4f1352ae4f1f882de58663b932c598d6168df421e4dbf907ec0f8caebb1e56490a71ca11105726f291b475816dd53e705bc53121969f
-EBUILD sassc-3.6.2.ebuild 543 BLAKE2B e2a2cd075b4c2e04572595556656a0bb3b52188b642e442eacd55cb82be0f730fe09ea7284c6738f82f8e4b0decb9251ac0ec28daa9c42c9e97fae0756a75d3c SHA512 5e99ce07c9346d7769d5bcaa3716aabf60615f229ec0f33f202f1014734ba723350e8da231b7ff080bf1dc9fa492e5431e1cd6ec5ff1f8a1064b17f183ab7925
+EBUILD sassc-3.6.2.ebuild 550 BLAKE2B 89656b80229f3cf480dcceb40bd0ae31f1dc59a8268838b117aa23f41f56c36eba8c8f1380ac6a78a6d1b0379e2dd37113c45381123ba22371f605f593d52e45 SHA512 210b7db0312114614a834819c4e4ac433b89257bfede753c305a6284d694c247390b8826a4fc6a98ad4afe5db97670b893986a87935f5c9720dbb2057012c224
 MISC metadata.xml 572 BLAKE2B 706fbe91b8c10dfefc08c23797fe777577bf121e95f84f1c31ed41c956ac665af94f0f8e07457c4429354971a79866cd7ba7a76326cc2391c73b1f178166cccd SHA512 a7c798f0f7351bfd6c01d7f385af6c96a3f1a0e7570283cad837b718918307f0c05c663c82f1087aad2d9e8d60d22f2805bd6df7ac09b22d40c3f81660d720b0
diff --git a/dev-lang/sassc/sassc-3.6.2.ebuild b/dev-lang/sassc/sassc-3.6.2.ebuild
index d51a6610a8b4..e01ec9ea83de 100644
--- a/dev-lang/sassc/sassc-3.6.2.ebuild
+++ b/dev-lang/sassc/sassc-3.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
 
 RDEPEND=">=dev-libs/libsass-3.6.5:="
 DEPEND="${RDEPEND}"