gentoo auto-resync : 29:08:2022 - 22:47:16

13 files changed, 4 insertions, 753 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 52f686c616aa..f7d1997b513a 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
index 7dc73e16d5fe..6b22e3297146 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -1,10 +1,4 @@
-AUX arduino-builder-1.3.25-platform-paths.patch 982 BLAKE2B 9bc9d1d7cb12fe4f1e0539a2a548bbeb9ecc596e03fd9e7757d2d011e15b72a176095311063f0c58db2572db5912f6fbf8da493a83395f16f806ccd8a1c8de7a SHA512 8a2055cb6fdc0141701db908ca26c390d1f5992234eae5410b828a84972fcb0c2645b4062242064e37118ed20bad75b08fe044110a65a7b10c9662f62c3f44e7
-AUX arduino-builder-1.3.25-skip-tests.patch 5030 BLAKE2B ab80714f3168a61cb8d0787014e9710328319448e68f7d39758aa36227337a0f1609ffe43dc9c8104a831e96bccb81e4045c61a00137f4471ac9a575ecb797b8 SHA512 fe5730a5ff1bed4b214096840498613cf41e95fd700690bc1f45596b290c360b53458aab43d4a6bb6e3402724e6debcce8be47aa8e1d55731b9b213324d2fdfe
-AUX arduino-builder-1.4.1-platform-paths.patch 952 BLAKE2B 806ac4d6a0c1b2319d8ac3e76034893b809d21b84bf984c2ea73a935aa9c24613f2f48b11825611d6dac5c1c7ae413eae27bb1ba3b3144b8747bd3fa91e3090c SHA512 7d2acbaf5c4efd9773da7bf8e513cae4f013ffd016b84189981af839e1f4d518b8522049f07daf3e08c787d5f72ca307566bb1fd60ac3da86947f36ad29e8c27
-AUX arduino-builder-1.4.1-skip-tests.patch 5635 BLAKE2B 1aa9cd5a6826df30172cdb34b4bf71c553579c3f891abc4f630662e530d2b959f73225b0022e26b01b35306901e05498e11430a392115f53212959f2ebf7ac8e SHA512 09acfb0abfb02dba7d76641c7056a2f6b9e151cd43ffd8d8ceb0e0d692f35b372c9271456a6095b21dafd7971f64d9afb11af52720fffdc81e6035efc1e922d3
 AUX platform.txt 1189 BLAKE2B 57f5cc422b774a071edb688f02f941968f9923f88786fef84b84dc1caef922f0aee80c29534ad385576f519a208215ce99e9365d56f1d189d00af9410ae274e2 SHA512 fb85837375ce3a386a0c54ec20e987d23c463918f5461a7d4d191b052faea433b190b5c9950ba0e439b25ac13ef2029fc10cf5a2e430242f680cb08ab97e54cd
-DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
-DIST arduino-builder-1.4.1.tar.gz 220058 BLAKE2B b993ad508b81b3f05bb24747a63ac7b826739265aabc0437be403ca7154e6f3b580dacf235979fa4b395c6cc8c978e2cbdcab072822bd8fe61e42074ca4323e8 SHA512 d72f63d4235531310c412b096d154977d7d6ea2746e8703c8208e33e7bf3cac416817ccb5fbc47248bfe4a5858fa3a91117919b8cb636261c5cec28b8bc415bc
 DIST arduino-builder-1.5.4.tar.gz 38550 BLAKE2B 0dcf6097be6b42e52a74e8feeaa44f54c77a780a8fd0a2d046342b160d3eb6ef586e8b98c3058f11693991883acc83e3fd68f381cdab13c5fac410b2b0b8a27e SHA512 a5d117018e9eb3587564cfe49bbee95ac93eef742ce21ca49e4f1037b51fd64f1f2ffbac6fed282dfc79f307d6499222fab94f6c5472030cbb2a134fc553ea00
 DIST bou.ke%2Fmonkey%2F@v%2Fv1.0.1.mod 21 BLAKE2B cb370d962525feda03a1308de4d483ee6c5c21dd20dc9a364e4b62f3a5bbf4c01c4d02ba328a71648415cd00d2008b889067d9f5bebb24bb799049bd4aa3267c SHA512 bbfba4d582bb53a1d5bf3e73864937ffa7a8ab810b7daf2959f58fd369f88b62a02321b0a4d26b117ffe4a4f488180586613ddbabb342df077a72a7208528da3
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
@@ -335,19 +329,6 @@ DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa
 DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
-DIST github.com-arduino-go-paths-helper-751652ddd9f0a98650e681673c2c73937002e889.tar.gz 14609 BLAKE2B f8a5b54f9898db7ea02d8aad779fc32cb6b21e430c84c5f77b985f9a23dc62de95a6a366956b7861b6b4b261ff5f30d3b20c92e51b256ed6f223a309a644302d SHA512 6116531448270b502187cd91d2a0847a8791c53b65729766291f1ddaa9bc2ce95b0d24a54dc895ad62e2d04c092081ce46300101b9f371db78b0204a541c8252
-DIST github.com-arduino-go-properties-map-ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz 16406 BLAKE2B f6afeb160114bfb221c882d1b2c8e7f6d6841585affbf349c82c421500d28cf2b09b28bef960048c357fac69ef5432cecc0a0098f7a4929aa0d3d566cbe56bd1 SHA512 5327e207b4a1a978585345d498f4af39bdd716686c058dacebada113cc07066834ebe19eb8f4d8388d400755dca7e8656bc053e7d8804a1d7e04a1cc6c4414ea
-DIST github.com-arduino-go-timeutils-d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz 8086 BLAKE2B d2e558b3c88e084c99cd0dd0ccaa0859e21b53671d4d28f57cce505f7fda0f89fdde7a08bcf7d2e4d8b57e4a760bdc608e97f0c27542fd0a396a548494bb7351 SHA512 e573f448c4b0b17882be98516abcdbbc4174e3ab041ce1390bc7e3e365932f1a4c7fe63cebf4e82b43bec5d5f4748511fa608a777a0cbc18b29e224041884fb8
-DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
-DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
-DIST github.com-golang-net-ed066c81e75eba56dd9bd2139ade88125b855585.tar.gz 968328 BLAKE2B 14d5542bd808b9571a8305a5d2054df3205419249724851e976e354dab653de2266b0b9d7b46b4fd846a7d810bbd510be54d0d98e6d6c5cfea5d19e8df5ae528 SHA512 f63654665e7221b089f1dd9b9603670481b1a59137cf0b5c4cbe7c77a6a66b7537dc03b7c412328d9186edb8a661e66a82ee9839b594d176bee6e7377f13cca4
-DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
-DIST github.com-golang-sys-11f53e03133963fb11ae0588e08b5e0b85be8be5.tar.gz 1222479 BLAKE2B a84f877365823217fa52d1e31b40016109b18816f2c53539278b217c92f877b4a0553f59904eb3e6a9286919dc5472fa8efeaac65a0662b9b88d866e75284df0 SHA512 46a1b9d4d48f808d2658b796ef84f4e6fe2469bd5ab6327715b47a44b28154bbe503dca8d0932a234ea554febe97025e4da7543bd3aca4342458d082567187a1
-DIST github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz 6588337 BLAKE2B f182e9a40157c43aa749fae5fd6aacadf994a7c2051fc23dfef8031b243f691446d4e5c93c9b363ab22df38f533b1635aa45e23f4d8de7947ad7ab0aa8e5898a SHA512 caae52905ffdaa8e712f6b92a03a8cf9d9eba227e04ee795977c2b76bd79bc16457f846c11e45525f3e3df557fab5e0279fe098c0145b5807c0e580dd339f452
-DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz 2323831 BLAKE2B a614c74b60f8e347b47c8686807228ea76b021a918fc732b69293c8b59c1bc5396e320cbce6db87ab43b9a4fd649d19779874934bdd667f7cabf03165439c54a SHA512 a6524f31e8c4775195c245ffbe54c7f770591d46663ea86b8120ffd8efb3cf9269569fbf457b0d0272dc47177ccf3b413e858c2b437ee9892b5ac6698d07ed4d
-DIST github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz 506815 BLAKE2B 498909d0704b46d54571ad1f87d7636fafdf48f11fbf53e5e8ec6cd16aa6cd57cdfaedd8a7c00cd33ff60c99b0ab0dbf3f9c8df28155c75b2ceeaada3afabf92 SHA512 37970d20ce358d5186a9a152b1a0b1af816f7d53de8f2c35c901e8533e8191125e08ca60e1177bbab5e2585a1fa6e0fa9785ac70caadc5aa0fa58c189d26ca95
-DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
-DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
 DIST go.bug.st%2Fcleanup%2F@v%2Fv1.0.0.mod 171 BLAKE2B adb6afc74e58dbcfd7ed6d7b39ada2572791c2ea2a172e19c6668fc22a04be7bc434469f6508b5bc90b6e3e1d35a017b2b2accc59bc4b47fba234352d803824b SHA512 6009e40829e12a205fb4438d55a3c9856d0f9dcf675dad5099890ec9c89c82e1dde1e3b110eee85ab8838c2f2fa52bae67ff6b747dc7d768b5a7d97d3b9b4278
 DIST go.bug.st%2Fcleanup%2F@v%2Fv1.0.0.zip 3020 BLAKE2B 8addff8d095084fbfe64fae5c1ea15867e6c3b011db8c353913d1a5bd8a8f8ae55a6fdf252247ff771523a27fc635b6d223c2b78f7021c4923ab35ada0fb9c9a SHA512 06b5f5d9e4c36df5bd477ebc65b4661070c70391fdcf8d660ae558fef28f25fe635cc920d6ec2ee96f5b2b7d0af7cf65bb329db02543ec7ab6ff9b8a25e70e6f
 DIST go.bug.st%2Fdownloader%2Fv2%2F@v%2Fv2.0.1.mod 84 BLAKE2B ac7fbc551428259c64af58eea7024fd0777113d25e506b8ec73d50d9970548ce22eca9519db10ce4bbe01c84d9a149c27ca914f53cb2a0ac366d97095b07444c SHA512 8568f0a6835234576316a0d8ee5a136aa684007729e4f9e2223300db3c886695e41f9df1c3d46b30ac83beca8d6ab7efd99da9d1891a4084f22237d108e43472
@@ -543,7 +524,5 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
-EBUILD arduino-builder-1.3.25.ebuild 2824 BLAKE2B b8d42a6e5086df92dc85a3714720140b0aa99ece6035d8356565eb0e9235d4da65206a38559078341576bb5a3dcb77b53dfad115b1f42ce54d132771867c7709 SHA512 0d6a2360afc615db3c1a43600cbe70cc9348035a170727f3ce7097cd7630239a376a095b2b4763c3e9f11d8b915be848d5387d6ae7d29eccaeadbb46e02242bc
-EBUILD arduino-builder-1.4.1-r1.ebuild 2648 BLAKE2B 0066af35c8917dfb8eaf4eec2d272d534301c7ba725d3d75aa79bdc5faa40584961c7dd87b9a463cd27654bb3f9795d3f5c9f1df883d9c6190c4efd6abc99a22 SHA512 87987c3acf7ac7cea649cc21676308dea88cba82e9e6f867a3fcb517244e3a53c718724c22ae9784f8e169334ea1f64604cb931e60e3093b178c6762e6ca5dc4
-EBUILD arduino-builder-1.5.4-r1.ebuild 28789 BLAKE2B 89a507026d387654eaaecc7113911a23107e8e875f98afaf7d3d974c92f1d40b1db1081a0d76e97205edd7f30d6bc01aa4b2d76d55256f8098ecc5b5b5d9333a SHA512 3bc99733f403aa05415f2fbe6b1c2433e29a02542cf4a19bd86a84f0616bf1277e79838a1b34cf8a954b6ff621e55dd821a82d16ba4e2d3ecffe9e88ee9743de
+EBUILD arduino-builder-1.5.4-r1.ebuild 28788 BLAKE2B 37dc5b6011a0fa874f0e6fc4e0d54f405e0b01e20ddd571c3044e00d049e2e9545bcc6e5409f6ad91740e9397ad5570775f5b6fb8305fe3811702438637c3be1 SHA512 b22459bbd3212394230ed19780b8ee35742c0ddb0782a3e074c097ee63d5935d0b0bcd4b09d9fbc36eed3a70bd0a43dd2c2b6d6b22056a28f3aa96f2b90ed9ca
 MISC metadata.xml 340 BLAKE2B 91d82acec49886964e0bfa495b91ccde6d48e43270d19bc21637d3416c1ccdff363713ebf396c7f0eb86363261781d48be0fe73e41666ad6b03c0f909ac1b008 SHA512 86412069178c4361a54267843d4c5e928707015262cd6c1435842e5ddec08b27be518b75cabfbbbe492a3749d1b171a79bb7a155a0fb1912e9b41bd4ac00fce1
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
deleted file mode 100644
index 9eea737b208b..000000000000
--- a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="arduino.cc/arduino-builder/..."
-
-EGO_VENDOR=(
-	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
-	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
-	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="A command line tool for compiling Arduino sketches"
-HOMEPAGE="https://github.com/arduino/arduino-builder"
-SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-devel/crossdev
-	dev-embedded/avrdude
-	dev-embedded/arduino-ctags"
-
-DEPEND=">=dev-lang/go-1.9.2"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	# As we know, golang packages have to be compiled from namespace-aware paths which is the whole
-	# point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
-	# namespace inside its source package, messing up with our build process which can't find
-	# packages. Also, our source package contains multiple namespaces which further messes with
-	# messes with our vendoring process (each namespace needs its own vendor directory).
-	# We do the following to try to work around this mess. It looks like upstream reworked this
-	# in its master branch so we should be able to remove this in the upcoming major release.
-
-	local deeppath="${S}/src/${EGO_PN%/...}"
-	for pkgname in builder properties timeutils; do
-		ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
-	done
-	ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
-
-	# path paths so that they point to system ctags and avrdude
-	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
-	eapply "${FILESDIR}/arduino-builder-1.3.25-skip-tests.patch"
-
-	default
-}
-
-src_install() {
-	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
-	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
-	# built. All we want is to install the final executable.
-
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	echo "$@"
-	"$@" || die
-
-	# END OF COPY/PASTE
-
-	dobin bin/arduino-builder
-
-	# In addition to the binary, we also want to install these two files below. They are needed by
-	# the dev-embedded/arduino which copies those files in its "hardware" folder.
-	insinto "/usr/share/${PN}"
-	cd "src/arduino.cc/builder/hardware" || die
-	doins "platform.txt"
-	doins "platform.keys.rewrite.txt"
-}
-
-pkg_postinst() {
-	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.4.1-r1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.4.1-r1.ebuild
deleted file mode 100644
index b47674849f04..000000000000
--- a/dev-embedded/arduino-builder/arduino-builder-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/arduino/arduino-builder/..."
-
-EGO_VENDOR=(
-	"github.com/arduino/go-properties-map ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41"
-	"github.com/arduino/go-timeutils d1dd9e313b1bfede35fe0bbf46d612e16a50e04e"
-	"github.com/arduino/go-paths-helper 751652ddd9f0a98650e681673c2c73937002e889"
-	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
-	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
-	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
-	"google.golang.org/grpc 8dea3dc473e90c8179e519d91302d0597c0ca1d1 github.com/grpc/grpc-go"
-	"google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
-	"golang.org/x/net ed066c81e75eba56dd9bd2139ade88125b855585 github.com/golang/net"
-	"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
-	"golang.org/x/sys 11f53e03133963fb11ae0588e08b5e0b85be8be5 github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="A command line tool for compiling Arduino sketches"
-HOMEPAGE="https://github.com/arduino/arduino-builder"
-SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-devel/crossdev
-	dev-embedded/avrdude
-	dev-embedded/arduino-ctags"
-
-DEPEND=">=dev-lang/go-1.9.2"
-
-PATCHES=(
-	"${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch"
-	"${FILESDIR}/arduino-builder-1.4.1-skip-tests.patch"
-)
-
-src_install() {
-	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
-	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
-	# built. All we want is to install the final executable.
-
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	echo "$@"
-	"$@" || die
-
-	# END OF COPY/PASTE
-
-	dobin bin/arduino-builder
-	# In addition to the binary, we also want to install these two files below. They are needed by
-	# the dev-embedded/arduino which copies those files in its "hardware" folder.
-	insinto "/usr/share/${PN}"
-	cd "src/github.com/arduino/arduino-builder/hardware" || die
-	doins "platform.txt"
-	doins "platform.keys.rewrite.txt"
-}
-
-pkg_postinst() {
-	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
index e40348d5e8e1..171593f13369 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
@@ -539,7 +539,7 @@ SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-devel/crossdev
 	dev-embedded/avrdude
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
deleted file mode 100644
index 854dc886af01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
- 
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
- 
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
deleted file mode 100644
index 4ed170061c16..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Skip tests that can't run on Gentoo because of the network sandbox
-diff --git a/src/arduino.cc/builder/test/hardware_loader_test.go b/src/arduino.cc/builder/test/hardware_loader_test.go
-index c9ea1d5..e7c68d2 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
-@@ -41,6 +41,7 @@ import (
- )
- 
- func TestLoadHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
- 	}
-@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
- }
- 
- func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
- }
- 
- func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff"},
- 	}
-@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
- }
- 
- func TestLoadLotsOfHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
-index 3642510..e6391b6 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
-@@ -83,6 +83,7 @@ type Core struct {
- }
- 
- func DownloadCoresAndToolsAndLibraries(t *testing.T) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	cores := []Core{
- 		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
- 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
-@@ -165,6 +166,7 @@ func patchFiles(t *testing.T) {
- }
- 
- func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
- 	NoError(t, err)
- 	if allCoresDownloaded &&
-diff --git a/src/arduino.cc/builder/test/target_board_resolver_test.go b/src/arduino.cc/builder/test/target_board_resolver_test.go
-index 274eb92..d6973e3 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
-@@ -39,6 +39,7 @@ import (
- )
- 
- func TestTargetBoardResolverUno(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:uno",
-@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
- }
- 
- func TestTargetBoardResolverDue(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:sam:arduino_due_x",
-@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega1280(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega1280",
-@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega2560(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega2560",
-@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomYun(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "my_avr_platform:avr:custom_yun",
-@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomCore(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "watterott:avr:attiny841:core=spencekonde,info=info",
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
deleted file mode 100644
index be1f2b5edda1..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/github.com/arduino/arduino-builder/hardware/platform.txt
-+++ b/src/github.com/arduino/arduino-builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
- 
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
- 
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
deleted file mode 100644
index f66e829e4b01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Skip tests that can't run on Gentoo because of the network sandbox
-diff --git a/test/hardware_loader_test.go b/test/hardware_loader_test.go
-index 147396e..da6c8ef 100644
---- a/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
-@@ -41,6 +41,7 @@ import (
- )
- 
- func TestLoadHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
- 	}
-@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
- }
- 
- func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
- }
- 
- func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff"},
- 	}
-@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
- }
- 
- func TestLoadLotsOfHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-diff --git a/test/helper_tools_downloader.go b/test/helper_tools_downloader.go
-index 49aa847..ba77a57 100644
---- a/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
-+++ b/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
-@@ -83,6 +83,7 @@ type Core struct {
- }
- 
- func DownloadCoresAndToolsAndLibraries(t *testing.T) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	cores := []Core{
- 		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
- 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
-@@ -177,6 +178,7 @@ func patchFiles(t *testing.T) {
- }
- 
- func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
- 	NoError(t, err)
- 	if allCoresDownloaded &&
-diff --git a/test/target_board_resolver_test.go b/test/target_board_resolver_test.go
-index 49e0abe..7a50fe1 100644
---- a/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
-@@ -39,6 +39,7 @@ import (
- )
- 
- func TestTargetBoardResolverUno(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:uno",
-@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
- }
- 
- func TestTargetBoardResolverDue(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:sam:arduino_due_x",
-@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega1280(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega1280",
-@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega2560(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega2560",
-@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomYun(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "my_avr_platform:avr:custom_yun",
-@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomCore(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "watterott:avr:attiny841:core=spencekonde,info=info",
-diff --git a/test/wipeout_build_path_if_build_options_changed_test.go b/test/wipeout_build_path_if_build_options_changed_test.go
-index 51bfe80..8501fb6 100644
---- a/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
-@@ -42,6 +42,7 @@ import (
- )
- 
- func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
-+    t.Skip("Can't run in Gentoo")
- 	ctx := &types.Context{}
- 
- 	buildPath := SetupBuildPath(t, ctx)
-@@ -73,6 +74,7 @@ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
- }
- 
- func TestWipeoutBuildPathIfBuildOptionsChangedNoPreviousBuildOptions(t *testing.T) {
-+    t.Skip("Can't run in Gentoo")
- 	ctx := &types.Context{}
- 
- 	buildPath := SetupBuildPath(t, ctx)
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index e58ddf8d3aae..22b67cf5da20 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,18 +1,8 @@
 AUX arduino-1.8.5-lib-loading.patch 1164 BLAKE2B c1e0168f04727ab39340db3594d418eb1f6a25cbf728fb4c75c4db79b9b7b67daeaac35bcbc111f9e7eb76ba5539a5a57bcb5a3f274f3b92cf4b5bf6e51e513a SHA512 c2487e57e654872b8c4a4e046431b43385654ebdc8c9e8bbf5f9593f91a40f0d3288d0f13b6237dea351284cb5e4044013a406af1e9606b9111df3cf7f0ed760
 AUX arduino.desktop 196 BLAKE2B f844a6a0c5b9295a61f42ba76e3d11f988cc1186df95acaf376a1710cf4644de84d31cf1846d1c135c7559d23b005429e6f90a4cf59e090fb4d5a160108817eb SHA512 c02376865c1f0cc11f7b985e57f05ce4049bd49645d71294817896059e043a3679199b47e6687cc6db6ca8908c874dfeed6cb9ed083ecce89f001104e37bdc49
-DIST arduino-1.8.13.tar.gz 42634076 BLAKE2B 66755822da4cdb804e313730784d2824f919a09a8c93973ceda2c5964142f8c93081c9d79e0172b745cc938ed2f01b0279a1977284bde6e55f3a330fa113c21c SHA512 3481d1ed4ca4ffe038bdfc17acb6f2ec113ecc48d1a3967178738a852e5ba1d28044d2ea7cd4ae0984183a70ac8e6f8eb5a707624fd70e16561aa6cd6f4b9cd8
 DIST arduino-1.8.19.tar.gz 34715155 BLAKE2B d0bb23548db5b5c402e418f85339c1ace9a21306f5866bd4923edabd188e9e8e273227927d2f45ce50cdc1ee7bb59dfa4d62b027ee0f723d5948ec9ba77c0d50 SHA512 65db7aec67d6bbb96eea83d60608dd4c138ff1f9dd3c02259f3ffa0ce51f59a9a073a1ddb48acc0208477ece92ec79b5a6a87b445110f59e698990d61300bbf9
-DIST arduino-1.8.7.tar.gz 38372798 BLAKE2B a59aac177bb95e17eec7ab85d88cf0a25737f21d4be88458abfd8ffa12f2215b82e2256fc2921a14583b60f51f3144f46d35d19ae83ba6dd726a2a8773839aea SHA512 6676e0a7e0383eb2addbfad05020cb54c1606f6920840c269625e58354fd950b57037f553e3f9661b462dfbb8afb40d6ba7390cbe0c4b96406871279939b5823
-DIST arduino-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
-DIST arduino-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b
-DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip 7229880 BLAKE2B 93729cf9fbbdab111a71020502cbe59b4a62217e90fa684977184e9de18cbd8e9a80d149184b794587385550a46aaef14a08057eb35b734146a911d5913496a7 SHA512 eacd20bfcc759f0b0744629073d1debd3d4fd8a36e5948314d149902568158839965755b833a263a71c65d7092d9091a5d05695c01854d4fb308fbec3711bd3c
 DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip 21873817 BLAKE2B ef2ee6291c452b58b990594a1cbae0daf86e1b6078b51225a7253d782554648610d39c2761ed67914e54a757d1345c7de4c8a63fbe12483f0134c21eac5dc303 SHA512 17e2d07fbdca491a8d80abb6f2ceb000c68af59b755da7db70dce2d5f781204340f43365c40e641acf0b084b2073b3b056f63d68990f405adefb76887f4c5b72
-DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip 945515 BLAKE2B a2ab32b400f774f006e1afb69797951382f8768ee55216591baecc8fc0665c31b31df403ffd17825ae524dcd0bcba87bfecbdc82722f9105d68cf9d5c8298415 SHA512 2fd003b638133d9ff77d76952ce4a38c3c2ea78c0c0c849580883e5104c3a5c141313f74934eeda29a446388e3d502e69e65ded088e693b0ff5810a133001ba8
-DIST arduino-avr-1.6.23.tar.bz2 5001988 BLAKE2B 8b6ddc2d66e651a3a2b6bd6992cd1311aad223a6cefa1a1a4bc1fa05de449116511137f8cf13c50ca42b83477c66cf4aa3a7984f49905eb7a295eff7f2c3623e SHA512 70ff70446bfc0f036f7a2927e8e53861e60225a0a6c1eb993557278ec79b8337f3a5ee6fd6f6d200744d80104efb1783332eb8d6d53c9f1b6ea6dc3054d78fd4
 DIST arduino-avr-1.8.3.tar.bz2 4941548 BLAKE2B 48d84a30f3ccf1074df6ec006ccc58d702a572dee51cff1753121055d660ad6cea4176e74488af93227a9eeea4d3a9c0c0856711ebded26ee14a755fb519dd6f SHA512 c8a63ad79f16c380def83b1215762f5cbddfc51480d658853370c3210724bb04627272f3affc0ad01af4463a68980665a4e1c37cc8fabcec16e97c4550d1bb03
 DIST arduino-examples-1.9.1.zip 4810227 BLAKE2B 0781ecb330adc444e660f6db89533dfb01995ec87dec7b5f55e28e65bfaf7f505aa79362f5815193ea6500cb1d6a16a86d5f300acf70fc4eaff0265c2891d371 SHA512 c0e21dd374b2751a1e5f2b790202d4883879da2e26e9a23ccbaec478647e2b8160cbc085e76888deafc05b9b14b1aff4ce2a9b834a7b83e8226c3bc41801015c
-DIST arduino-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
-EBUILD arduino-1.8.13.ebuild 4768 BLAKE2B b9521a75e4b4d70018c9e5c14d311e980a9bdb5065615079ca2e93f6c6150e9b006be254745b76a5b6871434863fc1b03aab5aa376a8a1d625c5f738cdc18109 SHA512 8938afb6a2ec2b3cbd4b2ccf6cd03049b156beb2ea713a83a627a5d575e074bb19ac6e5ca46d23a999397815ceee06755553baa1f1a9f20a69ddf0d9ab36b223
-EBUILD arduino-1.8.19.ebuild 4273 BLAKE2B 487d4c611bb706f72c5cb6627838342772644d231c11e71dab9af01f963157e95d283bbf7dfa18e8339ea81bc41f2076649057bd4fbbbf72e31274c90ae83dbb SHA512 25c59a70f98a679b6ef8028404f8be3bbf0ffeab92ebb9a94524e99f2983621a9cf74ecd1781affee4fa93e25d96ac6296d17c034c6d08985bb315e9d0fe17f8
-EBUILD arduino-1.8.7.ebuild 4626 BLAKE2B d3c0b14878d02bf2e7ba10e6a492270309d75513cce22c912ff539bebdcd16887e9e33179a3bd0df4cea2888607aed987bcd9b0592db2a4453fae106027249de SHA512 4d0858e3d88eb66d4e561251598b2b7d7840b2e252b3738303009b740ffb8df3e7c69123116750332db1ad522c4e13869417bfd6243d7e15bed4797a791dafd5
+EBUILD arduino-1.8.19.ebuild 4272 BLAKE2B f0534a5a08c55879f1c20acee8d70d19bc493466e47774f8eb75e41425e0835661e30e4c34802ec8fddf6295a69582b78ff2f0ad9cd4c307adbffc29234bae76 SHA512 2e786a8f36c0602b2f5704b332c2309c660864cec27e2b2aa35b291391300f07f2e4288d7b65df3344064201f43df0cd52dd74e5e4ee83c6a1445c2f2e5d595e
 MISC metadata.xml 332 BLAKE2B 384c8751a6538aaca49c8fd242c5493d8321e957a1d186c9c6cf8db579ab74fe9bd25c96dda56a19afa063ade2833fe4b6d307163be7a7681421c65620fe40b7 SHA512 1d58a915f882ee70c55b5541e66cd33a1367e2f686949e1a13d7dcad62d1f1ec180d433898e5ba41f52ba9630a116b92c52cb5ad3be02127c144c1d37cfa35a0
diff --git a/dev-embedded/arduino/arduino-1.8.13.ebuild b/dev-embedded/arduino/arduino-1.8.13.ebuild
deleted file mode 100644
index 21bfa76063be..000000000000
--- a/dev-embedded/arduino/arduino-1.8.13.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2 gnome2-utils
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-
-ARDUINO_DOCS=(
-	"reference-1.6.6-3"
-	"Galileo_help_files-1.6.2"
-	"Edison_help_files-1.6.2"
-)
-
-for docname in "${ARDUINO_DOCS[@]}"; do
-	ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${PN}-${docname}.zip"
-done
-
-AVR_VERSION="1.8.3"
-PLUGIN_VERSION="0.10.10"
-
-SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://downloads.arduino.cc/cores/avr-${AVR_VERSION}.tar.bz2 -> ${PN}-avr-${AVR_VERSION}.tar.bz2
-	https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v${PLUGIN_VERSION}/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip -> ${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip
-	doc? (
-		${ARDUINO_DOCS_URI}
-	)"
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CDEPEND="dev-embedded/arduino-builder"
-
-RDEPEND="${CDEPEND}
-	>=dev-util/astyle-3.1[java]
-	dev-embedded/arduino-listserialportsc
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.8"
-
-EANT_BUILD_TARGET="build"
-# don't run the default "javadoc" target, we don't have one.
-EANT_DOC_TARGET=""
-EANT_BUILD_XML="build/build.xml"
-EANT_EXTRA_ARGS=" -Dlight_bundle=1 -Dlocal_sources=1 -Dno_arduino_builder=1 -Dversion=${PV}"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*"
-
-S="${WORKDIR}/Arduino-${PV}"
-
-PATCHES=(
-	# We need to load system astyle/listserialportsc instead of bundled ones.
-	"${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
-)
-
-src_unpack() {
-	# We don't want to unpack tools, just move zip files into the work dir
-	local a=( ${A} )
-	unpack "${a[0]}"
-
-	cp "${DISTDIR}/${PN}-avr-${AVR_VERSION}.tar.bz2" "${S}/build/avr-${AVR_VERSION}.tar.bz2" || die
-	cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" || die
-
-	if use doc; then
-		local docname
-		for docname in "${ARDUINO_DOCS[@]}"; do
-			cp "${DISTDIR}/${PN}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Unbundle libastyle
-	sed -i 's/\(target name="linux-libastyle-[a-zA-Z0-9]*"\)/\1 if="never"/g' "$S/build/build.xml" || die
-
-	# Unbundle avr toolchain
-	sed -i 's/target name="avr-toolchain-bundle" unless="light_bundle"/target name="avr-toolchain-bundle" if="never"/' "$S/build/build.xml" || die
-
-	# Install avr hardware
-	sed -i 's/target name="assemble-hardware" unless="light_bundle"/target name="assemble-hardware"/' "$S/build/build.xml" || die
-}
-
-src_compile() {
-	use doc || EANT_EXTRA_ARGS+=" -Dno_docs=1"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${S}"/build/linux/work || die
-
-	# We need to replace relative paths for toolchain executable by paths to system ones.
-	sed -i -e 's@^compiler.path=.*@compiler.path=/usr/bin/@' -e 's@^tools.avrdude.path=.*@tools.avrdude.path=/usr@' \
-		-e 's@^tools.avrdude.config.path=.*@tools.avrdude.config.path=/etc/avrdude.conf@' hardware/arduino/avr/platform.txt || die
-
-	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher ${PN} \
-		--pwd "/usr/share/${PN}" \
-		--main "processing.app.Base" \
-		--java_args "-DAPP_DIR=/usr/share/${PN} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
-
-	insinto "/usr/share/${PN}"
-
-	doins -r examples hardware lib tools
-
-	# In upstream's build process, we copy these fiels below from the bundled arduino-builder.
-	# Here we do the same thing, but from the system arduino-builder.
-	dosym "../../arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt"
-	dosym "../../arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt"
-	dosym "../../bin/arduino-builder" "/usr/share/${PN}/arduino-builder"
-
-	# hardware/tools/avr needs to exist or arduino-builder will
-	# complain about missing required -tools arg
-	dodir "/usr/share/${PN}/hardware/tools/avr"
-
-	if use doc; then
-		HTML_DOCS=( reference )
-		einstalldocs
-
-		# arduino expects its doc in its "main" directory. symlink it.
-		dosym "../doc/${PF}/html/reference" "/usr/share/${PN}/reference"
-	fi
-
-	# Install menu and icons
-	domenu "${FILESDIR}/${PN}.desktop"
-	cd lib/icons || die
-	local icondir
-	for icondir in *; do
-		# icondir name is something like "24x24" we want the "24" part
-		local iconsize=`cut -dx -f1 <<< "${icondir}"`
-		newicon -s $iconsize \
-			"${icondir}/apps/arduino.png" \
-			"${PN}.png"
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino/arduino-1.8.19.ebuild b/dev-embedded/arduino/arduino-1.8.19.ebuild
index ae754850d3b5..00bad17d94bd 100644
--- a/dev-embedded/arduino/arduino-1.8.19.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.19.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-embedded/arduino-builder"
 
diff --git a/dev-embedded/arduino/arduino-1.8.7.ebuild b/dev-embedded/arduino/arduino-1.8.7.ebuild
deleted file mode 100644
index 03635acd39ef..000000000000
--- a/dev-embedded/arduino/arduino-1.8.7.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2 gnome2-utils
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-
-ARDUINO_DOCS=(
-	"reference-1.6.6-3"
-	"Galileo_help_files-1.6.2"
-	"Edison_help_files-1.6.2"
-)
-
-for docname in "${ARDUINO_DOCS[@]}"; do
-	ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${PN}-${docname}.zip"
-done
-
-SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2 -> ${PN}-avr-1.6.23.tar.bz2
-	https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.2/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip -> ${PN}-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip
-	doc? (
-		${ARDUINO_DOCS_URI}
-	)"
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-CDEPEND="dev-embedded/arduino-builder"
-
-RDEPEND="${CDEPEND}
-	>=dev-util/astyle-3.1[java]
-	dev-embedded/arduino-listserialportsc
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.8"
-
-EANT_BUILD_TARGET="build"
-# don't run the default "javadoc" target, we don't have one.
-EANT_DOC_TARGET=""
-EANT_BUILD_XML="build/build.xml"
-EANT_EXTRA_ARGS=" -Dlight_bundle=1 -Dlocal_sources=1 -Dno_arduino_builder=1"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*"
-
-S="${WORKDIR}/Arduino-${PV}"
-
-PATCHES=(
-	# We need to load system astyle/listserialportsc instead of bundled ones.
-	"${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
-)
-
-src_unpack() {
-	# We don't want to unpack tools, just move zip files into the work dir
-	unpack `echo ${A} | cut -d ' ' -f1`
-
-	cp "${DISTDIR}/${PN}-avr-1.6.23.tar.bz2" "${S}/build/avr-1.6.23.tar.bz2" || die
-	cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip"|| die
-
-	if use doc; then
-		local docname
-		for docname in "${ARDUINO_DOCS[@]}"; do
-			cp "${DISTDIR}/${PN}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Unbundle libastyle
-	sed -i 's/\(target name="linux-libastyle-[a-zA-Z0-9]*"\)/\1 if="never"/g' "$S/build/build.xml" || die
-
-	# Unbundle avr toolchain
-	sed -i 's/target name="avr-toolchain-bundle" unless="light_bundle"/target name="avr-toolchain-bundle" if="never"/' "$S/build/build.xml" || die
-
-	# Install avr hardware
-	sed -i 's/target name="assemble-hardware" unless="light_bundle"/target name="assemble-hardware"/' "$S/build/build.xml" || die
-}
-
-src_compile() {
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dno_docs=1"
-	fi
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${S}"/build/linux/work || die
-
-	# We need to replace relative paths for toolchain executable by paths to system ones.
-	sed -i -e 's@^compiler.path=.*@compiler.path=/usr/bin/@' -e 's@^tools.avrdude.path=.*@tools.avrdude.path=/usr@' \
-		-e 's@^tools.avrdude.config.path=.*@tools.avrdude.config.path=/etc/avrdude.conf@' hardware/arduino/avr/platform.txt || die
-
-	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher ${PN} \
-		--pwd "/usr/share/${PN}" \
-		--main "processing.app.Base" \
-		--java_args "-DAPP_DIR=/usr/share/${PN} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
-
-	insinto "/usr/share/${PN}"
-
-	doins -r examples hardware lib tools
-
-	# In upstream's build process, we copy these fiels below from the bundled arduino-builder.
-	# Here we do the same thing, but from the system arduino-builder.
-	dosym "../../arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt"
-	dosym "../../arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt"
-	dosym "../../bin/arduino-builder" "/usr/share/${PN}/arduino-builder"
-
-	# hardware/tools/avr needs to exist or arduino-builder will
-	# complain about missing required -tools arg
-	dodir "/usr/share/${PN}/hardware/tools/avr"
-
-	if use doc; then
-		HTML_DOCS=( reference )
-		einstalldocs
-
-		# arduino expects its doc in its "main" directory. symlink it.
-		dosym "../doc/${PF}/html/reference" "/usr/share/${PN}/reference"
-	fi
-
-	# Install menu and icons
-	domenu "${FILESDIR}/${PN}.desktop"
-	cd lib/icons || die
-	local icondir
-	for icondir in *; do
-		# icondir name is something like "24x24" we want the "24" part
-		local iconsize=`cut -dx -f1 <<< "${icondir}"`
-		newicon -s $iconsize \
-			"${icondir}/apps/arduino.png" \
-			"${PN}.png"
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}