gentoo resync : 03.03.2021

16 files changed, 38 insertions, 259 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 6f0a85f24772..185db5328f20 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 427831fa225b..880f06017f45 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -6,6 +6,6 @@ DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
 EBUILD libftdi-0.20-r1.ebuild 1858 BLAKE2B f8ea4cd9ebc1f264a670c934622396061fe3cb092f646d43f5a5c5fb79b1bed10fab359a33be9a2a4d87c5456076d5f595223984d9c0abc1bc068becf5e9355d SHA512 58ed755709fb7082213f94a6a7c7d2977ff03cfb49b6852176c8a339369dd0e704c22f076fb5ca8819856718523b6d8a61efa262aa599a1b0f34721f1ca38880
 EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f
-EBUILD libftdi-1.5-r2.ebuild 2121 BLAKE2B 60c725640b23ece5c99f18d8287ad9f6e39435da5f660027a2b55856af8f0568f586f832f70d6e58e109c0673387cad7c39af9fc62e3391dfff2f42878bebd1e SHA512 e349ed1e56b011843cd0ac33368fee7aef991cb8b83accf959d9578da532f3a8c107e2488a59966f74c338b19da1d55577d6515a07b11aeed532c15811b77db2
+EBUILD libftdi-1.5-r2.ebuild 2114 BLAKE2B dbf8580b54472c409190380262a20411ce7ffa5240378658822e4a6f775d34324af8295487363c06d460d8fb492860b2c58ef6d5cdf0277f82f2e95e212e9c5c SHA512 06e30bf4d68716f18573c4ed2797252dba1cb7bea1341b4541e94477d1e80d3d1afbc5df42455b8c908b7511bf1f3235673a37085f7ec3d6db971c2fcd48e6e6
 EBUILD libftdi-9999.ebuild 2070 BLAKE2B 24c97c8596fb7dd4679a5f60a510584421bd6a1a1f160f063db8d4faaa0473ffe7a2fe585d75039494795b6c44a33302bb34c2185a9f6d84a6ec227e8999b097 SHA512 28b15aeeb533c9952a2357068500178af2b6019914bf2f2bcba9252bd4e80580c60f8ac0f1bac51357f5d4e24f964c57a7b0c6654f73dec722ba264052c55ec5
 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild b/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
index ad0007487f72..e2753eafd084 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-embedded/nodemcu-uploader/Manifest b/dev-embedded/nodemcu-uploader/Manifest
index 427ff6dfbde2..154a2219f825 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-r1.ebuild 707 BLAKE2B 59bb43ef5cdb97a228923629656e26139e691e5523cb10c37e1184ecf18c17b4d308a76c4bdb162bf3dc74fb976c1f40839dfe1bfb419e6f4f2e73034fa5a354 SHA512 1afd2944e5c7405b4a079ccb2a754cdf59f7d31235ae244dc612125c72e7b4c2bc79350644bfcb3714883faba9bf089ea096c7e351a353365dc29bedf55be9da
-MISC metadata.xml 307 BLAKE2B 68abb22bb1d1641ad44636ad63859e0cba56417f637c45a0b199e372747954ed77f26654410233996ca660745868c9c71119cb12dbd3df80c6450570fc584f90 SHA512 f62a6075e07beda34440bfc1e371710c0bfa89956059aee54eaae7fe5f783011bc1e4bb8bd91bbb06dada88e9ef67b3bd6b99a119760b72cb7833303c4400f7b
+DIST nodemcu-uploader-1.0.0.tar.gz 855474 BLAKE2B f61e10d8c55653003063f93f276fda3d22eb7f4b30cf36bf23dac68775e6be55b73931a4cab54eb244f158b61b7dd4bb5290994386fb355b4be103bf429b5b3c SHA512 9196f8394a26bb5d412d667f7ad423c38b23f906c800e190bbc6f93206a2cbf7da28609a0803bff8b83b32c699df073c49525c05d2dbf276530156224c539864
+EBUILD nodemcu-uploader-1.0.0.ebuild 570 BLAKE2B 11b46d40b3a6ba37a60eef1d53ae31fc04c33558aa0570135ecdf217ad8b6dae38ef5d27180710b2148efd4b9a486a94ea26ca08b525d6d5f72211e14a77488a SHA512 38abc0f043a9d67d74e92914934a3b8ec1368ea66475ba21e4ac74f71c5eb919a7e5a37bf4bc6097619488b1eb4dea0ed0a4aa57a8ab4715a4262713351a48d6
+MISC metadata.xml 331 BLAKE2B b7a8736abb58ddd6abde068eb66c3e2b05325737b37f3998e265f1852a03d68ac5b523e87334c33b50cec8659330ee3e5665ffe763085d0b11f904b309d6aff1 SHA512 6f2003bebc5de8c32ed7c1d8128abe00f7ffe5176ec0187918b9bf111a236b446b1ffcafefb0f9be5f12c0f9627a6867c8bafd27c0e0e743525cbb992816d3b0
diff --git a/dev-embedded/nodemcu-uploader/metadata.xml b/dev-embedded/nodemcu-uploader/metadata.xml
index 68bb460bf72d..9b861d196d9f 100644
--- a/dev-embedded/nodemcu-uploader/metadata.xml
+++ b/dev-embedded/nodemcu-uploader/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">nodemcu-uploader</remote-id>
 		<remote-id type="github">kmpm/nodemcu-uploader</remote-id>
diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-0.4.3-r1.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-0.4.3-r1.ebuild
deleted file mode 100644
index 773459ca6de2..000000000000
--- a/dev-embedded/nodemcu-uploader/nodemcu-uploader-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU"
-HOMEPAGE="https://github.com/kmpm/nodemcu-uploader"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/wrapt-1.10.10[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RESTRICT="test"  # tests are not uploaded to pypi
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
new file mode 100644
index 000000000000..036812167200
--- /dev/null
+++ b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU"
+HOMEPAGE="https://github.com/kmpm/nodemcu-uploader"
+SRC_URI="https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/pyserial-3.4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 6249e5e9db4d..86241970e5f1 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,11 +1,5 @@
-AUX u-boot-tools-2019.10-musl-ulong.patch 589 BLAKE2B 79874d6aafffd538ef740f1ac77058ae91315cbc74cf2016d9fe9f88d37c151b6b4a7328a2b7f8aaee5e818ab0f044e883afc8e6ad0424d2d3b93e4f0ab8b7b2 SHA512 45ded2bd0bdda44ab183947084c250f0874827ab15cc15c4f4e27928cc6161fd1819f00ef696962dd94ddd10dcde3183f392a9d5b8e06029ca2c3893c5423977
-AUX u-boot-tools-2020.01-gcc-10.patch 301 BLAKE2B 1c8810f41d5c8035f578239e57303f7db634c794b50d948692aa2d12b358e4a594f92a6492b29451cf5af5475b4892408435b7c313a2b3255d74a4029c63ac6d SHA512 f42b68ca1de4f92e0fc7dca537e0fd37dcd99e53b556cf1a90c71b39989631cfbca6e094f640f89be8ff61e2933dc1644e5acb2aec67f3c782d488714c2068c8
-DIST u-boot-2019.10.tar.bz2 14214608 BLAKE2B 0dc89ebe207f836d2430d5111def9b4efa22839311d28cbfe4f0387a1b211850b0bf3cd67440b3cc32fb23aa8ece270c2438c44f5432f72474b4802ff117e803 SHA512 d8e98fca4b6af8d49d20ec09beab16b77863fcee88cda3605cc14435de21030bf3ca5e7cf7d06e42d4c0f75279c7295ecd628d2b77666eff7b7fd50374e051fd
-DIST u-boot-2020.01.tar.bz2 14716125 BLAKE2B a2860f74cd3b147d39ed55ba4745e0400e19889a772f21d4bb18be9bdca9b43c6542b2b750207421f87b155529ddb38ea52b2820b46fdbd76232cdd6c13085cd SHA512 073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7
 DIST u-boot-2020.04.tar.bz2 15065656 BLAKE2B 29cf8be6027ce46e3bf3fae9b6736e6aba46dba2904112f845d79f50b52b7c7ff3437c71dac6ab22d112347467fb5baaa3ec421cb842ba3ae9b547e4f8378d03 SHA512 e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8
-EBUILD u-boot-tools-2019.10.ebuild 1222 BLAKE2B c17b706fffbefc963eaf5483def5aaabde40546687f401c4cab51d90bdd02f89b370ed38ae6da6ef989aa749a1ae0d9a5a94a9e19fc394e9e9ea6976bce6755b SHA512 36c8f97437c04b8dc56fd3072ac7d5fb2edebb55763e2a211492535ca3f14db5a828127f93df133a46f63d83d7a69a21f86a0b54de040f46cdb5511e07c7b53b
-EBUILD u-boot-tools-2020.01.ebuild 1224 BLAKE2B fb067f2dc615ffb5c880808a6b42b918e38774b8ea8f5e83d6a7ce9f8ffba4d8f7368dbcdf8307703719c81cb14ace49b2fe65d587eddacef792733b3b89460d SHA512 98112d8af5fdb4340f7816d9cfbc6c143c6488e163018347e80f6d7b2ab51177e98b6fdf39e424f9af74890756820d9913bec255f075f5d6b7e25dc439cecb66
-EBUILD u-boot-tools-2020.04-r1.ebuild 1418 BLAKE2B 47150da7dc25e27851e9878eb57305d26d839931068c119a06b08be3cf945c7bc1e1f274d699f8862955bfbb91116f873124db75d7c045be70f3cb662c42eceb SHA512 c2fffc12e9aae0aa5adcb566fadf253829aecf959c3d1332db52f94dfbf734676a456d35034aeb1061708ea5c2c30395b6a24b664a48700d94331b1a9531d6cb
+DIST u-boot-2021.04-rc2.tar.bz2 16620315 BLAKE2B e16c167346ef3999443855b9a702bf28faacf51b7887c84096f7a372a0c820d6ed9f06c1dd209b4070adf8000853b58b7b9b81c5b32a973d37558acf1da2edfa SHA512 7bf07f15e0c5f5e63ef8cb9568278ea7c209e484bbb599c47b22a8d2e5c007cc204eec365e5328dea3e7b016cd6ba0cb4c917330cc76163b1016f7c7762ad1bf
 EBUILD u-boot-tools-2020.04-r2.ebuild 1455 BLAKE2B 7c7508400679596a57e31fd05549f75e3a0b776192d57a3e9fbfa544abff839d4a1daa75ddb084f4c682b166f6526c921301723cd0b922662ddcf8b55aa58109 SHA512 42fd08e063172d4320c7f04f075baf005da547d4bfe8d09b2effd7e8c95a26134925b86c9900e401e8177f44a2ebff6d10efe1d9cae3a7244ca620803adb923b
-EBUILD u-boot-tools-2020.04.ebuild 1178 BLAKE2B d948706033a0fd9c8b72514fb34a46a09035d54f8f8b526902a3b06a68d52581e82cb74c85507853cf1f2615dc7ee923b554a784f717119e43d849e3af09b540 SHA512 eb0e9487f7bf8ac89d4baaa7b2380ef18cf42581ae0675ef8f36021388c65432e43e4051458b7784ac8a9157244b05847b3812d06a043a1f12c428b6fb403729
+EBUILD u-boot-tools-2021.04_rc2.ebuild 1507 BLAKE2B 9a245219b22ff73691303acd59d5c211dd8bfcadddd6f14c649be5d6285cb760b3051ac94b5bb008f0e93d34bd120ce8b777e9dd52383bbb4520544403034891 SHA512 f649b15a78cb7b4a193e7ff8b000b0584b5995c1dd2fab0c47da792e710be4287a16909027c42235f2f18387ead2aeee1118ce787035220c7a80564855ba6f1f
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch b/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch
deleted file mode 100644
index 910e95a8cbf6..000000000000
--- a/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/703132
-
-include/compiler.h implies to define 'ulong' type.
-glibc and musl define it on different conditions.
-As a result tools fail to build on musl as:
-    include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'?
-
-We fix it by defining 'ulong' unconditionally (as on BSD).
-
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -44,6 +44,7 @@
- #ifdef __linux__
- # include <endian.h>
- # include <byteswap.h>
-+typedef unsigned long ulong;
- #elif defined(__MACH__) || defined(__FreeBSD__)
- # include <machine/endian.h>
- typedef unsigned long ulong;
diff --git a/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch b/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
deleted file mode 100644
index 321559761517..000000000000
--- a/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,7 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
--YYLTYPE yylloc;
-+extern YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
deleted file mode 100644
index cacfea709295..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/${P}-musl-ulong.patch)
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	emake \
-		V=1 \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		tools-only_defconfig
-
-	emake \
-		V=1 \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-	doman "${S}"/doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
deleted file mode 100644
index 798ff7a240bc..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	emake \
-		V=1 \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		tools-only_defconfig
-
-	emake \
-		V=1 \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-	doman "${S}"/doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild
deleted file mode 100644
index 6deafb7f05c9..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	emake \
-		V=1 \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		tools-only_defconfig
-
-	emake \
-		V=1 \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-	doman "${S}"/doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
index 32ca29504b4b..fac11bef4161 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,9 +12,11 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
+RDEPEND="dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
@@ -25,13 +27,13 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	default
 	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
-		scripts/kconfig/lxdialog/check-lxdialog.sh \
+		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
 		scripts/kconfig/Makefile \
 		tools/Makefile || die
 }
 
 src_configure() {
-	tc-export CC PKG_CONFIG
+	tc-export AR CC PKG_CONFIG
 }
 
 src_compile() {
@@ -40,6 +42,7 @@ src_compile() {
 
 	emake \
 		V=1 \
+		AR="${AR}" \
 		CC="${CC}" \
 		HOSTCC="${CC}" \
 		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
@@ -51,6 +54,7 @@ src_compile() {
 		NO_SDL=1 \
 		HOSTSTRIP=: \
 		STRIP=: \
+		AR="${AR}" \
 		CC="${CC}" \
 		HOSTCC="${CC}" \
 		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index 978d47969534..1da1baedab10 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,6 +1,6 @@
 DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff
 DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
 EBUILD urjtag-0.10-r1.ebuild 1068 BLAKE2B 5a9566d2fcf63d1cdd3bbabffaf166a3fc76ce1e4d7a0aad82593502c86687e5cac2a7a0ad73f34e37d9124dcd2fc421e5de8ccff404f614ceeaec6b66df31ea SHA512 0cd41fcccf30f89fb310e5a95e86d9fa69538baf5a53658b09fe023b8631c0f203d5f60e9d06cf663416139978bfbd7a907258b1b728ddda01175fd02418fd37
-EBUILD urjtag-2019.12.ebuild 1148 BLAKE2B c8e7b980f6ede0838c829c680f7e4a579d77f973a1f1f08e385404f66814c80b64e1244dae4ecfa34fe52b0807a2baf64af2c6a5d4b4bada5186ec96ebd5c44b SHA512 1f9e60b631e1e87e8cb0c3348b627ac043f4a8f97a2582fe936933b8f148410af13c6562226137c9e9539f6a8d8bb81aa3b9c53190937242184a33fdee68e883
+EBUILD urjtag-2019.12.ebuild 1147 BLAKE2B 3d9ba4538f8e6c5903baee8df72caa0d9bf3471f4dae55b8c825cb2147e1294524433fea5d0046f0949e9c5fb0811224b1b80415fbdfde6ae418cff92ffebf85 SHA512 85979daea74b637a6f3067e4ce5cc6096fe2d5a0517f55ad1a1b079455a9d66a78044ead3036de0e53a6060358cf96a62d35bc66fc509769a4c4b445b8c4c732
 EBUILD urjtag-9999.ebuild 1081 BLAKE2B af03442b0e29f3e60b73ab4edbea83f258b916b9abc57e555428d2f9a8f307a151703442bacb2c947e0069d15cc34f1ae0818ddcb1dd9609660cb4ca8dc414c5 SHA512 e8171862ad821fd5157b1653267ebfb41ac2a88e733f1e251cd51700356510526d9d8f33a5200473bcf0114cb8fe805e87820b55ca810eb08882818bf82b2217
 MISC metadata.xml 540 BLAKE2B 5cace8526e0edb053bb7b56bed518d237eb0c16c1eb94a6ab136166a09631a9f005a7f60404fb6dcf6cedb8b69e367da028b51738f5a06e7a836cb0d22a2a066 SHA512 cb3523611ffcd7e007e06a630b1299aa610511ef20073c5e8a8efada52ba58ff34fcf2ccc4c04f51676e224b3d2b388a871995499fda480c0d51dc063a0777ce
diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2019.12.ebuild
index e2cbfa973d52..378f3e6e7e28 100644
--- a/dev-embedded/urjtag/urjtag-2019.12.ebuild
+++ b/dev-embedded/urjtag/urjtag-2019.12.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
-	KEYWORDS="~amd64 ppc sparc x86"
+	KEYWORDS="amd64 ppc sparc x86"
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"