gentoo resync : 20.03.2022

22 files changed, 187 insertions, 195 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index e82f4321b1fe..201ae8c49f52 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
index b9e2098d80fc..57f3330d770f 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -1,5 +1,5 @@
 DIST avr-libc-2.0.0.tar.bz2 3590893 BLAKE2B cc628f5f55d12c78ca9215e3e37b4a0061feae3c7c19653384b5d789fb6e1c70efe420631bf987379ae5524ec0f65c6df459eaad0fcfb80833cc4732ed5e796b SHA512 fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6
 DIST avr-libc-manpages-2.0.0.tar.bz2 151137 BLAKE2B 7fbaa9c1014e8cf9b4caac723b57f9c24272da458b987ba302730116437bb3a5b49296c6804d857b421e6f71f2c4efda959d278ebcc14aba35fdd44a958dfca8 SHA512 8b4aaa6ae176076171e90e629e0e6142c4c56f9cc4f1640432384276df2f7b457f5137739535b07b9cede9b5b2e564db7fe200203faa4e2d0cd9874432507823
 DIST avr-libc-user-manual-2.0.0.tar.bz2 932920 BLAKE2B d3190af26dbe38719bc78e73de31af1ce69d885b928f48a4fb9ccd145a33f19f71c017253ad16eadc641fc88495c642dd5fd1668c6bebddf7d813f70db01a3f6 SHA512 246180be1f793b46335a49f33028ff59bd7cc06ca3d8627309521801e405e0e1305663a2c0760521467e75732ad513749bf707732b59fb17744e51acda9bb2c6
-EBUILD avr-libc-2.0.0.ebuild 2014 BLAKE2B 15dcd75cc2aa1d278d6d4fab634bb1a11be36fa821171c050252e44688780f3fe8bad57d2bf03fc0da5bd96160e668143c9e7777521f8ee5fd82e9e4c37e8462 SHA512 f05a818e293500ea432793b62d12142e13a10ab920c976dba764077f3ec37ad64ebe34766bd00346f56c2b943477b6bf2baee884302c0538258e9df1d79639db
+EBUILD avr-libc-2.0.0.ebuild 1996 BLAKE2B d5da2cc93bc3c1400d43c3d99867a9d0faf89c47f3f6e0f77ab5df5c41b92a52ea7af60b9b2719539d42e19a29a0ad89ba06b65e4c9ae1afa99f83a96511862d SHA512 aaae63065ca19db36161c574b7fa2636f59c130a605ea41c83274001bd3b12cc46887138225e37f273524fab16b85c458520c04d41b3221d97b898c012ea6e72
 MISC metadata.xml 471 BLAKE2B 87db4c3915b9c8eddfbec4de58e4099fdbdf951000d022a03610d8087658a7218c77e99f7cbbb6d27714cf9a5f482b399f77535367616aa5c3a3c3f8afa66ca4 SHA512 48979ece9be17fc132454d7e954f2301c8982366d5b46e9d26a823a1a09ac8c93111cf8e663a7f1c7129fd99745b5a2de56ed343cad10b20ca93c832cf2a3d34
diff --git a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
index 62a2c265795c..f8785af9045e 100644
--- a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -68,8 +68,8 @@ src_install() {
 
 	# man pages can not go into standard locations
 	# as they would then overwrite libc man pages
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
+	docinto man/man3
+	dodoc -r "${WORKDIR}"/man/man3/.
 
 	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
 
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index 15142b50c762..ae0830ab8683 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,7 +1,7 @@
 DIST avrdude-6.3.tar.gz 909744 BLAKE2B 3c253571a50c423989fc3fd9c5d6fe11b67fad9ca0d94f4bee0de7309fc22ccfe64102fff74fad47ffcb1874870c0aafd0c003df63285bd05c30efd384f5ef9e SHA512 b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
 DIST avrdude-doc-6.3.pdf 255521 BLAKE2B 3b6a3485b996f0923c00c54970e86c3ab9f40e8a5bd962f5d3e4f87c23c90b61f002b46af9766cc0f117583a54d519c5d8739cb5f8bca0776320243679989716 SHA512 f33b15f6a9247f6646ba8a861f1e86f5d43b1b44438fb95bd53764a73f0c450f669dcb43b6b587390ddbc22dafa02758ddc330a7aab1651ccca7c8da8e00b755
 DIST avrdude-doc-6.3.tar.gz 39823 BLAKE2B 170ad1eab743435eb414a2d6547be6c86e4d75aed83836eb29285a8d11a43f7eb878104b3b7a70b528522a415a96a841686d07e82b151fc6f726c1f56d54e801 SHA512 b7abd9d0068d2933a1907655832930c455093b4ffbdc2b6fb2405a821cad0ba1c4de3aa5fa0ea7c9b53d06cfa6d5b5658d30a18a4f5c3884d0e15c171a097b29
-EBUILD avrdude-6.3-r1.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
+EBUILD avrdude-6.3-r1.ebuild 1604 BLAKE2B ee08eb332a7c39e4c6fe962b385feed5194ce7ccbf3fee00735e71525f9034de3cb501cb2073ceb27cdfc9c6e1bd8d0d33971f0b126cf336e304d353ab460230 SHA512 cff807fb969f08f298692ca01d62420f76c59a36b986c58c951e0625384077857f6ce7e3516b6a4622709f2c0655302a378f92ba4fcfde01844eb172ed8ada0e
 EBUILD avrdude-6.3.ebuild 1502 BLAKE2B 514c81ae042089508addc0799707b8c42b3ed042d94a5d301b2d80a8f390a653dce24f770dae0d13a0837a7df37ad237ac8d8625429019537e5038cfd78e8c0e SHA512 9b4e51be693bb57def7829575bf828c8932c7d957152fd3e624a608d0aee2a632026d376fbbe73ef7c1fc4cd8d79fe529b9804693654791719670588a28597d3
 EBUILD avrdude-9999.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
 MISC metadata.xml 364 BLAKE2B de7d28e39ecb3d05075b85fd66181ffe3a874623efd4cb9a99f9a16b467ca0c1a3d8fa7895b7e33c75162428b08774f5f89474e5b6f167817f5a384b8d9ceb88 SHA512 d15e0de55e3b8e8878ffdcde4fd7a6ae06a8fcd2e30ed0aa7fc5480a8b987edadafa6fc20e4b683c4c8d121192284c7daba4ace47f39c0713f4f0e6fe728924c
diff --git a/dev-embedded/avrdude/avrdude-6.3-r1.ebuild b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
index 701d5da2a71a..3f5bb0d68788 100644
--- a/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
+++ b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
 SRC_URI+=" doc? (
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index cf09eda05285..e4a8f8d9d67a 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,5 +1,6 @@
 DIST esptool-3.1.tar.gz 6897273 BLAKE2B dcbba13e8775afd3cf10cdeafeee5e9e3c0d2e9722a95076a868b669ea3a11a56b48a053e1b19787c6da330af6d01f9f256a92c0be527d4a7d9848f646f194c3 SHA512 5edaaa376932acc9e7ba717fe931ec1e14b80d1eee415fcef4c69b30b375cd61887ac52a20dd1001d215b8d739019d6b9f624d294d8d76ff112e630d52f7f15b
 DIST esptool-3.2.tar.gz 7155428 BLAKE2B f81a8b77f1994599c3302915915e225249a5e735accbe47c8936de47564e47a33ae711df47c57e599d980b450dc4d710f819087a97d086b9d0f15a98622c0da4 SHA512 5e67b3a17190e051d7706ee2dbbe855488765a7bfed15b15f5a04022c3fbf19112905ba6a672c37b1bac5501d45d477cfff07c004cd83b2d1a111430992cefc1
 EBUILD esptool-3.1.ebuild 1400 BLAKE2B f9b7ae21c251b8288c4035f2c1aedbf48e7cceed5d6a8f9c4422c059b4c0d08b5dfbc1d9d7604f9bbbdb45e6deceb9c609abbe1319ef2b340bd03c28e6822d6d SHA512 9f8431ee5441abb28511410adfd96a824328dd2a713671fd51f9ee69e42d69d6dcdc2bae2d6f72fbf1fd3ae24768ccef9319d390f3322be688bde9c5463de4e0
+EBUILD esptool-3.2-r1.ebuild 1437 BLAKE2B 2d075390f0f2fdd704e51e40aaf9fbc0c5e96778236428eaaacb55aeed5c8867f1c97696b74232bee13372f4d132d35503ff8dc1a458485cbe24a783d8303a45 SHA512 f68ecbcc419c5dd3a08b19f77ce563b424e910179ec483e4a1f359cb88f29fbe7cfb20c566203ebfed1aa8291bc5f0c1b92f11dee348b5a8fec0d64a7b30621f
 EBUILD esptool-3.2.ebuild 1421 BLAKE2B c15f2a10e98031acaa71f54eb0346a3d060924f518607f5645bd3b32006d1ac4d15844023f9b78d16cd150b2bc7561c0951ca3a8a2002cdc887fde012843e5b5 SHA512 1f0e339a7e0f9a5b6c5978b46ec38974463ec3b6bc40b00c4be82ddda44b7c7d647f207c722283bdebcb435a7f7effb3bc1fbbc766f9bfe2e65316bbf69992b3
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.2-r1.ebuild b/dev-embedded/esptool/esptool-3.2-r1.ebuild
new file mode 100644
index 000000000000..8cdeb0f03135
--- /dev/null
+++ b/dev-embedded/esptool/esptool-3.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	test? ( $(python_gen_cond_dep '
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	') )
+"
+
+python_test() {
+	"${EPYTHON}" test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_espefuse_host.py || die "espefuse_host test failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_merge_bin.py || die "espefuse_host test failed with ${EPYTHON}"
+	# test/test_rfc2217.py test/test_esptool.py and test/test_espefuse.py need real hardware connected
+}
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 36c936c0ca62..0982df92150a 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -8,6 +8,6 @@ DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0e
 EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B d8ab414f3cb68b292a278e255539a0d9405f28cec65f9e2dd987977546e165c755ef016bf73cc82f8d3902af8ebdcf96b7f7249f1522a2070f06ce413ea1f30e SHA512 7fb88f7af1926878f39bada106db0027bde6e664b858be06eb76021b7e5ae497e6bd708f0c47a4eee0c966cc9810384312e3f365095b2d2de0016c611b5c7a0a
 EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f
 EBUILD libftdi-1.5-r2.ebuild 2114 BLAKE2B dbf8580b54472c409190380262a20411ce7ffa5240378658822e4a6f775d34324af8295487363c06d460d8fb492860b2c58ef6d5cdf0277f82f2e95e212e9c5c SHA512 06e30bf4d68716f18573c4ed2797252dba1cb7bea1341b4541e94477d1e80d3d1afbc5df42455b8c908b7511bf1f3235673a37085f7ec3d6db971c2fcd48e6e6
-EBUILD libftdi-1.5-r3.ebuild 2158 BLAKE2B 11dd4740ef0def7ce1917f997a33a7d6a442589c2f2a50b18258d8ae8e8cf678e1cb9df4279a24a5dd85274804827ff680ce9f66a1082fa3f79af0a9ed2414e3 SHA512 55b8a61f7c9f4cd2c00952397958d9154c76c128e2ea95a5104de8007d051e5058a1b9b451602d14c600923266b89a94bd393068b385c6742e05b1612c17ba39
-EBUILD libftdi-9999.ebuild 2070 BLAKE2B 24c97c8596fb7dd4679a5f60a510584421bd6a1a1f160f063db8d4faaa0473ffe7a2fe585d75039494795b6c44a33302bb34c2185a9f6d84a6ec227e8999b097 SHA512 28b15aeeb533c9952a2357068500178af2b6019914bf2f2bcba9252bd4e80580c60f8ac0f1bac51357f5d4e24f964c57a7b0c6654f73dec722ba264052c55ec5
+EBUILD libftdi-1.5-r3.ebuild 2159 BLAKE2B 37f16150cdfbd9062e68159db7ba60b349aaac2a528114c3fd021ef0fed9ab2607a38818796ff984ef6dc8f30154ecbe281200f53ac835812f4ff7653255547a SHA512 01ee27b0c73e71c7cffb2e939415563265717784e596f111b7a5e7d35eb78cb5d06a0ffe4c574b1e53217f2c35d3c24746172f128fff876709439c60321f5057
+EBUILD libftdi-9999.ebuild 2071 BLAKE2B dfc52ea7939a177867d14e6ad201ecc1432696018e79342b1ea1ede35985aa9d0a0a19ec14db8bc80f5f20df8f9e503e24cc2c207a336d2658bce4e8998d7e07 SHA512 f1d12721f6a0c1757ee96782c114a7de4af502a46b039ba04ddb1c5d071d776ef92da39d4d6337cd4ae2818457baf32f2bdc3400936ef0ae18539de21258fffb
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
index 82a59aae256a..e9ceec3285f5 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 9b1e30890f4a..36487c2e0df9 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
diff --git a/dev-embedded/mcu8051ide/Manifest b/dev-embedded/mcu8051ide/Manifest
index 129d71fb7fab..03b36998bb1b 100644
--- a/dev-embedded/mcu8051ide/Manifest
+++ b/dev-embedded/mcu8051ide/Manifest
@@ -1,3 +1,6 @@
+AUX mcu8051ide-1.4.10-appdata.patch 822 BLAKE2B 61daa80abfcdc207243767decf6dbb6fc772eb1a267645bf305806692bb9d13e900dfb8e34d9a2b8900866c9a78d0d299c8296bd6fd4cb968e6d939246055e8e SHA512 1c0177aff6116d5d2b50dfb0a8ac19a10ade1e59254e0720263d2896e7cb12b0f240b3da864e3abb5fa54506f7be8211e40a816755cb0f2c0efba01f29779ab5
+AUX mcu8051ide-1.4.10-cmake.patch 1175 BLAKE2B d76f0b886709419bdc624a74ad74081282d89234138d52acc36fabbbd50539ac36f8d00258cb3e5026a6085ee1f383958f26a38fd2a4a1374cdf58e691d484bc SHA512 3b4536cfa7b014f802970f873af98a0d52e59c7a34eb83bcdefeb50eb40064a0e0bedd6669cac1a52b8c7e2a718df4a2b70e186cd9bbdb5f1c8f5badac733e9c
+AUX mcu8051ide-1.4.10-desktop-file.patch 696 BLAKE2B 2b3f5178d74f1fbc40406294b282bad6398a864f0ae8274335e40f46fcbf845db3b457e26914924abaebf2ebdc26f57fd8e0104fc1f1d45f711bc14d946d5ee2 SHA512 edd28e49db15ca5be7aee1aaaa2ff3ebed217b0cf2cbe2a37d39a5b1076efce9df859f292e2a39030a73f33722288daf6a362f06e57d52a69dcb7ba2e21b8762
 DIST mcu8051ide-1.4.10.tar.gz 5928583 BLAKE2B 4e8e119790d8130859034f2366ac3372373805dcb173328e61a9a18513cb6b9580e8f3912592888268bfdf694e835032fca3148d9fc00a7aa061660378674f0e SHA512 686c2b7054475aa38bbbe73ef745303141f038e2d6eca86d548317c130febb6b12d7c0e0737a9b15d2c3f4890bcd0238fffae030c689f8367f3b54821ab52866
-EBUILD mcu8051ide-1.4.10.ebuild 731 BLAKE2B 0e70859b5fc13069616b0507daeb018ada6a21bad478c78df05487466393c67f81f4b934eb9ffc2d630246e55032c38522e73436c99eed6abc2787b3d7909871 SHA512 9d04c6e19cddae5491505003958c396bc85b89ac13a99c533af99af4a985309a72bb6befed7bf3e6761aedf9eef93509d3b76f06a50f1f7d4ebf13ac05ef7539
+EBUILD mcu8051ide-1.4.10-r1.ebuild 1043 BLAKE2B 2778a7ce914da53a1af005beefb720745303ecfe47c6fa799fa12bf17d5d73d2e8164e30bf1aeb1540a806907e73841057f00bd40e1fb2ca4081735e2167552c SHA512 2892678e3f4b5b15230c52c37d7f46b8382a7b2990f0140bd0efc96ad83fe020b63d999e7b4e3ceee5b4d5564edc0ce5b7a891f375308c7af835db40927448ee
 MISC metadata.xml 331 BLAKE2B 6b2e20496984a9ad1e555acaf553d88074cf9c23592d94be0d2d5e0a1e768e08eb9b955fb4a2b17311ca7328eda7032de928920cb00931516eedd004d7a19a1c SHA512 2cb83b210af5018060697a53495202b3ab2d079a41400f447901297db2b41dfc7506471f9ad6bfbbb9125efbe0897aea9f6af91d7e7f082e82dca9ba96498568
diff --git a/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-appdata.patch b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-appdata.patch
new file mode 100644
index 000000000000..c92f5aedfd4a
--- /dev/null
+++ b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-appdata.patch
@@ -0,0 +1,22 @@
+From: Carlos Henrique Lima Melara <charlesmelara@outlook.com>
+Subject: Update the appdata file to comply with the new standard
+Last-Update: 2020-06-27
+
+--- a/mcu8051ide.appdata.xml
++++ b/mcu8051ide.appdata.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Martin Ošmera <martin.osmera@moravia-microsystems.com> -->
+-<application>
+- <id type="desktop">mcu8051ide.desktop</id>
++<component type="desktop-application">
++ <id>mcu8051ide.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>MCU 8051 IDE</name>
+@@ -19,4 +19,4 @@
+  <url type="homepage">https://sourceforge.net/projects/mcu8051ide/</url>
+  <updatecontact>martin.osmera@gmail.com</updatecontact>
+  <project_group>Development</project_group>
+-</application>
++</component>
diff --git a/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-cmake.patch b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-cmake.patch
new file mode 100644
index 000000000000..04b24f4c1e87
--- /dev/null
+++ b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-cmake.patch
@@ -0,0 +1,36 @@
+From: Carlos Henrique Lima Melara <charlesmelara@outlook.com>
+Subject: Remove unneeded files installation and update appstream location
+Last-Update: 2020-06-27
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,10 +53,6 @@
+ 	ENDFOREACH(ext)
+ ENDFOREACH(subdir)
+ 
+-# Install manual page(s)
+-FILE(GLOB man doc/man/*)
+-INSTALL(FILES ${man} DESTINATION share/man/man1)
+-
+ # Install demonstration project files
+ FILE(GLOB demo demo/*)
+ INSTALL(FILES ${demo} DESTINATION ${target_installation_directory}/demo)
+@@ -72,7 +68,7 @@ INSTALL(FILES ${translations} DESTINATIO
+ # Install .desktop spec and application icon
+ INSTALL(FILES mcu8051ide.png DESTINATION share/pixmaps/)
+ INSTALL(FILES mcu8051ide.desktop DESTINATION share/applications/)
+-INSTALL(FILES mcu8051ide.appdata.xml DESTINATION share/appdata/)
++INSTALL(FILES mcu8051ide.appdata.xml DESTINATION share/metainfo/)
+ INSTALL(FILES application-x-mcu8051ide.xml DESTINATION share/mime/packages/)
+ 
+ # Install launcher
+@@ -84,9 +80,3 @@ INSTALL(
+ 		OWNER_WRITE OWNER_READ OWNER_EXECUTE
+ 		GROUP_EXECUTE GROUP_READ
+ )
+-
+-# Install misc. files
+-INSTALL(
+-	FILES ChangeLog LICENSE
+-	DESTINATION ${target_installation_directory}
+-)
diff --git a/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-desktop-file.patch b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-desktop-file.patch
new file mode 100644
index 000000000000..00dde9bdef96
--- /dev/null
+++ b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-desktop-file.patch
@@ -0,0 +1,23 @@
+Subject: Add Keywords and Field code to Exec field
+ Fabricio added some keywords and Carlos added the Field code.
+
+Author: Fabricio Alcalde <f@lcald.com.ar>
+Author: Carlos Henrique Lima Melara <charlesmelara@outlook.com>
+Last-Update: 2020-06-27
+
+--- a/mcu8051ide.desktop
++++ b/mcu8051ide.desktop
+@@ -2,7 +2,7 @@
+ Categories=Development;
+ Comment=Graphical IDE for MCS-51 based microcontrollers
+ Comment[en_US]=Graphical IDE for MCS-51 based microcontrollers
+-Exec=mcu8051ide
++Exec=mcu8051ide %f
+ GenericName=MCU 8051 IDE
+ GenericName[en_US]=MCU 8051 IDE
+ Icon=mcu8051ide
+@@ -17,3 +17,4 @@ Version=1.0
+ X-DCOP-ServiceType=
+ X-KDE-SubstituteUID=false
+ X-KDE-Username=
++Keywords=mcu8051ide;8051;ide
diff --git a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10-r1.ebuild
index 0ea0c430b591..25736dcc3994 100644
--- a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
+++ b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils xdg
+EAPI=8
+
+inherit cmake xdg
 
 DESCRIPTION="Graphical IDE for microcontrollers based on 8051"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://sourceforge.net/projects/mcu8051ide/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -14,17 +15,35 @@ KEYWORDS="~amd64"
 
 # The doxygen dependency is suspect, but it appears to be used at runtime.
 RDEPEND="
-	>=dev-embedded/sdcc-2.5[mcs51]
 	>=app-doc/doxygen-1.7
-	>=dev-util/indent-2.2
 	>=app-text/hunspell-1.3
+	>=dev-embedded/sdcc-2.5[mcs51]
+	>=dev-lang/tcl-8.5.9:*
+	>=dev-lang/tk-8.5.9:*
 	>=dev-tcltk/bwidget-1.8
 	>dev-tcltk/itcl-3.3
-	>=dev-lang/tcl-8.5.9:*
-	>=dev-tcltk/tdom-0.8
 	>=dev-tcltk/tcllib-1.11
-	>=dev-lang/tk-8.5.9:*
-	>=dev-tcltk/tkimg-1.4
 	>=dev-tcltk/tclx-8.4
+	>=dev-tcltk/tdom-0.8
+	>=dev-tcltk/tkimg-1.4
+	>=dev-util/indent-2.2
 "
 DEPEND="${RDEPEND}"
+BDEPEND="app-arch/gzip"
+
+PATCHES=(
+	# Patches thanks to Debian
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-appdata.patch
+	"${FILESDIR}"/${P}-desktop-file.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	gunzip doc/man/mcu8051ide.1.gz || die
+}
+
+src_install() {
+	cmake_src_install
+	doman doc/man/mcu8051ide.1
+}
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 934cddfe9e20..e6cf781f52f6 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -7,5 +7,5 @@ DIST rpi-eeprom_13.3-1.debian.tar.xz 12768 BLAKE2B 823b1f25cda98cb2888b6b423b612
 DIST rpi-eeprom_13.3.orig.tar.gz 17497524 BLAKE2B f65fc9b6a98dd3a4d3f4095e03279d832a64d0f12f9edd7e7af2b8afe8b290f4db6ec39e755df9fb5b317930235bf1c7205be4b3f838f6cbbf92e1d80574b342 SHA512 d5885444fd90a5f24c94a3af4f093744f4a63947a119059c851cd6639e572138205a48f7cd126c3deafe104e76985197e1fa36c8aa72a16bb173f11750b85151
 EBUILD rpi-eeprom-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
 EBUILD rpi-eeprom-12.5_p1-r1.ebuild 3009 BLAKE2B 29ce9339662f1430deacaf551ae26a0f07373013f2eae4f1b25bcea109d81682ec4434831c8496329bbe7dc483319387263fc8784491d448f2cd0359e48e79f5 SHA512 587810a696f471c952303ea4c6c04191c9dfb3a87a2217180da4b3b8786101dc895c1799e69461829f469ed5c83771a9102c0119a1b644dab5b0927f674438f1
-EBUILD rpi-eeprom-13.3_p1.ebuild 3009 BLAKE2B b48623325d2381a06eccee78d01a46bd87ff02c65fdc5aaa33c0c96eea9814cb76e19d69e7f3b4456794b709a777d73c07e790b55bd734bc0e5dbf1cfb4005d1 SHA512 7589151391ff0b7fdeb2a1aab93835bf9b41c4278bb4f6aa1e9154a07b533b2045e7143510c08c510382330abcf6384e53c3c917e678e4f14020e159b025264e
+EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3025 BLAKE2B 3f9190ccf19fc65499d9a1b2837fbe3eb498d6a439a3dabb61d1553a0e7da1bb34e24d64f5bcfd1498fcd0b19bf087de5b6b8901f9a0b9ef2808f5dbd7914e1e SHA512 3a34415f6a4dc3d762f7366428de02a6631a67cf5f607b51c3db75f54b2b0f0b4a3d863df93e38e59453812eb867570dbc5a0ccc548d3240bba1f5010a27e078
 MISC metadata.xml 596 BLAKE2B 075812117456e8457ad55e184a322ff86f8bc18a8470fcd52d63ec20e88c81db064ff5f6b023e7400d51d603886cb154a0a1485613cb326b8897f99c5c06c330 SHA512 9ebe09182734a60c3ed3a9e30b2cf9b9433f546e1f4cfc9d75b48813e61dc875b71593300e6bc628650cfbae49fc722713cfc88c8e0a387efe0dd6cca991fa2f
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
index 262715970d27..12e3cb37f8e8 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-r1 systemd
 
-DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
-HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
 MY_P="${PN}-$(ver_cut 1-2)"
 MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
+DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
 SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
 	${MY_BASE_URL}.orig.tar.gz"
 S="${WORKDIR}"
 
-SLOT="0"
 LICENSE="BSD rpi-eeprom"
+SLOT="0"
 KEYWORDS="~arm ~arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -46,7 +46,7 @@ src_install() {
 	python_scriptinto /usr/sbin
 	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
 
-	dosbin rpi-eeprom-update
+	dosbin rpi-eeprom-update rpi-eeprom-digest
 	keepdir /var/lib/raspberrypi/bootloader/backup
 
 	for dir in critical stable beta; do
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 450f09f3ba93..5c6ce6ddb7fd 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,7 +1,3 @@
-DIST u-boot-2021.07.tar.bz2 17275746 BLAKE2B 1a209a604e0f30264781a14ca855bbb777e8f1c031de60d28de397084fc9bfc4a3771ad00ec22f5cdcfa721f22707a533b9b59004ac0b107df927f23dc5ab0a6 SHA512 210b206a4626feb0985580d9448a97b499b09bf9b9313ca847a66624785e9e9b0fae8f2e329acd344f5f75cb722d2093dd0ee394311ddd1fde05e400ee71a24d
-DIST u-boot-2021.10.tar.bz2 17358295 BLAKE2B 2471e31236ae24778b985b8e7a032fe2d480e935e9c5ee77a6aff4821c61f7fb8b3d64f9f964d62d0c076e8ac526f1b9c19f7fa1a974f4665737ab0bfd950d03 SHA512 be5be1c9a54b270307a04177d5577a21c57a02b307bf8b63d0fa2655d1f025c7ce010dca6a1f7f60d4e639c2e6fb6f0a292a2e5d190f1fad478eb12dd786c9da
 DIST u-boot-2022.01.tar.bz2 17449627 BLAKE2B 574f9d248a8c19aa20b1b16cb55bb201d6c1ab2162da3f8789d39286a4f4a5a76b772d4a49c17e5572ff69f489d1d6fdc02d6e8f67a8bf6c50159b1a41e7c81d SHA512 d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
-EBUILD u-boot-tools-2021.07.ebuild 1507 BLAKE2B d37b4028142f0adc3289080fd615ace265e0117a85a77dd20008ed2621b7e4bf864cd0e77eea76400d04126f9ec3f8c54eaad6c470d5fab04c9295877eaa3c71 SHA512 78d7da025a69ac1e788788e988605181c87b0b9854d076536726dc5cad052bbe23f1efdb00a879c31750cdaf5c03f0a54d664f14050ab50563e9efbb798756c7
-EBUILD u-boot-tools-2021.10.ebuild 1512 BLAKE2B 5019bf622e60b1eb1334ad0d0d2da99941c5f215114d68d63d5872fac5b2c60f3281bde3951bd74e0a3ab5f2f4c5d1d369b8fce6780f18712a46d8f743bd211e SHA512 14443876e7eb6fab8d7ef777eacac8183aa3aea394855894a2884306271f7529f88fec0a61845ff6c7891b5cbc349844ef0b6dee77068148ebc554ab2fc4ddc0
-EBUILD u-boot-tools-2022.01.ebuild 1512 BLAKE2B 5019bf622e60b1eb1334ad0d0d2da99941c5f215114d68d63d5872fac5b2c60f3281bde3951bd74e0a3ab5f2f4c5d1d369b8fce6780f18712a46d8f743bd211e SHA512 14443876e7eb6fab8d7ef777eacac8183aa3aea394855894a2884306271f7529f88fec0a61845ff6c7891b5cbc349844ef0b6dee77068148ebc554ab2fc4ddc0
-MISC metadata.xml 343 BLAKE2B 4115ff47d73727feb01367f4f6a419d46cfed433ac0f8e0b40366f61cefa9beef9c28511a0f8db727b22e04e38b0c741b415bf6edc3b8b4ef0867255beed1935 SHA512 1523312fc43fd850cf4d24b17d17a2607f5dd2786c4827c48014f750b97088ff95c97148cb8e9cbac2fc6b3e759dee32d04a9b5da62c130a7708b34db82e5196
+EBUILD u-boot-tools-2022.01.ebuild 1507 BLAKE2B d37b4028142f0adc3289080fd615ace265e0117a85a77dd20008ed2621b7e4bf864cd0e77eea76400d04126f9ec3f8c54eaad6c470d5fab04c9295877eaa3c71 SHA512 78d7da025a69ac1e788788e988605181c87b0b9854d076536726dc5cad052bbe23f1efdb00a879c31750cdaf5c03f0a54d664f14050ab50563e9efbb798756c7
+MISC metadata.xml 451 BLAKE2B 8634c7b8cd333dadddeb3622fbe298d19b5a470b85743717fb972e310869ee2a897110a9fd7b5781de016ba9a8c9baf7c6b5ed89279e98f086a4d326cdcce807 SHA512 981503c1d3a7dd42ca141b00a29fac43eb379603140767f0e0de94f54fd4180b498cebea56692c017ab7dbf9a2afdfb222edc5942c58429490456c064b5fa41d
diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml
index 3f0bca1137e1..6f86a7d89ece 100644
--- a/dev-embedded/u-boot-tools/metadata.xml
+++ b/dev-embedded/u-boot-tools/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
deleted file mode 100644
index 92b7d18e73fb..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
-IUSE="envtools"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
-		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
-		scripts/kconfig/Makefile \
-		tools/Makefile || die
-}
-
-src_configure() {
-	tc-export AR BUILD_CC CC PKG_CONFIG
-}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	local myemakeargs=(
-		V=1
-		AR="${AR}"
-		CC="${CC}"
-		HOSTCC="${BUILD_CC}"
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)'
-		HOSTLDFLAGS="${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" tools-only_defconfig
-
-	emake "${myemakeargs[@]}" \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		CONFIG_ENV_OVERWRITE=y \
-		$(usex envtools envtools tools-all)
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-
-	if ! use envtools; then
-		dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	fi
-
-	dobin env/fw_printenv
-
-	dosym fw_printenv /usr/bin/fw_setenv
-
-	insinto /etc
-	doins env/fw_env.config
-
-	doman ../doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.10.ebuild
deleted file mode 100644
index 2c89fa57625c..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="envtools"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
-		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
-		scripts/kconfig/Makefile \
-		tools/Makefile || die
-}
-
-src_configure() {
-	tc-export AR BUILD_CC CC PKG_CONFIG
-}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	local myemakeargs=(
-		V=1
-		AR="${AR}"
-		CC="${CC}"
-		HOSTCC="${BUILD_CC}"
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)'
-		HOSTLDFLAGS="${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" tools-only_defconfig
-
-	emake "${myemakeargs[@]}" \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		CONFIG_ENV_OVERWRITE=y \
-		$(usex envtools envtools tools-all)
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-
-	if ! use envtools; then
-		dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	fi
-
-	dobin env/fw_printenv
-
-	dosym fw_printenv /usr/bin/fw_setenv
-
-	insinto /etc
-	doins env/fw_env.config
-
-	doman ../doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
index 2c89fa57625c..92b7d18e73fb 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="envtools"
 
 RDEPEND="dev-libs/openssl:="