gentoo resync : 05.02.2020

14 files changed, 247 insertions, 142 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 8541a09d597a..c48e40374d08 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 0c9c6a93113f..c4999c415cb2 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -27,6 +27,6 @@ DIST arduino-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb
 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-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
-EBUILD arduino-1.8.5-r2.ebuild 5052 BLAKE2B 1a5030bbbf97a84b23895770cb26dfd1aeaca126ff87d295cd96664955f15704a52585de0cfb09e35741e8a21ddef1cf9fa33ed2fe112f435fcecc001562dfb6 SHA512 43d670b61383637d7da05b3619a941823c3b786c348c8290e55649e390bdb12a664770588267e8cb55a8d96b8de272c6694295ba1fab0e8eda7db4aa1ac1e5bc
-EBUILD arduino-1.8.7.ebuild 4683 BLAKE2B 6aa4b4fc81b29d5dcfaa4b97682bb1704bbde4b95a3138bd2223d1dddd6c87dba180af00ae79afd7d0e15e1c16aaf2ae35c8395f54ceee2e9e3567488a1b2672 SHA512 aecb1545db27ea0362f02c5fe9308d3f9d619b6ba6f1243cf0a52965ebcd44ef69c79d39ef9ef8c859bd57456f70726346c43b6341dda8605c8d9be22e3ba8f6
+EBUILD arduino-1.8.5-r2.ebuild 4998 BLAKE2B 686e41cb217687288e4731eb2bdf306a2aec418d6e6fa7379c742c68c1971fd4323f9247ab58a0867807a5240c55cf6843efcd240aca5b42b29cc5d4c69bba93 SHA512 b18619dc08ab37ec4833fa32a6290e7a5d101f71a30418f4b7942d0ebffb2f56607ffe5d52f106c05d8708c4fb2d45f51cd945e22af48e151a36f03eec4f88a4
+EBUILD arduino-1.8.7.ebuild 4629 BLAKE2B 572d1608f8d7521573d5c0fd6f880ec86e26e2b4b616c2818cf89fb06546326207c42fb55f417eda9d15b0c988544418b31633044107873426870c7d3c87af3b SHA512 5145ecd9354dec069c589178bc3d99ae1699f4ed16d01ca6854056042be48ce99a79bb6ca595ce05cfb06e37c1907c618e06b27a04d26396935e8dadbb954059
 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
index f058950e8fcf..e958a4d41910 100644
--- a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -134,9 +134,9 @@ src_install() {
 
 	# 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 "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt"
-	dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt"
-	dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder"
+	dosym "../../arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt"
+	dosym "../../arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt"
+	dosym "../../../bin/arduino-builder" "${SHARE}/arduino-builder"
 
 	# hardware/tools/avr needs to exist or arduino-builder will
 	# complain about missing required -tools arg
@@ -147,7 +147,7 @@ src_install() {
 		einstalldocs
 
 		# arduino expects its doc in its "main" directory. symlink it.
-		dosym "${EPREFIX}/usr/share/doc/${PF}/html/reference" "${SHARE}/reference"
+		dosym "../doc/${PF}/html/reference" "${SHARE}/reference"
 	fi
 
 	# Install menu and icons
diff --git a/dev-embedded/arduino/arduino-1.8.7.ebuild b/dev-embedded/arduino/arduino-1.8.7.ebuild
index 6a1c9a5f0555..8872bdc6b90c 100644
--- a/dev-embedded/arduino/arduino-1.8.7.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -111,9 +111,9 @@ src_install() {
 
 	# 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 "${EPREFIX}/usr/share/arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt"
-	dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt"
-	dosym "${EPREFIX}/usr/bin/arduino-builder" "/usr/share/${PN}/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
@@ -124,7 +124,7 @@ src_install() {
 		einstalldocs
 
 		# arduino expects its doc in its "main" directory. symlink it.
-		dosym "${EPREFIX}/usr/share/doc/${PF}/html/reference" "/usr/share/${PN}/reference"
+		dosym "../doc/${PF}/html/reference" "/usr/share/${PN}/reference"
 	fi
 
 	# Install menu and icons
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index f166c90a8fa5..3ca1af3dd7f5 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,6 +1,9 @@
 AUX sdcc-3.8.0-override-override.patch 1078 BLAKE2B f1e1e135b9ee972e8f7f6a08af736de227c8534d181f160b00f6eecef0e7f4366e39fc5a8f6034bfffa64531423d28377c778055d6be8671527971ce183ebab5 SHA512 fbc13832bea859409f2ae525a82927424dd474db9c6077d1311b9775d0a4a8728d79db7465c928271faa54221b53982ee539537e4fe8a70209c0f453b95105aa
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
+DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
+DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c
 EBUILD sdcc-3.8.0-r1.ebuild 3232 BLAKE2B 2e8966239d962b3c282a3aac8af2c025fd1469810c6aea3d1fb69acd753209b6568974631b0e1339eb92747d7279f25874ee0f3aada2820e76c988ad35fdd0fa SHA512 08b079da05f688f75e6cada2b2ba691501492ebf9faac512e210ece89e02dfaca02200518c911c92782b7f39066a5649152d13de6da7548b559a1c2ec136e9cc
-EBUILD sdcc-9999.ebuild 3234 BLAKE2B 4ba8a068055f1585d5daf851e6925490619726a5d0c8da4c8c6c419ea5a83b8c3a0a4932097967e1c1661d18af7fb7dc7501b5de5afbcdf04be4812faff279e8 SHA512 90b6882c012c1a0cccef1cb2b37a180e22499ac025046fcca0942a6f44433d3756bd97f492bd58fedf2d8cc97bb102e469441f6aeb5f543af84c5ff6b6bc490b
-MISC metadata.xml 2284 BLAKE2B e3fdd79032b8f663940903ed11a92c199048bcc485d24c3d7ab99757e3cdad1438c319cc7327f53921f7c853a59fe0a6bc4dfc5df84d4edfd92feae42459b858 SHA512 cd4b8ed438d294e239e67f0037d1f0f044215d2c6da8a13a661ebd56c3501df0ed7ecb41fb0c34f150345c5008dc3d37d9df127da60bb6c59bb630f1c695c118
+EBUILD sdcc-4.0.0.ebuild 3515 BLAKE2B 0a55b3c617993a4f7c1d2fc5d0d62ba2823aed84a52d3f6b159e301c82aee1c1efa69d5d9df2a54adae5fcdd1173db6f31263ee3f8b94fddcb173d3145be2625 SHA512 a21051db48ff808ff69503ca493aa83fd04528e29be66efd122626ae8804dd2546e629b980abe8b0201f4e8bcdc8c02fceff57dcf87267ea6ca5ea99e40c350e
+EBUILD sdcc-9999.ebuild 3515 BLAKE2B 0a55b3c617993a4f7c1d2fc5d0d62ba2823aed84a52d3f6b159e301c82aee1c1efa69d5d9df2a54adae5fcdd1173db6f31263ee3f8b94fddcb173d3145be2625 SHA512 a21051db48ff808ff69503ca493aa83fd04528e29be66efd122626ae8804dd2546e629b980abe8b0201f4e8bcdc8c02fceff57dcf87267ea6ca5ea99e40c350e
+MISC metadata.xml 2591 BLAKE2B 1b198148b963e4ff980101f49ba58c12f684577d22542356325cf2dc2afc1328ea711d621f0ff62a3ad9b3f0f43cf49beb9339616cd7c26ce5b007ab4b3c4e54 SHA512 0ad3c024e61cc84166f8e4a3e99bd3c57849a958f431d11f7ce993c90456250bb2e6c2f1f335c668616e3036a87c330593d40eb85c42ae1a212c6cc1f7d9635c
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index 6d9caa8c84ad..101bb8b34119 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -17,28 +17,35 @@ microprocessors.
 		<remote-id type="sourceforge">sdcc</remote-id>
 	</upstream>
 	<use>
-		<flag name="avr">Add support for AVR -- not supported upstream</flag>
 		<flag name="boehm-gc">Enable Hans Boehm's garbage collector <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name="device-lib">Enable built of devices libraries</flag>
-		<flag name="ds390">Add support for Dallas DS390</flag>
-		<flag name="ds400">Add support for Dallas DS400</flag>
-		<flag name="gbz80">Add support for Gameboy gbz80</flag>
-		<flag name="hc08">Add support for Freescale/Motorola HC08 based</flag>
-		<flag name="mcs51">Add support for Intel mcs51</flag>
 		<flag name="non-free">Enable non-free runtime library parts</flag>
 		<flag name="packihx">Enable Intel HEX files pack utility</flag>
-		<flag name="pic14">Add support for Microchip 14 bits PICs</flag>
-		<flag name="pic16">Add support for Microchip 16 bits PICs</flag>
-		<flag name="r2k">Add support for Rabbit 2000</flag>
-		<flag name="r3ka">Add support for Rabbit 3000A</flag>
-		<flag name="s08">Add support for Freescale/Motorola S08</flag>
 		<flag name="sdbinutils">Enable SDCC library archive utilities sdar, sdranlib, sdnm</flag>
 		<flag name="sdcdb">Enable SDCC source level debugger</flag>
 		<flag name="sdcpp">Enable SDCC preprocessor based on GCC cpp</flag>
-		<flag name="stm8">Add support for STMicroelectronics STM8</flag>
-		<flag name="tlcs90">Add support for TLCS-90</flag>
 		<flag name="ucsim">Enable software simulator for microcontrollers</flag>
-		<flag name="z180">Add support for Zilog Z180</flag>
+
+		<!-- ports in order defined by configure.ac -->
+		<flag name="avr">Add support for AVR -- not supported upstream</flag>
+		<flag name="mcs51">Add support for Intel mcs51</flag>
 		<flag name="z80">Add support for Zilog Z80</flag>
+		<flag name="z180">Add support for Zilog Z180</flag>
+		<flag name="r2k">Add support for Rabbit 2000</flag>
+		<flag name="r3ka">Add support for Rabbit 3000A</flag>
+		<flag name="gbz80">Add support for Gameboy gbz80</flag>
+		<flag name="tlcs90">Add support for TLCS-90</flag>
+		<flag name="ez80-z80">Add support for EZ80-Z80</flag>
+		<flag name="ds390">Add support for Dallas DS390</flag>
+		<flag name="ds400">Add support for Dallas DS400</flag>
+		<flag name="pic14">Add support for Microchip 14 bits PICs</flag>
+		<flag name="pic16">Add support for Microchip 16 bits PICs</flag>
+		<flag name="hc08">Add support for Freescale/Motorola HC08 based</flag>
+		<flag name="s08">Add support for Freescale/Motorola S08</flag>
+		<flag name="stm8">Add support for STMicroelectronics STM8</flag>
+		<flag name="pdk13">Add support for PDK13</flag>
+		<flag name="pdk14">Add support for PDK14</flag>
+		<flag name="pdk15">Add support for PDK15</flag>
+		<flag name="pdk16">Add support for PDK16</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-embedded/sdcc/sdcc-4.0.0.ebuild b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
new file mode 100644
index 000000000000..010160b22da8
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
+	inherit subversion
+else
+	SRC_URI="
+		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Small device C compiler (for various microprocessors)"
+HOMEPAGE="http://sdcc.sourceforge.net/"
+
+LICENSE="
+	GPL-2 ZLIB
+	non-free? ( MicroChip-SDCC )
+	packihx? ( public-domain )
+"
+SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
+SDCC_PORTS="
+	avr
+	mcs51
+	z80 z180
+	r2k r3ka
+	gbz80
+	tlcs90
+	ez80-z80
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
+"
+IUSE="
+	${SDCC_PORTS}
+	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
+"
+
+for port in ${SDCC_PORTS}; do
+REQUIRED_USE="${REQUIRED_USE}
+	${port}? ( sdbinutils )
+"
+done
+REQUIRED_USE="${REQUIRED_USE}
+	|| ( ${SDCC_PORTS} )
+"
+
+RESTRICT="strip"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/ncurses:=
+	sys-libs/readline:0=
+	>=dev-embedded/gputils-0.13.7
+	boehm-gc? ( dev-libs/boehm-gc:= )
+	!dev-embedded/sdcc-svn
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
+)
+
+src_prepare() {
+	# Fix conflicting variable names between Gentoo and sdcc
+	find \
+		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
+		-exec sed -r -i \
+			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
+			{} + || die
+
+	# Make sure timestamps don't get messed up.
+	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
+
+	default
+	eautoreconf
+
+	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+	touch support/sdbinutils/bfd/doc/bfdver.texi || die
+	touch support/sdbinutils/bfd/doc/bfd.info || die
+}
+
+src_configure() {
+	# sdbinutils subdir doesn't pass down --docdir properly, so need to
+	# expand $(datarootdir) ourselves.
+	econf \
+		ac_cv_prog_AR="$(tc-getAR)" \
+		ac_cv_prog_AS="$(tc-getAS)" \
+		ac_cv_prog_STRIP=true \
+		$(use_enable boehm-gc libgc) \
+		$(use_enable device-lib) \
+		$(use_enable non-free) \
+		$(use_enable packihx) \
+		$(use_enable sdbinutils) \
+		$(use_enable sdcdb) \
+		$(use_enable sdcpp) \
+		$(use_enable ucsim) \
+		\
+		$(use_enable avr avr-port) \
+		$(use_enable mcs51 mcs51-port) \
+		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable pdk13 pdk13-port) \
+		$(use_enable pdk14 pdk14-port) \
+		$(use_enable pdk15 pdk15-port) \
+		$(use_enable pdk16 pdk16-port) \
+		\
+		--disable-doc \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-ccache
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt
+	find "${D}" -name .deps -exec rm -rf {} + || die
+
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -r *
+	fi
+
+	# a bunch of archives (*.a) are built & installed by gputils
+	# for PIC processors, but they do not work with standard `ar`
+	# & `scanelf` utils and they're not for the host.
+	dostrip /usr/bin
+}
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 73a2c6190d44..010160b22da8 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -24,9 +24,21 @@ LICENSE="
 	packihx? ( public-domain )
 "
 SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
 SDCC_PORTS="
-	avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
-	z80
+	avr
+	mcs51
+	z80 z180
+	r2k r3ka
+	gbz80
+	tlcs90
+	ez80-z80
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
 "
 IUSE="
 	${SDCC_PORTS}
@@ -87,29 +99,36 @@ src_configure() {
 		ac_cv_prog_AR="$(tc-getAR)" \
 		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_STRIP=true \
-		$(use_enable avr avr-port) \
 		$(use_enable boehm-gc libgc) \
 		$(use_enable device-lib) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable mcs51 mcs51-port) \
 		$(use_enable non-free) \
 		$(use_enable packihx) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable s08 s08-port) \
 		$(use_enable sdbinutils) \
 		$(use_enable sdcdb) \
 		$(use_enable sdcpp) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable tlcs90 tlcs90-port) \
 		$(use_enable ucsim) \
-		$(use_enable z180 z180-port) \
+		\
+		$(use_enable avr avr-port) \
+		$(use_enable mcs51 mcs51-port) \
 		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable pdk13 pdk13-port) \
+		$(use_enable pdk14 pdk14-port) \
+		$(use_enable pdk15 pdk15-port) \
+		$(use_enable pdk16 pdk16-port) \
+		\
 		--disable-doc \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index c54ffdbaa5a8..b2964ccfc6d4 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,10 +1,7 @@
 AUX u-boot-tools-2019.10-musl-ulong.patch 589 BLAKE2B 79874d6aafffd538ef740f1ac77058ae91315cbc74cf2016d9fe9f88d37c151b6b4a7328a2b7f8aaee5e818ab0f044e883afc8e6ad0424d2d3b93e4f0ab8b7b2 SHA512 45ded2bd0bdda44ab183947084c250f0874827ab15cc15c4f4e27928cc6161fd1819f00ef696962dd94ddd10dcde3183f392a9d5b8e06029ca2c3893c5423977
-DIST u-boot-2018.05.tar.bz2 12469276 BLAKE2B b09189d9bf8554c21630d42024d64894270c02e3efa8046bc2bef0efd68b9e0a02c3290228ffb71a4bab524d46111e32adb492c3ce9a3ef1be32287a3bbdb36a SHA512 218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2
-DIST u-boot-2018.11.tar.bz2 13045125 BLAKE2B d2522e1eb2fb899f1217261b6c311be35ae2fb01d187714311184e6f913d1d5b3ad953b5fa02c5c7b0e1e5981be101ce82ea4cf09a457d32d778ffa5cadc0786 SHA512 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff
-DIST u-boot-2019.01.tar.bz2 13366005 BLAKE2B 161d927d5f2cb38c6a930f0b5edfedeb3a93586ea98e03066a1fa9c516bfc1f6ab8d5ba60b36714d10c08232971e7a0987f4d0a05635fa14a6359bb120aa0ed2 SHA512 d9699cd22afe9bc747d64208068c2cf8a2c3143d161ede24536f6fd6adfd6b81e28920589722639e2e48fcf34e8dbde3ead7f691f14cbcc38cd75694d14d719b
+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
-EBUILD u-boot-tools-2018.05.ebuild 974 BLAKE2B ffd7532ae3a54be2ea17e0aaf14e75b0e04a689189836f0aa9ac2c29bbaa4e941754139d6a24df0357b0b7af86b25992b9ed8bfc9682f50e8943be6f83341c9b SHA512 5c0e013d89eb70a6d88caf827a3ca1976a308c2f7ad5ac79a9e6a449327a9ad2f971c253f7ed955a57f713166a4528e31bec318da7db6279f357c98529750ee0
-EBUILD u-boot-tools-2018.11.ebuild 974 BLAKE2B 6ba1448e0829b731c0ea94da9202d4469b4581baf4807b2290e0c170ce7a9f9d216d041dbb41da55596e16c547206b80e461e25b5871a352c5dcdec90f7b00c7 SHA512 14e67fb478af1fcdd40d5563242c737ac2b170444fe787ef6e98ba8e4027cdc6159eaeac7b86ccff5899744fc2a1beb2793da2e8f232d1312a7634b630952e5e
-EBUILD u-boot-tools-2019.01.ebuild 1202 BLAKE2B d502ddc627f422745835a9f0ce3ac44ab212f3ffc2c6adfa010874c00035b513a587f3849f898e76a86a48843988dd926507ff51cb79d746cb917411b0a0d5c5 SHA512 22cdb73d2a2d110927edb13f2eeb334b6cf30e944e1489798e2fbcef264a834d6ce8c1db39c1347691d41b888c5be0ededd5da2548f7cf483ae8b542fa5ca492
-EBUILD u-boot-tools-2019.10.ebuild 1223 BLAKE2B 97182c7ae5bc38ed1bb392df02cc0c12c8e7a43918a850bd9c10acc55c79da9bf6f5c55cb3af10b4c1ae5808d0b59785479b9c2ffa4b49a037e43360d9b2a49c SHA512 5acc73ab3ee11bb30487fabc41725d8ae2f492ea69f4d8b8550138cb9b4c6e51a50741e7921f734c4373836a1761e8e0e773fab57f0d9277a8addb01480b96d9
+DIST u-boot-2020.01.tar.bz2 14716125 BLAKE2B a2860f74cd3b147d39ed55ba4745e0400e19889a772f21d4bb18be9bdca9b43c6542b2b750207421f87b155529ddb38ea52b2820b46fdbd76232cdd6c13085cd SHA512 073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7
+EBUILD u-boot-tools-2019.10.ebuild 1222 BLAKE2B c17b706fffbefc963eaf5483def5aaabde40546687f401c4cab51d90bdd02f89b370ed38ae6da6ef989aa749a1ae0d9a5a94a9e19fc394e9e9ea6976bce6755b SHA512 36c8f97437c04b8dc56fd3072ac7d5fb2edebb55763e2a211492535ca3f14db5a828127f93df133a46f63d83d7a69a21f86a0b54de040f46cdb5511e07c7b53b
+EBUILD u-boot-tools-2020.01.ebuild 1224 BLAKE2B fb067f2dc615ffb5c880808a6b42b918e38774b8ea8f5e83d6a7ce9f8ffba4d8f7368dbcdf8307703719c81cb14ace49b2fe65d587eddacef792733b3b89460d SHA512 98112d8af5fdb4340f7816d9cfbc6c143c6488e163018347e80f6d7b2ab51177e98b6fdf39e424f9af74890756820d9913bec255f075f5d6b7e25dc439cecb66
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
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
new file mode 100644
index 000000000000..321559761517
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
@@ -0,0 +1,11 @@
+--- 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-2018.05.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild
deleted file mode 100644
index 76939bc8bba5..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="http://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 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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-2018.11.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2018.11.ebuild
deleted file mode 100644
index cce15c669b8d..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2018.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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-2019.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
index 5cd751c0b8a5..cacfea709295 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2019.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
index e0e563ba9537..798ff7a240bc 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2019.01.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 MY_P="u-boot-${PV/_/-}"
 DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+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"
@@ -20,6 +20,10 @@ DEPEND="
 	sys-devel/bison
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
@@ -50,7 +54,6 @@ src_test() { :; }
 src_install() {
 	cd tools || die
 	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
 	dobin env/fw_printenv
 	dosym fw_printenv /usr/bin/fw_setenv
 	insinto /etc