gentoo resync : 25.04.2020

7 files changed, 65 insertions, 6 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 5f5442341442..a31cd8c2f6ec 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 3bd07e1d9359..9ded04434c0b 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
-DIST platformio-4.1.0.tar.gz 157907 BLAKE2B e90d2b155121cd2be0b0d77a7a196e7fe03580083444056d06a86a343166c920cd1ac6252a0003acee4de5d3933fead939b8be8d67233e93c05537511344e27b SHA512 e4d6c29ebb8fb1b2b556affbc1a50ec84d12e878bb7e6cfb253861eb5429236d8226d1a29f1a3812c0aa2c5b4895f0354184a9cb28c300db2e2e5a2ededb82fe
-EBUILD platformio-4.1.0-r1.ebuild 1357 BLAKE2B 7276de22e430c12a051ed6f32de4780cd39a53bf694b66fee451aac629f9bdaafb0580cb7ae28b3dbe5169f2e665900c66af75f560e1b6e26a3d87cfaeb6f602 SHA512 80a4906938d243661d747f547116ecd0f674b28830fc727c30d28289f1cea8768b13c76d7bc488e75733508167336647a37972d87c7275fd5efe0851ca4aeab2
+DIST platformio-4.3.1.tar.gz 169099 BLAKE2B 0a700869ab18d6c837a42fb408f676314760402141de561c318134d72084e33ef1fcea5b1c15c72b7a3131b2d4ab30cb333acf1b634165ba98ffd571640d00ba SHA512 bde939c7511733c7ed2c2139d3edb87dfa0e7179df96e9591155eef3179de0581c98c9544870824b35c1b3282df734f27640c6a4536e2b54e3fc9ba8e68adbb4
+EBUILD platformio-4.3.1.ebuild 1307 BLAKE2B 740cb3572276569dd34eb511a51916c704def1274801187e71a349cacbf5f5fd8d5566b4338bd0107d6eeca8b2e6f9d00f64180fafd43331c3db078696b5b8b4 SHA512 35cb40a5cc5eee03c8587204ff9a7d00dcb7e172868e6ac4383b18f72e056cc5dd6841bbc1708335b9d0c6c15dd0e224b21f666f6b6284c3e8d2f61864503c00
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/platformio-4.1.0-r1.ebuild b/dev-embedded/platformio/platformio-4.3.1.ebuild
index 0c28bb271d22..e7bf816f15dc 100644
--- a/dev-embedded/platformio/platformio-4.1.0-r1.ebuild
+++ b/dev-embedded/platformio/platformio-4.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
@@ -38,5 +38,4 @@ RDEPEND="${DEPEND}
 		>=dev-python/pyelftools-0.25[${PYTHON_MULTI_USEDEP}]
 		<dev-python/pyelftools-1[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/marshmallow-2.20.5[${PYTHON_MULTI_USEDEP}]
-		<dev-python/marshmallow-3[${PYTHON_MULTI_USEDEP}]
 	')"
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index b2964ccfc6d4..bea0e99aad3a 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -2,6 +2,8 @@ AUX u-boot-tools-2019.10-musl-ulong.patch 589 BLAKE2B 79874d6aafffd538ef740f1ac7
 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.ebuild 1178 BLAKE2B d948706033a0fd9c8b72514fb34a46a09035d54f8f8b526902a3b06a68d52581e82cb74c85507853cf1f2615dc7ee923b554a784f717119e43d849e3af09b540 SHA512 eb0e9487f7bf8ac89d4baaa7b2380ef18cf42581ae0675ef8f36021388c65432e43e4051458b7784ac8a9157244b05847b3812d06a043a1f12c428b6fb403729
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
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
new file mode 100644
index 000000000000..6deafb7f05c9
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild
@@ -0,0 +1,58 @@
+# 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/xa/Manifest b/dev-embedded/xa/Manifest
index 49ec8f72b1b2..d1c04b5ca604 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,4 +1,4 @@
 AUX xa-2.3.10-fix-gcc10-fno-common.patch 203 BLAKE2B 9f503900b016956a02d2d9a1103884297e1545c624cb94c079abbc3e795ce803f35cf1c150ea233c2b78f9719ce2d15283a9ff5551c5adcbed55b6e98bf13747 SHA512 3862cad04136200447486fd6ac76298118d56a53c21f9db7aaf8f7ec248c10bd2f3ae610112a6dc5e99944da03ec52bc7cdb33879e6f1cb8fa6e9221f71472ea
 DIST xa-2.3.10.tar.gz 152433 BLAKE2B af9ab28e6596f6c96abd075779670955e7bfe79b3e9e18c5c75f35ffb166c705a0ebb60dcca1928c49a836eefcd7b15d12437579fbe645c0b5ce51e81da92d8d SHA512 08b9994e295495744d5252fa983b111f41d0447cdb32d0c065f8fbd942ffa0899476d6cfebe1162e4aa08b1d0a2d8df74c2a60987d2509b8bca45da670f4a67f
-EBUILD xa-2.3.10.ebuild 665 BLAKE2B 04202bdc5799678f851e623fb95b07d90f3465117c414fc4b27dd93c2e53c24ffdb58123f38eadc1d78cc8365da1a68646e401bde1b275fe26ec1874406f84df SHA512 a5290200cefc0ce149f46b7ced678757d3b4d671836da0dc217efb5efda88c20bc553c4531568270e8379f0486e0c7e80307ad17599d92e7d8a34b306a7e511a
+EBUILD xa-2.3.10.ebuild 664 BLAKE2B fc1614a9f728112a4a1f902360a31f50a59db359aad8654b99cac9f6da3c068914c8cb50d85f0493d218a652fa3bbe41c27b8d5845e4c58242904b0531578963 SHA512 ef839f073e67f18395afb2970b6cfe7fa2e326484d220076136ded4d3228f9a61e03cf3fa7c395f905fe683ca00bf405393c853992363c27eb99a3ab464d2917
 MISC metadata.xml 547 BLAKE2B b527da76f0bb9f9ee7bb45a48f2f6ded265f296efb4babd2f74c3db9777071ebad2f733a45325115565b3e7932b9b3ec1d87129427aefe149f6871804ece5ffe SHA512 780c7e01126675e679037e97de4ddaaca26929326b5803068abbbf0a84218c02873a4db5bfa42704953a71164b62267f80227924edd3d46755a8d6238c0c94c3
diff --git a/dev-embedded/xa/xa-2.3.10.ebuild b/dev-embedded/xa/xa-2.3.10.ebuild
index 0504b39d1534..c3803fcb811e 100644
--- a/dev-embedded/xa/xa-2.3.10.ebuild
+++ b/dev-embedded/xa/xa-2.3.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.floodgap.com/retrotech/${PN}/dists/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch )