gentoo resync : 16.01.2021

15 files changed, 340 insertions, 127 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c6ef00b92482..f7217556a010 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/pk2cmd/Manifest b/dev-embedded/pk2cmd/Manifest
index 36ec890fcc60..4551cb2b9e82 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
+AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 596 BLAKE2B 9eb25f4ab586cd2a9348e9a6af3e821a64df29285304e7dae0ec83d2fe9ddcd341eb85f1f853f89b3547619b30221c71543cea08839f44e4bcfdba07d276e00c SHA512 a4d0ea6f6b69b5b8a881c53b3fde679d29ca948ef53fa9b5e57114da12caa39ad1caa18277c341a2ba3ea0240d56289d2181805701d5e7bc63a61ad3c9b87fa3
 DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 BLAKE2B b2d53763d5030341f13cb1bee534cfbed160ee4e4a839d5f900bb334f50a0ca52968fd8dc3f27e0fa8ecb47ad2b1d251881ed4646be41b5862e4fd0c452102a9 SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24
-EBUILD pk2cmd-1.20.ebuild 1209 BLAKE2B a3a3edaa93a9cf4357c42fac2114359b7584cfcb683d052ed9d47ba6a5ffb210b852bc2d9912ca508215661da6ae80c5863bdc2d1198aa55c174502f4d83442e SHA512 fe954cf667a37fb9aaadd9901eb37f4aef9064c1993fa2826b74d20db07601f1f3080f9ea80619b9ea9da2d4c1783cd92649c097b6340dd119957fa4f77001e1
+EBUILD pk2cmd-1.20-r1.ebuild 1137 BLAKE2B 2eb83838c7bf9ad612ef4776716791d1c25e66cb8fede3b74aafdb7d2e53a9998374c4884e66d4649e3a4231605edd2518035be71233eb3e3f3220357c714e89 SHA512 b7a6caa0481cd228ac6f45deb36baf66bf518d32cbd26614290f5b6bccbf2bc30c85eec26bc5af93080aebc334fad9e038a2f0f20ede3e08c1fc11e6f7779ad7
 MISC metadata.xml 250 BLAKE2B 8a43cac0f4db66fbc1320598dc1a764f7abebcf37513543da007eb2bd61064dbb068f78eb913b4ec16214beccbcc1229ebfa17beaae09eabef985852fb8a5b11 SHA512 95796c4e480c6e6a7db492b41b97c8676fe00580079637184b03bc4105b362d6ceac8d692fc6c426d7388e08892d080cf64c8c0143b3e9fd0e7a52a8d1295c78
diff --git a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
index 30d6b1e71a3e..2dfb014007f1 100644
--- a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
+++ b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
@@ -1,5 +1,5 @@
---- cmd_app.cpp.old	2009-01-31 21:23:30.000000000 +0100
-+++ cmd_app.cpp	2009-01-31 21:25:48.000000000 +0100
+--- a/cmd_app.cpp
++++ b/cmd_app.cpp
 @@ -88,7 +88,12 @@
  		_tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);

  		if (_tcslen(tempString) < 17)

diff --git a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.20-r1.ebuild
index a37ef5bd81df..db9537427e48 100644
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20-r1.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An application for working with the Microchip PicKit2 PIC programmer"
 HOMEPAGE="http://www.microchip.com/pickit2"
 SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSource.tar.gz"
+S="${WORKDIR}/${PN}v${PV}LinuxMacSource"
 
 LICENSE="MicroChip-PK2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~x86"
-IUSE=""
 
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}v${PV}LinuxMacSource
+PATCHES=(
+	"${FILESDIR}"/${PN}-add-share-dir-for-dev-file-${PV}.patch
+)
 
 src_prepare() {
-	# Patch adds /usr/share/pk2 to the default search for the device file
-	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file-${PV}.patch"
+	default
 
 	# Fix up the Makefile
 	sed \
@@ -40,7 +41,7 @@ src_compile() {
 
 src_install() {
 	# Copy the device files and PicKit2 OS
-	insinto "/usr/share/pk2"
+	insinto /usr/share/pk2
 	doins PK2DeviceFile.dat PK2V023200.hex
 	# Install the program
 	dobin pk2cmd
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index f25e389bd016..46ee397ef857 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,6 +1,3 @@
-DIST platformio-5.1.1.tar.gz 215305 BLAKE2B a7854138dec1b5b58c4f715dde98a273ed08c0da7fb305f89490944c210737c7c500731b21a5a9cb2bf3be3925f1666ef1084992b99df46d3ee83b449baaaa35 SHA512 f74ae3cb46065379b90c7ec3574d6ff0076085cd891bf41be2f38b6c6b59f87f4d013c1da6e4825f7d831ed17136e433385ab07c3f16b31342d5415192f87eff
-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
+DIST platformio-5.2.4.tar.gz 254337 BLAKE2B e29b69a514b5f3bc6faefb15dd4e3195152d74b763961c35c33cd9e44bcd430920dc2f4d553244c2ac1bb83d745c006c67d2d52973fa07562c8b98d8e74a2ac3 SHA512 f90c1f5d9dcada99c610003b26ccaa4e08c214757d0c26daeea3cae006a02179aea1eb0bc656751913d0b2c4161195b1afe9ab0eaab5ad594ff986f6b56728f8
+EBUILD platformio-5.2.4.ebuild 2357 BLAKE2B 088d560ae0b4451ba4dc0dbc0fa9a1296523d98804eb89e20787e0cb33f1037f482de5f883c20b73856a47d2ed12bf0033421784e234a2431a144bf3c62e3786 SHA512 310411670f92ec4579f5690dd42584e8d48014170e8ff5f87e084b7aa35936014068a511484ba5244438a61adba967b2dbb8b1d9c40e0ea12f563042e309c8f6
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/platformio-5.1.1.ebuild b/dev-embedded/platformio/platformio-5.1.1.ebuild
deleted file mode 100644
index a8a4f90c75cc..000000000000
--- a/dev-embedded/platformio/platformio-5.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		<dev-python/click-8[${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/pyelftools-0.25[${PYTHON_USEDEP}]
-		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
-	')"
diff --git a/dev-embedded/platformio/platformio-5.2.3-r1.ebuild b/dev-embedded/platformio/platformio-5.2.3-r1.ebuild
deleted file mode 100644
index 14d85de3ff59..000000000000
--- a/dev-embedded/platformio/platformio-5.2.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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
-
-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}]
-	')"
-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
diff --git a/dev-embedded/platformio/platformio-5.2.3-r2.ebuild b/dev-embedded/platformio/platformio-5.2.4.ebuild
index d1a8b6826686..21416a0b2fad 100644
--- a/dev-embedded/platformio/platformio-5.2.3-r2.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.4.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
@@ -15,11 +15,12 @@ S="${WORKDIR}"/${PN}-core-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		=dev-python/aiofiles-0.7.0*[${PYTHON_USEDEP}]
+		>=dev-python/aiofiles-0.8.0[${PYTHON_USEDEP}]
+		dev-python/ajsonrpc[${PYTHON_USEDEP}]
 		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
 		>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
 		<dev-python/click-9[${PYTHON_USEDEP}]
@@ -36,8 +37,8 @@ RDEPEND="
 		>=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/starlette-0.17[${PYTHON_USEDEP}]
+		>=dev-python/uvicorn-0.16[${PYTHON_USEDEP}]
 		dev-python/wsproto[${PYTHON_USEDEP}]
 		dev-python/zeroconf[${PYTHON_USEDEP}]
 	')
diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest
index d95764c1cfcc..6d3344835e59 100644
--- a/dev-embedded/sunxi-tools/Manifest
+++ b/dev-embedded/sunxi-tools/Manifest
@@ -1,3 +1,7 @@
+AUX sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch 1485 BLAKE2B bbb0a18d84eb5a7d5994c51e721ee9507c353f5568ba1897b865883e0b3db4c1b834eb78d6c8073cadc98f568b1f364b87a954e6cddecab67de936522e17780d SHA512 cc511e21552dd914df8a3e11d041c43e5c7b56b025e26180c9d421c5430cc1fbd9db2b8e789b0c365289e158b59a067352a8bd9b00fd9a34cf0fe5e10436d920
+AUX sunxi-tools-1.4.1-respect-user-supplied-cflags.patch 5900 BLAKE2B 8cf7a6e4a3c75d69e4ebafba3302cd7fd479b35a0e4740259111fb28265fb29336a9ab6cff857e46eb482a05480d421f7f268ca4e4a81212f3256dc16a3e824c SHA512 7a84cfa2b054bb955cf1cf763e5758233fbbfa92911c42cc385318e35850628ff66f588b54d2b360afc86cd635ad308240a9ba286f6783653357a82bfcd2eff9
 DIST sunxi-tools-1.3.tar.gz 52608 BLAKE2B e8c3ed7276f705273598e38a0cc469225de1ee4eb8177b78be63b78ebc584c4fdf2362e21b895f61b4c5e84df98bfd5ccf6d3965ffa9338c98027c9ce4635626 SHA512 954c95963013aee8a38b3583ba1b7ec7e7049c7e09c5fa9ec564dfc33f304d3669fdf68c2fa5e4b5a6265640a3d1ee8bc13bcd71d804c714884b6a780d193615
-EBUILD sunxi-tools-1.3-r1.ebuild 712 BLAKE2B af080aab20035e7d885ccd53ff8ff5d80a0a690e6a15ef4b4aef945ba4b991773f9307aa78e0624c48636a1a60f565925bea0e44ff5fa419b2d31a5896671168 SHA512 ff97830302796fb902f404644428ad9cc47cdeef99d9ca6a38387c9d9efa2ff06c3a31ab438d2e007df274270beb304bb7c1e43924226c6ad20d2c95e5d8b506
+DIST sunxi-tools-1.4.1.tar.gz 78878 BLAKE2B f50b14e79d4880a076f8b25869eea44e34cfc50c91ce7f9e4adc831bb2ac2238c930623677bacb399e52faadba20c9ba21ea212915c50941af825d0579804153 SHA512 b66f5caaabec016a0d2f1ccc88ee7f37cd26a511ac81c270e2de6bf0b967e8dfda2b510d5306daffb33ec8855c3c6be99a29bfd1efd5bd0cf3431494b092a52b
+EBUILD sunxi-tools-1.3-r1.ebuild 712 BLAKE2B 6cecb0174cf62fd297ed0681e7d80f681039df50402352b6d5597da208bf2e3b0db24968163d6db9632263a512655f41cf815db528990b7408a209729ae16cd6 SHA512 91536ca44ae58971bb1c86bba0cb195b6538b1303bf2223d9f56e2d0e56b3195b3fcdf35eb707b4b7e5a2e94a098175954fda3496c7773e020123e90f89eed78
+EBUILD sunxi-tools-1.4.1.ebuild 776 BLAKE2B 399bdd6f4002d1f84f1e8a1eca2ae9302d1b46b68de227b09943c13cb333db8638bcc18e0ae32626162e3408e3011044e169252c25959be4ed85c3c2365c83a9 SHA512 88b72525a65ff362efb8df1c1a4f0e4b9d510ca3da6a75444d4c7c02ae5d6252d389dbef13d16d3de4e27540533a26309c6eb6d06a2b646c0fd08635c35d03eb
 MISC metadata.xml 340 BLAKE2B 576247e37e7212908e8e04cdf8ded79a9270c130760add714f11d0b1018db8670f07a60adf20ab4e06896e47a8795a05d9ee25de363c329e1c1a259f4c85f4ec SHA512 ae5a0ae8ed5d1e5d2942604d9f2b2fe134e9f719ae1bda055761a0acfd316f6710d111f9639a37256636ff478ec0b01cc3af31e151b78c53626bccc03158c9af
diff --git a/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch
new file mode 100644
index 000000000000..a255e61f3f01
--- /dev/null
+++ b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-fix-strncpy-compiler-warning.patch
@@ -0,0 +1,42 @@
+From 0825d9aaa6078ef283390662004797a9a1d939f3 Mon Sep 17 00:00:00 2001
+From: Andre Przywara <andre.przywara@arm.com>
+Date: Wed, 15 Dec 2021 23:04:14 +0000
+Subject: [PATCH 1/2] nandpart: fix strncpy compiler warning
+
+More recent versions of GCC warns about the usage of strncpy in
+nandpart.c: we actually only (need to) copy the stub string part of the
+magic string, without the terminating NUL character. This is fine in
+our particular case, but raises the compiler's eyebrows:
+===================
+nand-part.c: In function '_get_mbr':
+nand-part.c:93:4: warning: 'strncpy' output truncated before terminating
+                  nul copying 8 bytes from a string of the same length
+                  [-Wstringop-truncation]
+   93 |    strncpy((char *)mbr->magic, MBR_MAGIC, 8);
+      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+===================
+
+Switch to the more fitting memcpy() here to avoid the warning.
+
+Signed-off-by: Andre Przywara <andre.przywara@arm.com>
+Reported-by: slange-dev
+---
+ nand-part.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nand-part.c b/nand-part.c
+index a0d46c5..af2169d 100644
+--- a/nand-part.c
++++ b/nand-part.c
+@@ -90,7 +90,7 @@ static MBR *_get_mbr(int fd, int mbr_num, int force)
+ 		printf("check partition table copy %d: ", mbr_num);
+ 		printmbrheader(mbr);
+ 		if (force) {
+-			strncpy((char *)mbr->magic, MBR_MAGIC, 8);
++			memcpy(mbr->magic, MBR_MAGIC, 8);
+ 			mbr->version = MBR_VERSION;
+ 			return mbr;
+ 		}
+-- 
+2.32.0
+
diff --git a/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-respect-user-supplied-cflags.patch b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-respect-user-supplied-cflags.patch
new file mode 100644
index 000000000000..faa2ae606bea
--- /dev/null
+++ b/dev-embedded/sunxi-tools/files/sunxi-tools-1.4.1-respect-user-supplied-cflags.patch
@@ -0,0 +1,153 @@
+From 95d40f8fcfd97890c270d2987bd845c7a6bac428 Mon Sep 17 00:00:00 2001
+From: Bernhard Nortmann <bernhard.nortmann@web.de>
+Date: Sat, 29 Oct 2016 18:32:00 +0200
+Subject: [PATCH] Makefile: Ensure that user-supplied CFLAGS get respected
+
+Signed-off-by: Bernhard Nortmann <bernhard.nortmann@web.de>
+---
+ .travis.yml |  2 +-
+ Makefile    | 53 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 47aa891..c843fba 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -4,7 +4,7 @@ sudo: false
+ language: c
+ 
+ # treat all warnings as errors
+-env: EXTRA_CFLAGS=-Werror
++env: CFLAGS=-Werror
+ 
+ os:
+   - linux
+diff --git a/Makefile b/Makefile
+index 6e0471b..12f121c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,21 +17,21 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ CC ?= gcc
+-CFLAGS = -g -O0 -Wall -Wextra $(EXTRA_CFLAGS)
+-CFLAGS += -std=c99 $(DEFINES)
+-CFLAGS += -Iinclude/
++DEFAULT_CFLAGS := -g -O0 -Wall -Wextra -std=c99
+ 
+-DEFINES = -D_POSIX_C_SOURCE=200112L
++DEFAULT_CFLAGS += -D_POSIX_C_SOURCE=200112L
+ # Define _BSD_SOURCE, necessary to expose all endian conversions properly.
+ # See http://linux.die.net/man/3/endian
+-DEFINES += -D_BSD_SOURCE
++DEFAULT_CFLAGS += -D_BSD_SOURCE
+ # glibc 2.20+ also requires _DEFAULT_SOURCE
+-DEFINES += -D_DEFAULT_SOURCE
++DEFAULT_CFLAGS += -D_DEFAULT_SOURCE
+ ifeq (NetBSD,$(OS))
+ # add explicit _NETBSD_SOURCE, see https://github.com/linux-sunxi/sunxi-tools/pull/22
+-DEFINES += -D_NETBSD_SOURCE
++DEFAULT_CFLAGS += -D_NETBSD_SOURCE
+ endif
+ 
++DEFAULT_CFLAGS += -Iinclude/
++
+ # Tools useful on host and target
+ TOOLS = sunxi-fexc sunxi-bootinfo sunxi-fel sunxi-nand-part
+ 
+@@ -49,6 +49,7 @@ MISC_TOOLS = phoenix_info sunxi-nand-image-builder
+ BINFILES = fel-pio.bin jtag-loop.sunxi fel-sdboot.sunxi uart0-helloworld-sdboot.sunxi
+ 
+ CROSS_COMPILE ?= arm-none-eabi-
++CROSS_CC ?= $(CROSS_COMPILE)gcc
+ MKSUNXIBOOT ?= mksunxiboot
+ 
+ DESTDIR ?=
+@@ -110,24 +111,26 @@ LIBUSB_CFLAGS ?= `pkg-config --cflags $(LIBUSB)`
+ LIBUSB_LIBS ?= `pkg-config --libs $(LIBUSB)`
+ ifeq ($(OS),Windows_NT)
+ 	# Windows lacks mman.h / mmap()
+-	DEFINES += -DNO_MMAP
++	DEFAULT_CFLAGS += -DNO_MMAP
+ 	# portable_endian.h relies on winsock2
+ 	LIBS += -lws2_32
+ endif
+ 
++HOST_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
++
+ sunxi-fel: fel.c fel-to-spl-thunk.h progress.c progress.h
+-	$(CC) $(CFLAGS) $(LIBUSB_CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS) $(LIBUSB_LIBS)
++	$(CC) $(HOST_CFLAGS) $(LIBUSB_CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS) $(LIBUSB_LIBS)
+ 
+ sunxi-nand-part: nand-part-main.c nand-part.c nand-part-a10.h nand-part-a20.h
+-	$(CC) $(CFLAGS) -c -o nand-part-main.o nand-part-main.c
+-	$(CC) $(CFLAGS) -c -o nand-part-a10.o nand-part.c -D A10
+-	$(CC) $(CFLAGS) -c -o nand-part-a20.o nand-part.c -D A20
++	$(CC) $(HOST_CFLAGS) -c -o nand-part-main.o nand-part-main.c
++	$(CC) $(HOST_CFLAGS) -c -o nand-part-a10.o nand-part.c -D A10
++	$(CC) $(HOST_CFLAGS) -c -o nand-part-a20.o nand-part.c -D A20
+ 	$(CC) $(LDFLAGS) -o $@ nand-part-main.o nand-part-a10.o nand-part-a20.o $(LIBS)
+ 
+ sunxi-%: %.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
++	$(CC) $(HOST_CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
+ phoenix_info: phoenix_info.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
++	$(CC) $(HOST_CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ %.bin: %.elf
+ 	$(CROSS_COMPILE)objcopy -O binary $< $@
+@@ -143,39 +146,39 @@ ARM_ELF_FLAGS += -mno-thumb-interwork -fno-stack-protector -fno-toplevel-reorder
+ ARM_ELF_FLAGS += -Wstrict-prototypes -Wno-format-nonliteral -Wno-format-security
+ 
+ fel-pio.elf: fel-pio.c fel-pio.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T fel-pio.lds
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T fel-pio.lds
+ 
+ fel-pio.nm: fel-pio.elf
+ 	$(CROSS_COMPILE)nm $< | grep -v " _" >$@
+ 
+ jtag-loop.elf: jtag-loop.c jtag-loop.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T jtag-loop.lds -Wl,-N
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T jtag-loop.lds -Wl,-N
+ 
+ fel-sdboot.elf: fel-sdboot.S fel-sdboot.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T fel-sdboot.lds -Wl,-N
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T fel-sdboot.lds -Wl,-N
+ 
+ uart0-helloworld-sdboot.elf: uart0-helloworld-sdboot.c uart0-helloworld-sdboot.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T uart0-helloworld-sdboot.lds -Wl,-N
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T uart0-helloworld-sdboot.lds -Wl,-N
+ 
+ boot_head_sun3i.elf: boot_head.S boot_head.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1094
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1094
+ 
+ boot_head_sun4i.elf: boot_head.S boot_head.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1008
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x1008
+ 
+ boot_head_sun5i.elf: boot_head.S boot_head.lds
+-	$(CROSS_COMPILE)gcc  -g  $(ARM_ELF_FLAGS)  $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x102A
++	$(CROSS_CC) -g $(ARM_ELF_FLAGS) $< -nostdlib -o $@ -T boot_head.lds -Wl,-N -DMACHID=0x102A
+ 
+ sunxi-bootinfo: bootinfo.c
+ 
+ # target tools
+-TARGET_CFLAGS = -g -O0 -Wall -Wextra -std=c99 $(DEFINES) -Iinclude/ -static
++TARGET_CFLAGS = $(DEFAULT_CFLAGS) -static $(CFLAGS)
+ sunxi-pio: pio.c
+-	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -o $@ $<
++	$(CROSS_CC) $(TARGET_CFLAGS) -o $@ $<
+ sunxi-meminfo: meminfo.c
+-	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -o $@ $<
++	$(CROSS_CC) $(TARGET_CFLAGS) -o $@ $<
+ sunxi-script_extractor: script_extractor.c
+-	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -o $@ $<
++	$(CROSS_CC) $(TARGET_CFLAGS) -o $@ $<
+ 
+ version.h:
+ 	@./autoversion.sh > $@
+-- 
+2.32.0
+
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
index 9da2f4453ad7..63cae3c5fd25 100644
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.4.1.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.4.1.ebuild
new file mode 100644
index 000000000000..24b37f3e50e0
--- /dev/null
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="v${PV}"
+SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Tools for Allwinner A10 devices."
+HOMEPAGE="http://linux-sunxi.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+DEPEND="virtual/libusb"
+
+PATCHES=(
+	"${FILESDIR}/${P}-respect-user-supplied-cflags.patch"
+	"${FILESDIR}/${P}-fix-strncpy-compiler-warning.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" tools misc
+}
+
+src_install() {
+	dobin bin2fex fex2bin phoenix_info sunxi-nand-image-builder
+	newbin sunxi-bootinfo bootinfo
+	newbin sunxi-fel fel
+	newbin sunxi-fexc fexc
+	newbin sunxi-nand-part nand-part
+}
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 7ef0dd347efd..c6b6d3d5ea20 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,7 @@
 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 1508 BLAKE2B c215b213e59436b031761565f2af0c84abf892d459b201c2ec7e3bb2e1215ab54f2cfbd1b788dc458a83686b9927a69928d14e0d1d7952ea462af9fd0d44c523 SHA512 815a0cb05943df926867b6ffafed0c544c499ec030c0320f12712486e62db127de37c582f620c7575c399c311881e8418afb89666547d1163844097132bf695e
 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
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
new file mode 100644
index 000000000000..2c89fa57625c
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.01.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
+}