gentoo resync : 16.09.2020

19 files changed, 180 insertions, 270 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 5985c2093bbe..c823b9f4b68f 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 784812406f23..3be818a66dba 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -2,6 +2,7 @@ AUX arduino-builder-1.3.25-platform-paths.patch 982 BLAKE2B 9bc9d1d7cb12fe4f1e05
 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
@@ -544,5 +545,5 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 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.ebuild 28756 BLAKE2B 990454574e5237da2885006de40a7b68c245c62c13b05205f1fcadb80be89c90542d3f8246774e432d6ae6e65c2b15cd7cac380c671519d1e4ae81f5d2d5381a SHA512 0f388ca705ec80c4f9d8aeb22a36b28f2a4eeeeaed85989dd0320048e6edce6c78f3ec38cbcad6a05a8d3e01b0393a856ea6ec71f15740cbf51f39f92651ff8b
+EBUILD arduino-builder-1.5.4-r1.ebuild 28790 BLAKE2B 1170fb67774910b0c1226a829a853534443992936265bcea6e67b56b2419433afc21e90828c159afd6db20e98666f2516c185e5460bc3f62c864c7a2d960a6b6 SHA512 593963e3d981560dfe3cd5a25782bd9a8855d50f9b28dad9ad6cf768ca35d14d5f665e607abc28c5e7f6577e09240aaf4473a6a52afda3a3d38160d3045f3492
 MISC metadata.xml 339 BLAKE2B 8353146b638f77f9846c37e1717f19e9d3eff24a88a8299bb43d6118e47c5159a53ed8612681f5f849269a8d250d99b9dc57030452d96ed81975196b3faedfb1 SHA512 3a107172d306efee35994af117181d4a08388883d4efeb48dd270f8a711deae39d68e1bd38423e0a71d91f708d4c1877d300ed4823e43fda8a924bd98b8f37c7
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.5.4.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
index 6fc3e73f58bd..7fd9464f0d2b 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.5.4.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -555,6 +555,7 @@ src_install() {
 	# the dev-embedded/arduino which copies those files in its "hardware" folder.
 	insinto "/usr/share/${PN}"
 	doins hardware/platform.keys.rewrite.txt
+	doins "${FILESDIR}/platform.txt"
 }
 
 pkg_postinst() {
diff --git a/dev-embedded/arduino-builder/files/platform.txt b/dev-embedded/arduino-builder/files/platform.txt
new file mode 100644
index 000000000000..2bdd70c789fd
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/platform.txt
@@ -0,0 +1,19 @@
+# arduino-preprocessor
+# --------------------
+
+tools.arduino-preprocessor.path={runtime.tools.arduino-preprocessor.path}
+tools.arduino-preprocessor.cmd.path={path}/arduino-preprocessor
+tools.arduino-preprocessor.pattern="{cmd.path}" "{source_file}" "{codecomplete}" -- -std=gnu++11
+
+# 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=/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}
+#recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} "{source_file}" -o "{preprocessed_file_path}"
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 9471b67e0123..559d9edcae81 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,32 +1,14 @@
-AUX arduino-1.8.5-avr-platform.txt.patch 1215 BLAKE2B e4995a86865959d136cbbfcbdccdc1440c53344d9c90717a6d51dc7df2e5c22029de3af94d9f1a3b63243862c457f8ad1e7239359366afacb4a47b94dc5e44c5 SHA512 2032dda5e9c318550539f8d9c9ef1e0668bf60a11e6d6ae9c86e28c19518db999401538fc5b0af6ee606e2509ffc06d69d3e43b5bd63925ad92457cfc2d39d27
-AUX arduino-1.8.5-build.xml.patch 1402 BLAKE2B 84a9961cb21522a1bf3a485e8c758621632eda7bc15fb69c445197314a124042f19bc4619cea394a669659fb17f23c7240504cc01d31475d57234f1d28a962d9 SHA512 c279b5fabf6231deeb77b532d7bf0093ece2aad48c31d6bb5a524e32fde5dc58c9c102b3afee4e8e999021049101fae7e00dc4f1bf1ad8dad3ddf451a61835aa
 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.5-Adafruit_CircuitPlayground-1.6.8.zip 404619 BLAKE2B 993ec1282cc711b814db99fe1e4b50a2a6e6559722872e8fbcbb42e022c0e3611e10a4a0285468f82241eb5e15c0f91ff49ae9f2e0190d80a674cba51c93eae6 SHA512 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491
-DIST arduino-1.8.5-Bridge-1.6.3.zip 64717 BLAKE2B cb20da7b1db33ad89bd5fcadd01035592b664a7aaa98c27463fad643deba0b1d7e48b341f75f2564716f5b32e800b96934202c683b9a68c628d5af01662c9b7e SHA512 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
-DIST arduino-1.8.5-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
-DIST arduino-1.8.5-Esplora-1.0.4.zip 22985 BLAKE2B 799936d5d57b2f054e0f7daf421e9e8657b0867c8b417f28afbd3630d2a5ec08b844b855a3b003d649856713372b32861e36dc97c9bbe865c6a1ff05eac4a7ab SHA512 10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
-DIST arduino-1.8.5-Firmata-2.5.6.zip 194883 BLAKE2B b4df63b0417fddf8e71d55373d387650afe47de59d526a0cf546b159c83f8bdeb6fc10f62cec9e7e2755e77b357708d96550071045166b7d5ac1e29ecad34506 SHA512 95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
-DIST arduino-1.8.5-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b
-DIST arduino-1.8.5-Keyboard-1.0.1.zip 5802 BLAKE2B 2fc6d86d54c28d5c1ec5656188ddc159bd0725a966d782e908f9d9bc18a4fb8aadbc09e182e47e80bd08978537bf92b94acd7f5b68c4eb524f6ec71f5a1a0feb SHA512 583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec
-DIST arduino-1.8.5-LiquidCrystal-1.0.7.zip 19035 BLAKE2B 051048c871adc34697a12b95dc178e759895fd118a1a341d123155c2807434c6c5b5327e8e9c040b2916a0f06a81e7b27879692bd5813dfe0b2040497aa5002c SHA512 352cbffeaced5e52d1e2b8f118681ce435425bf87c0d1b6c384d11127f371ebcf4a026a0d0320fc324285f959d76b6a28cadba8e038e337d020beca847fcd985
-DIST arduino-1.8.5-Mouse-1.0.1.zip 4093 BLAKE2B 6c071c0bbbea6233ddb0a8573d0c8fbf45e0e83454522eb3040006da2db6baab86bfc3003e833a10807f25b81dfa1aac091256c5e55b882f7633c15bc9122b9a SHA512 be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313
-DIST arduino-1.8.5-RobotIRremote-2.0.0.zip 22611 BLAKE2B 8e2c0bd5356116ad6773f85ec364704f4c6cfd13dce89ded762b2603d68abf0854c66e32a2f0fad470ee433b7431f7c0a878f5f1fd763a770d936264d212b248 SHA512 ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4
-DIST arduino-1.8.5-Robot_Control-1.0.4.zip 119715 BLAKE2B dd73fc1608b96fbc52f484ffdb7a0a40659f5b7b24546a922b742d9d9c5ff9b82fed58f352485a5b988a7ceaf3259e5aa387d198eacb17d987a3ea6b1d7449ac SHA512 45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0
-DIST arduino-1.8.5-Robot_Motor-1.0.3.zip 15106 BLAKE2B 0ece114be5c11c1e77c6a2ee524e8cac957852948cba253edec5a0d471341e059ab111310aa21715527e19de800d309fe15b98d1fa326d538cfafe585f280304 SHA512 92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111
-DIST arduino-1.8.5-SD-1.1.1.zip 60981 BLAKE2B ef6f3a7d06d76ff203fd238c91aecfa3135b3e6777d982342b11126e118ca7934228b1bd06bcbd7215bef823658c13f9d361e874c5c2ecee811457abb74c15e7 SHA512 b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342
-DIST arduino-1.8.5-Servo-1.1.2.zip 27659 BLAKE2B f8eb68547078fe0ba6da88cb3eacdd25440b7c48a52499951111309b5ca331f4608130a74300a063b24c5e8870a1d003c5179b0e0468bde2791326ba141a1d7d SHA512 ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
-DIST arduino-1.8.5-SpacebrewYun-1.0.1.zip 12100 BLAKE2B 1dd4a244cb22f2d03804694db0c7d8dbbeedac58263e80a127060eecf9980146ffca8776123b71b16068f95fb42a16940226eb4239f8a1147ec9e0a76a195e3a SHA512 ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
-DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cdb34793bd5a1b1ca139dde286185f6403bfd5807e47ac8cd4fd3a6d33791e4bd00dcfb40d430ea2791c233940d489ebbee04 SHA512 4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c
-DIST arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip 703748 BLAKE2B be9a0e2ac5a890121a0ef59700ee9a001711d7357d1c9aedfac7ca8593ed6bdef32219a88003846d4a793a532a3ebb47cde28dbe4c93dbeef8567ad6fb36bf00 SHA512 f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
-DIST arduino-1.8.5-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
-DIST arduino-1.8.5.tar.gz 48219839 BLAKE2B b031ccd601c42adce0ef06b69bd6103996d7a2a29a4640ab2518bb607e17d90524e1f7dc9861c096df90b0f0a439c5ee8867912b53cb925309dd7e0f6ddf3b54 SHA512 f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2
+DIST arduino-1.8.13.tar.gz 42634076 BLAKE2B 66755822da4cdb804e313730784d2824f919a09a8c93973ceda2c5964142f8c93081c9d79e0172b745cc938ed2f01b0279a1977284bde6e55f3a330fa113c21c SHA512 3481d1ed4ca4ffe038bdfc17acb6f2ec113ecc48d1a3967178738a852e5ba1d28044d2ea7cd4ae0984183a70ac8e6f8eb5a707624fd70e16561aa6cd6f4b9cd8
 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.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-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
-EBUILD arduino-1.8.5-r2.ebuild 4995 BLAKE2B 00d168496e9e9352aae730004776e4dc43d357b5fdbb3a572b17836d167f096c1a2967a456a2e3ac23a43f68ef2bb6f3b8903e31ad20b0255849678a88dba4ee SHA512 15085b85f31fa1f04cb903560c918a25631af3d4fc0ed0b8b192d4740859a52762c6f6f616c0525687733067106dc92ac3122af5e1a0d4a13d215decd0203055
+EBUILD arduino-1.8.13.ebuild 4768 BLAKE2B b9521a75e4b4d70018c9e5c14d311e980a9bdb5065615079ca2e93f6c6150e9b006be254745b76a5b6871434863fc1b03aab5aa376a8a1d625c5f738cdc18109 SHA512 8938afb6a2ec2b3cbd4b2ccf6cd03049b156beb2ea713a83a627a5d575e074bb19ac6e5ca46d23a999397815ceee06755553baa1f1a9f20a69ddf0d9ab36b223
 EBUILD arduino-1.8.7.ebuild 4626 BLAKE2B d3c0b14878d02bf2e7ba10e6a492270309d75513cce22c912ff539bebdcd16887e9e33179a3bd0df4cea2888607aed987bcd9b0592db2a4453fae106027249de SHA512 4d0858e3d88eb66d4e561251598b2b7d7840b2e252b3738303009b740ffb8df3e7c69123116750332db1ad522c4e13869417bfd6243d7e15bed4797a791dafd5
 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.8.13.ebuild b/dev-embedded/arduino/arduino-1.8.13.ebuild
new file mode 100644
index 000000000000..21bfa76063be
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.8.13.ebuild
@@ -0,0 +1,148 @@
+# 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.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
deleted file mode 100644
index 1f5388a52bfd..000000000000
--- a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,169 +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_LIBRARIES=(
-	"Firmata 2.5.6"
-	"Bridge 1.6.3"
-	"Robot_Control 1.0.4"
-	"Robot_Motor 1.0.3"
-	"RobotIRremote 2.0.0"
-	"SpacebrewYun 1.0.1"
-	"Temboo 1.2.1"
-	"Esplora 1.0.4"
-	"Mouse 1.0.1"
-	"Keyboard 1.0.1"
-	"SD 1.1.1"
-	"Servo 1.1.2"
-	"LiquidCrystal 1.0.7"
-	"Adafruit_CircuitPlayground 1.6.8 https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"
-	"WiFi101-Updater-ArduinoIDE-Plugin 0.9.1 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip build/shared/"
-)
-
-for lib in "${ARDUINO_LIBRARIES[@]}"; do
-	lib=( $lib )
-	default_url="https://github.com/arduino-libraries/${lib[0]}/archive/${lib[1]}.zip"
-	url=${lib[2]:-$default_url}
-	ARDUINO_LIBRARIES_URI+=" ${url} -> ${P}-${lib[0]}-${lib[1]}.zip"
-done
-
-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 -> ${P}-${docname}.zip"
-done
-
-SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${ARDUINO_LIBRARIES_URI}
-	doc? (
-		${ARDUINO_DOCS_URI}
-	)"
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes
-# scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if
-# we install it in the context of this package, we will get QA notices telling us we're doing a
-# bad thing.
-RESTRICT="strip"
-QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*
-	usr/share/arduino/libraries/WiFi/extras/*"
-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="-Dno_arduino_builder=1 -Dlocal_sources=1"
-
-S="${WORKDIR}/Arduino-${PV}"
-SHARE="/usr/share/${PN}"
-
-src_unpack() {
-	# We don't want to unpack libraries, just move zip files into the work dir
-	unpack `echo ${A} | cut -d ' ' -f1`
-	local lib
-	for lib in "${ARDUINO_LIBRARIES[@]}"; do
-		lib=( $lib )
-		local destfolder=${lib[3]:-build/}
-		cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip" || die
-	done
-	if use doc; then
-		local docname
-		for docname in "${ARDUINO_DOCS[@]}"; do
-			cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
-		done
-	fi
-}
-
-src_prepare() {
-	# We need to disable astyle/listserialportsc and toolchain (avr-gcc, avrdude) bundling.
-	eapply "${FILESDIR}/${PN}-1.8.5-build.xml.patch"
-
-	# We need to replace relative paths for toolchain executable by paths to system ones.
-	eapply "${FILESDIR}/${PN}-1.8.5-avr-platform.txt.patch"
-
-	# We need to load system astyle/listserialportsc instead of bundled ones.
-	eapply "${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
-	default
-}
-
-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
-
-	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher ${PN} \
-		--pwd "${SHARE}" \
-		--main "processing.app.Base" \
-		--java_args "-DAPP_DIR=${SHARE} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
-
-	# Install libraries
-	insinto "${SHARE}"
-
-	doins -r examples hardware lib libraries 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" "${SHARE}/hardware/platform.txt"
-	dosym "../../arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt"
-	dosym "../../bin/arduino-builder" "${SHARE}/arduino-builder"
-
-	# hardware/tools/avr needs to exist or arduino-builder will
-	# complain about missing required -tools arg
-	dodir "${SHARE}/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" "${SHARE}/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/files/arduino-1.8.5-avr-platform.txt.patch b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
deleted file mode 100644
index 9903da46dc4a..000000000000
--- a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
-index f7fb447c1..8ae8b73d9 100644
---- a/hardware/arduino/avr/platform.txt
-+++ b/hardware/arduino/avr/platform.txt
-@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall
- compiler.warning_flags.all=-Wall -Wextra
- 
- # Default "compiler.path" is correct, change only if you want to override the initial value
--compiler.path={runtime.tools.avr-gcc.path}/bin/
-+compiler.path=/usr/bin/
- compiler.c.cmd=avr-gcc
- compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
- compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
-@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {
- # AVR Uploader/Programmers tools
- # ------------------------------
- 
--tools.avrdude.path={runtime.tools.avrdude.path}
--tools.avrdude.cmd.path={path}/bin/avrdude
--tools.avrdude.config.path={path}/etc/avrdude.conf
-+tools.avrdude.path=/usr
-+tools.avrdude.cmd.path=/usr/bin/avrdude
-+tools.avrdude.config.path=/etc/avrdude.conf
- 
- tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
- 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
deleted file mode 100644
index 59d796ca5a7a..000000000000
--- a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/build/build.xml b/build/build.xml
-index d95f8def6..13ba60286 100644
---- a/build/build.xml
-+++ b/build/build.xml
-@@ -641,7 +641,7 @@
-     </chmod>
-   </target>
- 
--  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
-+  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never">
-     <antcall target="unzip">
-       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
-@@ -666,7 +666,7 @@
- 
-   </target>
- 
--  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
-+  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never">
-     <antcall target="unzip">
-       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
-@@ -1186,7 +1186,7 @@
- 	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-   </target>
- 
--  <target name="avr-toolchain-bundle" unless="light_bundle">
-+  <target name="avr-toolchain-bundle" if="never">
-     <!-- Unzip AVR tools -->
-     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
- 
diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest
index cf884b95603d..072afb03a1e3 100644
--- a/dev-embedded/avra/Manifest
+++ b/dev-embedded/avra/Manifest
@@ -1,3 +1,3 @@
 DIST avra-1.4.1.tar.gz 386055 BLAKE2B 64bf96e6fac6e04869e94ae2cac81fc0c67f871abc2ad0e2728bf5530f53e8ff9ce9e0119edfc8d39187ca2e8e5a58922aa0e8d0ea7d91b730965fef365c0c25 SHA512 2ee5edb6f8b2a39d1197970121ce3313f99b2137c590ab963f6943958d3a761f4bb37b80d54f727e1a4a4afc62ea4ac576af9ef85a71f741739a6ce4a60a9a1c
 EBUILD avra-1.4.1.ebuild 515 BLAKE2B 3b428974a199760c4cdbb70174fe5499ec6da81e28f0ddb54c2f4068fccad8bee3f7f0e0393b451b28409561399226bc6cab6f95bddba41a4c0c3f2c0af95469 SHA512 7f1045785c9ffe74d128150a04505381ffd845c0e82328aa09d05c923dfd97fc13a063992862e33b53f7ee9503653dca58345d827e0953d23a28b5f4074c692a
-MISC metadata.xml 333 BLAKE2B 3108740f0db4b29c328b1226027eccf093cdfb89de65c0936d89a27d9c58a92a3940f2e6445414964a7740a881ef8cdb9478b3a91de51254151e4df790a33e99 SHA512 af1ed935019e563b40c576b4b9d470007e85ba1fda040812e67140b78e0a5eb021ee3449bf62e0726c6c6cfe4a033038d24352c671582d1a3bacd2351f63f1ad
+MISC metadata.xml 242 BLAKE2B 6abd2d4fa645a62a42161392ccdcd23fc24fecc086f20b18c5b982a2569014dcae810363f89f435a7216e8ff4f39674659506c3f320e05715c9f34841d44fd96 SHA512 3910d0cb5a0339944d41e6bd8fb8ebf0a69b404c1362097f0c70fd124867f751f515cbe3d31d0fd95f7f98ad260c43d7a4a9e3f2f4540c0284826537a766a00e
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
index 22ab90a64670..0d97ee0333fc 100644
--- a/dev-embedded/avra/metadata.xml
+++ b/dev-embedded/avra/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Assembler for Atmel AVR microprocessors
-	</longdescription>
 	<upstream>
 		<remote-id type="github">hsoft/avra</remote-id>
 	</upstream>
diff --git a/dev-embedded/nodemcu-uploader/Manifest b/dev-embedded/nodemcu-uploader/Manifest
index ec1cb6d8eb79..1796fe409769 100644
--- a/dev-embedded/nodemcu-uploader/Manifest
+++ b/dev-embedded/nodemcu-uploader/Manifest
@@ -1,3 +1,3 @@
 DIST nodemcu-uploader-0.4.3.tar.gz 10034 BLAKE2B 2912d2d4130700fdd0a5145d7aa2b4d9f5742b85a9d0675da8a25a8e02812247928345661c69eadba00c41d33faad8def70ac7c3960794ca418875b942bb255f SHA512 bed8291cceea0f37b914fb45a409a6c259b32c325b09b71338382b29870591ce2003c235a2c231d8ffc0a3600d51a5f89acad1fa5a6fd01fe96fdcaaa55266a0
 EBUILD nodemcu-uploader-0.4.3.ebuild 680 BLAKE2B ecc6c55b0f9e7ece29883583592c94568f79b04acc34577e458e990057ac1950a902b25971c4f9ac619721bc7488cd2ba3421f7605a98ab29343055bfc25be55 SHA512 d2890e3c7a84199390c161af79d46e86f02cc3f60d6176990d16e24c44dd0ded0600ce4a2557807c96f441658fb67b8612659ba777a465c32a9e3422210b977e
-MISC metadata.xml 510 BLAKE2B f735c9a42ffdabd94e8d7bc0aa0a0a7ea667489037b9669d530e51f53282d3ed77742d3179aa28640d24338dbd3477d331f966db80953480e7f9dc7bdfc6a865 SHA512 7aed8e0362d9d0edd7323cecb38eb0cc9a934e4d46119b8d795f3e1eb78309b2a9e9d31854e7102ae8a18c3ed4787713dc278a490dcfc296ac957eb1d511c2c2
+MISC metadata.xml 336 BLAKE2B f67d759837e0bb11af772ab4614c24b0d78203270cf2d5fbc8b85864d66e8656e3dc6c3b4620568d2aed939da4b28f6ae3be1306f11a9d883f4c193056cf2712 SHA512 e1b7623fd6467b096329dcc843862b957393878b2db814c70f75786ccd2e547f2124565a15262d297aa6e2a97e561b406b0dbfef7d13d630ae495a9fb52bd380
diff --git a/dev-embedded/nodemcu-uploader/metadata.xml b/dev-embedded/nodemcu-uploader/metadata.xml
index 2c9f7d996763..0423add12b6a 100644
--- a/dev-embedded/nodemcu-uploader/metadata.xml
+++ b/dev-embedded/nodemcu-uploader/metadata.xml
@@ -5,10 +5,6 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">
-		A simple tool for uploading files to the filesystem of an ESP8266
-		running NodeMCU as well as some other useful commands.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">nodemcu-uploader</remote-id>
 	</upstream>
diff --git a/dev-embedded/picprog/Manifest b/dev-embedded/picprog/Manifest
index 40c741ba5878..185ecf97a22c 100644
--- a/dev-embedded/picprog/Manifest
+++ b/dev-embedded/picprog/Manifest
@@ -1,3 +1,3 @@
 DIST picprog-1.9.1.tar.gz 76452 BLAKE2B 7c6c5d1eda83c9bdc2c9a3c32c97d06b983cb335d2d37e291fabce3955603adcad293934f2cf1964af1e062b800a6e392f97f80ae1dfd94c03bbc269fafb0785 SHA512 1f24c372aa149d86dd4778904f0abb782510168ce36676b820a5b675f53a7207f62cdcb374c8ec2c60fc51fdfd5780ad9f8f464365403d3d2232187dade91887
 EBUILD picprog-1.9.1.ebuild 583 BLAKE2B 2ff6166553f9d301b609b24fffb0b8219ac2c0b14fd3f8658343954917bd3f72c6e34448371abc59e7ac6a441cb18d1760e8f5adf3013490aa61bd63884341e2 SHA512 6c2e46d4b48f098aff8ae492960cbfda541ddc76e70d8a9baa4263b46c61eadbf77decaedb886f4a5316520f7221ae89480b5aecdb24ff0891710b8f123fac0c
-MISC metadata.xml 371 BLAKE2B e37a60ab0913a850ed1f3ba60aab5aa6600640494237ce073f87a3a1be70c286ea3bd7e65a712683cf70779506987fdae4f05b6b2622d271675fa61c8a2dbb6b SHA512 e2b29fba984eabfe9ae7ea52a6b1d36d04995da9dcab86485ec5dbcd4de0c4db9c092ed495cea68664c961c7108570a94daa5864d04952da50081bd38a7e083b
+MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picprog/metadata.xml b/dev-embedded/picprog/metadata.xml
index cd87bb253533..71b1461e1146 100644
--- a/dev-embedded/picprog/metadata.xml
+++ b/dev-embedded/picprog/metadata.xml
@@ -5,6 +5,4 @@
 	<email>embedded@gentoo.org</email>
 	<name>Embedded Gentoo</name>
 </maintainer>
-<longdescription>a pic16xxx series microcontroller programmer software for the simple serial port 
-device</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/pk2cmd/Manifest b/dev-embedded/pk2cmd/Manifest
index 0405b16ad838..5fcc63022e99 100644
--- a/dev-embedded/pk2cmd/Manifest
+++ b/dev-embedded/pk2cmd/Manifest
@@ -1,4 +1,4 @@
 AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 668 BLAKE2B e8d8f7283231ae231d7a5372b16cfdc28fe493eccf4ed85eafc995583c7a1ee7e8db4d1a0c58df0cb8e87f5bb1c82aed46eb05c275e51cf337f67a7e6ea9b1fe SHA512 f586c7eed0eac0d68e495d582c85c802c98ac8c84f7f21b00616edbbace74b877d21fd43334e5accfd02413d4a6d9d9811241feec1eaeae3a7647c745206d638
 DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 BLAKE2B b2d53763d5030341f13cb1bee534cfbed160ee4e4a839d5f900bb334f50a0ca52968fd8dc3f27e0fa8ecb47ad2b1d251881ed4646be41b5862e4fd0c452102a9 SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24
 EBUILD pk2cmd-1.20.ebuild 1212 BLAKE2B d1d5de21151d63f4fc0f17c59336631e93080b44ffef1e3b1e01e8e3ad1bbb5f2c010094b9c5f42db17de4fdc0ad8cbd6a542101ca5c96c64adfbd3700280227 SHA512 16960cfdb7887768008d8dc61d04b66cdf402852bee35542c93dab6d7b43c41dae4d4c8b80549d26b9801bb8df430bf982106219072efda4c20fb08919386358
-MISC metadata.xml 367 BLAKE2B 1974b2870529989c471ffe544d721871f0f8bbdd1572cff4a44cb8d3bab949d005a5d2bcf2bc33d539d3ca51c8e0995a0eff15d02f8bd11ccc4c06e1a727bf86 SHA512 09c3d20eb53c9927bb7489b3522f4daa0809a379760d950a33eed0b9ddfccfe1eae4324e5c674c4731779ccb45a95627575941f2d22387efcda406947256cb22
+MISC metadata.xml 249 BLAKE2B 79ce0a00edaba32d07719f0937fa67f6730756c17ac4ac307b35c78a7e8e61c138ef829bab0b2b4c26f6be62ba6cd898f2ee2eb8e94f7d7ba782480b9d6898ec SHA512 8d7016491c6a36350d1d036340da97c4422908902bafccaa257d9e82c4fc299914dca5ce3d938751c398dff9aaeb4e0f7dff4956e0c7344630d8e09282178a23
diff --git a/dev-embedded/pk2cmd/metadata.xml b/dev-embedded/pk2cmd/metadata.xml
index 3435e2a089ff..0237109a67a2 100644
--- a/dev-embedded/pk2cmd/metadata.xml
+++ b/dev-embedded/pk2cmd/metadata.xml
@@ -5,7 +5,4 @@
   <email>embedded@gentoo.org</email>
   <name>Embedded Gentoo</name>
 </maintainer>
-<longdescription lang="en">
-This application allows the use of the PICKit2 PIC programming device.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
index a9728bfce8b9..fd20dd5b45e5 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -1,4 +1,4 @@
 AUX srecord-1.57-libtool.patch 1733 BLAKE2B bf3e3758ba00e01a7a2325a3d23f500055c9e4f01299e9e21e42d6516fce3055c49f28bb8384fe186ac6111d75d6f6e689b6425368182576d13f68ad624ea0c5 SHA512 f4b9d701ac7b364f5f43dab835c0249d9d2f54903a371cdd9a03a63f082e4c93f15adc4cc9a39ccf5dd8feb56f579c2f96697c0c7b8d2730cf845ac477b20a83
 DIST srecord-1.64.tar.gz 942513 BLAKE2B 5bd4e8706f2499968930883e624b3dc7f8f061e8d697584b63a8792d111fd51e37b198fd81a81d8ede6f7eeb42860e83e86a0abeb0856e4cb5847d3db2d30382 SHA512 f96f2d9cd2c475d040c0474a35a17ebca2f0fb737856cdafe1227758a3e52176e4ab3e8577520c21e75e468d74fa98695128c02120734b6e92d8573e76af50b3
 EBUILD srecord-1.64.ebuild 771 BLAKE2B 46236a06a24a9d33f337a4d1cd8daee4642480d43d099d316afc5835f00ed97bca15ea63f517d696e2bce9adcf6aec86143c7e6dfe2e5be62b09ac4434516f8a SHA512 c5df2fa4b2ce42c838eec8fb783b44953400476405445035fd56535a782e9dcdfec486baa2c3d557b4a96efad55a7e4eb7eb69d18927f13589c41eeb04a7969b
-MISC metadata.xml 455 BLAKE2B e79fff328a0032376b811c49e9e5db7fc8c3f2e539e5d475a91f976e475256dd16ed5e8166f8fe5aa7ba86034884d2bf2633fae8a466db2bdf07e0ab75b92fd5 SHA512 221d3f902bf77fb71de6db4fb99874fd37183124b5858b112240ab1469b1f92f3142876b039498fdff03a46445b83cb1ffc71d37305bed7ec5fa79924df92403
+MISC metadata.xml 328 BLAKE2B 1bed15dd3f037adb21a98a9e59a02b8f724c961ef781efff8a3fad95edd528f6905e3e980a35cb377f11f5e2f7d52496ee2b7026d23021f1df0d3d0ccfefb31b SHA512 57604381aa2cb030c59c4177ad35fb90620066a791b5d157ce7ca2ebb90320fb17d343b9dbb16633efc6961fc89089604b5e8e9aac16583249527b0a92577944
diff --git a/dev-embedded/srecord/metadata.xml b/dev-embedded/srecord/metadata.xml
index 17dbb943a18e..3f85d9147c94 100644
--- a/dev-embedded/srecord/metadata.xml
+++ b/dev-embedded/srecord/metadata.xml
@@ -5,9 +5,6 @@
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
-	<longdescription>
-The SRecord package is a collection of powerful tools for manipulating EPROM load files.
-</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">srecord</remote-id>
 	</upstream>