gentoo resync : 07.01.2022

8 files changed, 280 insertions, 3 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 29ff2ee09ebb..c6ef00b92482 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 29aaae5772af..df6f53443ed0 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,14 +1,18 @@
 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 4274 BLAKE2B 250cd19d5345d44b3c588fd21a29ba8a667247b38f01e234351a1b3449b9a6492934462b21d47ee84dc2ae3c3f5b8e5a34a8408eae9b70cd977b222dfa93fb53 SHA512 eb6dbac4a6fb795eb7f0e04e7c9f5acc70e76165a498867f0d17caaeac226c2f63019ea25e50e58e3ac672baa2079f63d66d95bd92a51eade11603c742219f5f
 EBUILD arduino-1.8.7.ebuild 4626 BLAKE2B d3c0b14878d02bf2e7ba10e6a492270309d75513cce22c912ff539bebdcd16887e9e33179a3bd0df4cea2888607aed987bcd9b0592db2a4453fae106027249de SHA512 4d0858e3d88eb66d4e561251598b2b7d7840b2e252b3738303009b740ffb8df3e7c69123116750332db1ad522c4e13869417bfd6243d7e15bed4797a791dafd5
 MISC metadata.xml 332 BLAKE2B 384c8751a6538aaca49c8fd242c5493d8321e957a1d186c9c6cf8db579ab74fe9bd25c96dda56a19afa063ade2833fe4b6d307163be7a7681421c65620fe40b7 SHA512 1d58a915f882ee70c55b5541e66cd33a1367e2f686949e1a13d7dcad62d1f1ec180d433898e5ba41f52ba9630a116b92c52cb5ad3be02127c144c1d37cfa35a0
diff --git a/dev-embedded/arduino/arduino-1.8.19.ebuild b/dev-embedded/arduino/arduino-1.8.19.ebuild
new file mode 100644
index 000000000000..30c6edc9d7ab
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.8.19.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2 desktop xdg-utils
+
+DESCRIPTION="An open-source AVR electronics prototyping platform"
+HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
+
+AVR_VERSION="1.8.3"
+EXAMPLES_VERSION="1.9.1"
+PLUGIN_VERSION="0.12.0"
+
+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/arduino-examples/archive/refs/tags/${EXAMPLES_VERSION}.zip -> ${PN}-examples-${EXAMPLES_VERSION}.zip
+	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
+	"
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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}-examples-${EXAMPLES_VERSION}.zip" "${S}/build/" || die
+	cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" || die
+}
+
+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_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"
+
+	# 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() {
+	xdg_icon_cache_update
+	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 1e12ebd45d9f..f25e389bd016 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -2,4 +2,5 @@ DIST platformio-5.1.1.tar.gz 215305 BLAKE2B a7854138dec1b5b58c4f715dde98a273ed08
 DIST platformio-5.2.3.tar.gz 252483 BLAKE2B f60b83f6647333d42b5d864ea468c8104dcd5a83085a6d52f456a21792d9c94641a60f698c2a606ddd7d7b3a588723831f35ac0d3027cb0ff8b8226dabe3b62c SHA512 c11f58a984b15a3363cd29bf9a0234c1ffc772cc153310d420037416bb8834cb2b74899ccb465d69db862cc088cfcb17dcbc7d919f690b6e836dec982d5b136b
 EBUILD platformio-5.1.1.ebuild 1111 BLAKE2B 3b68dbeea9ad0e22fc6a145ee3f8673ad408a05cda92f1ecb5859711f5705e850f8730ff54981605133aef63549d8c15c78c0b5bfcd7d14430c3506e6cc50af5 SHA512 7462e3edcce9dfe99d285bc72b13316109054020cd32f85181fd67624481c98c924f972c046d6fd3fba3ba8cbb334c549d9121d4bb63b753fd670e1047d5d3d0
 EBUILD platformio-5.2.3-r1.ebuild 2182 BLAKE2B 2754ac9911d499bef789ad3dc570293939a5e6a5f981761815457865e363a9099e2604c6e2a22890612309685f149f59383127846813849d3ffb957881473be4 SHA512 2de9212f45fc9cd251bd62b9909f99dab3a224ffcb9e306f4d1bd7d1bd06ede532aa49e4ac8428e808c8bcdf54c3e04f64a86d2de61587882e6803c6e61ab6d5
+EBUILD platformio-5.2.3-r2.ebuild 2315 BLAKE2B e6fa4088a90e73fe978e5e1ed2f2a07df0e165a676e236be60b0303cb19cef9b5a5dd09bf3b7a362298849bfe97ec3905c79b9b36919d1b377244c8dd2ee01e3 SHA512 164cafc40c53c7f74035e21a76249b09d2249f4c484c11b88b888b315b0f0a057f233a0490b514152e864b6c02703514b1f53f5a4f9084f8fc5b61e6c57d8467
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/platformio-5.2.3-r2.ebuild b/dev-embedded/platformio/platformio-5.2.3-r2.ebuild
new file mode 100644
index 000000000000..d1a8b6826686
--- /dev/null
+++ b/dev-embedded/platformio/platformio-5.2.3-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 udev
+
+DESCRIPTION="An open source ecosystem for IoT development"
+HOMEPAGE="https://platformio.org/"
+SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-core-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		=dev-python/aiofiles-0.7.0*[${PYTHON_USEDEP}]
+		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
+		>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+		<dev-python/click-9[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+		<dev-python/requests-3[${PYTHON_USEDEP}]
+		>=dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
+		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
+		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
+		dev-python/starlette[${PYTHON_USEDEP}]
+		=dev-python/uvicorn-0.15*[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	virtual/udev"
+DEPEND="virtual/udev"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )"
+
+# This list could be refined a bit to have individual tests which need network
+# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now.
+EPYTEST_IGNORE=(
+	# Requires network access
+	tests/test_builder.py
+	tests/package/test_manager.py
+	tests/package/test_manifest.py
+	tests/commands/test_platform.py
+	tests/commands/test_test.py
+	tests/commands/test_ci.py
+	tests/commands/test_init.py
+	tests/commands/test_lib.py
+	tests/commands/test_lib_complex.py
+	tests/commands/test_boards.py
+	tests/commands/test_check.py
+	tests/test_ino2cpp.py
+	tests/test_maintenance.py
+	tests/test_misc.py
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	udev_dorules scripts/99-platformio-udev.rules
+}
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 615f4a913b72..7ef0dd347efd 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,3 +1,5 @@
 DIST u-boot-2021.07.tar.bz2 17275746 BLAKE2B 1a209a604e0f30264781a14ca855bbb777e8f1c031de60d28de397084fc9bfc4a3771ad00ec22f5cdcfa721f22707a533b9b59004ac0b107df927f23dc5ab0a6 SHA512 210b206a4626feb0985580d9448a97b499b09bf9b9313ca847a66624785e9e9b0fae8f2e329acd344f5f75cb722d2093dd0ee394311ddd1fde05e400ee71a24d
-EBUILD u-boot-tools-2021.07.ebuild 1509 BLAKE2B 754f6673b7dcea23fbdba18c8023df57db54230e8a06571570f74ec2b2bd324167ba8c1249f01fc8e76402ae3c843028d7fc13d631d54abb31fd30bd58b5d3cf SHA512 40028a8715eae678f25816ade55bd523294395a959b8b76da7ffaaa99c11d7df5ff46dcbf50f8d6228a76170dc0e2603684e8441259be6886632e8020ea00109
+DIST u-boot-2021.10.tar.bz2 17358295 BLAKE2B 2471e31236ae24778b985b8e7a032fe2d480e935e9c5ee77a6aff4821c61f7fb8b3d64f9f964d62d0c076e8ac526f1b9c19f7fa1a974f4665737ab0bfd950d03 SHA512 be5be1c9a54b270307a04177d5577a21c57a02b307bf8b63d0fa2655d1f025c7ce010dca6a1f7f60d4e639c2e6fb6f0a292a2e5d190f1fad478eb12dd786c9da
+EBUILD u-boot-tools-2021.07.ebuild 1508 BLAKE2B c215b213e59436b031761565f2af0c84abf892d459b201c2ec7e3bb2e1215ab54f2cfbd1b788dc458a83686b9927a69928d14e0d1d7952ea462af9fd0d44c523 SHA512 815a0cb05943df926867b6ffafed0c544c499ec030c0320f12712486e62db127de37c582f620c7575c399c311881e8418afb89666547d1163844097132bf695e
+EBUILD u-boot-tools-2021.10.ebuild 1512 BLAKE2B 5019bf622e60b1eb1334ad0d0d2da99941c5f215114d68d63d5872fac5b2c60f3281bde3951bd74e0a3ab5f2f4c5d1d369b8fce6780f18712a46d8f743bd211e SHA512 14443876e7eb6fab8d7ef777eacac8183aa3aea394855894a2884306271f7529f88fec0a61845ff6c7891b5cbc349844ef0b6dee77068148ebc554ab2fc4ddc0
 MISC metadata.xml 343 BLAKE2B 4115ff47d73727feb01367f4f6a419d46cfed433ac0f8e0b40366f61cefa9beef9c28511a0f8db727b22e04e38b0c741b415bf6edc3b8b4ef0867255beed1935 SHA512 1523312fc43fd850cf4d24b17d17a2607f5dd2786c4827c48014f750b97088ff95c97148cb8e9cbac2fc6b3e759dee32d04a9b5da62c130a7708b34db82e5196
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
index c917c6a346b0..f77a2b9b75d5 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.07.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=8
@@ -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:="
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
new file mode 100644
index 000000000000..2c89fa57625c
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.10.ebuild
@@ -0,0 +1,79 @@
+# 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
+}