gentoo resync : 23.09.2020

42 files changed, 698 insertions, 521 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c823b9f4b68f..c04be86ef438 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avarice/Manifest b/dev-embedded/avarice/Manifest
index 0988cad57ae3..45a06c8bf339 100644
--- a/dev-embedded/avarice/Manifest
+++ b/dev-embedded/avarice/Manifest
@@ -1,3 +1,4 @@
-DIST avarice-2.13.tar.bz2 196063 BLAKE2B 4380478684d360708310b46cf46b3eca359dc4145a33f6330d5cb18e13c57c18229eeee6fe72b8740baf585d19c4efb21b685afb0317c830d89bb550d245192d SHA512 fa67e46061e32ec9db10bed961484ee050b219e92c2e9900ad35861b3c45161cc6ea6f2a9e63b0303242ef9992193cd963ac5871583db434409c10995b420b5f
-EBUILD avarice-2.13.ebuild 375 BLAKE2B 44b7fe42e0768212b43c2bbb59b95a1d64e39d0de061e319c6747149229f05be1b66aa5c72dded5ad7140d379a905bf92e821547c2c12207a2ed96be24c7f830 SHA512 1d34610b0a0c489b23e5e6d7cceffa00ddde86d923a9ec0260032e3e677c156c7027441aee920d987e8b2c62f5cb3ab4633cd75fddd3e1099997738377d67f3f
+AUX avarice-2.14-broken-__unused-macro.patch 962 BLAKE2B 46012b3d49df83fd83397d8c8a0fd225b571dd8d1f568c1c065a6a21afe63053d426c952647bbbee709a4baaa5cc3b983390277c444ab818f506f402097254ea SHA512 5908a26c9cdc4175f14a7b46c413420517b93ebbf0474031bda9d6e07fd799c2e1effb1006de3831b0e5f3bf5aed7d48abd8201b68e0c6c00cf1c8180e1e4b6f
+DIST avarice-2.14.tar.bz2 253668 BLAKE2B 673c95d8f7f296ffdd5c225e82bd8ef348f0c222201acb826798451fa195ec9c2fd8e8d1ecd3f847f9e0ac069ee2f6a4358f660ff45343817b14d804e79a8c90 SHA512 e0b23bd02bfa7d4dc05027f0f59ec7da868d8d0c0cd4f66595f6aaa5c335fa4eb64fc47399e51c0ed5112803ee99a3f041812bf4072dc096cc933cd17f9348a0
+EBUILD avarice-2.14.ebuild 433 BLAKE2B 202e366fdcb608012b9d40f1fadcb8c6f771c684502dbf69e1a27dfa4e301cc9647154d334eb6a38bcb0b86d4849476be65aeb9a6d1e0dc4d257bd6bd05481e5 SHA512 65dea038232a578d681a6f39ea7dc5b6a4bedfd1dc7812b12ebb5e79bdfcf9a270597f45f62384013154690cc2842c8850cfb5ef0639f9870ebda8c2874bcb92
 MISC metadata.xml 328 BLAKE2B 62af0d18423f51f57fa27f945bb08d9db6d230fcb0f07210f3ee1fdc5bc0e21c4c59e152643f106db54e94087bba1b647e49e58abafef02e41963d8083da868b SHA512 1ee78acf39c10cd871e5ce41abd17adc3e3d5f8ee2443ad5f6798079ea7233010d65be08ed9e80df13b4d0326828702989a5b983ada32bf8029052bd996e2616
diff --git a/dev-embedded/avarice/avarice-2.13.ebuild b/dev-embedded/avarice/avarice-2.14.ebuild
index 84ac54bd2051..99ecdf5b2e24 100644
--- a/dev-embedded/avarice/avarice-2.13.ebuild
+++ b/dev-embedded/avarice/avarice-2.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator"
 HOMEPAGE="http://avarice.sourceforge.net/"
@@ -10,6 +10,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DOCS="AUTHORS ChangeLog doc/*.txt"
+PATCHES=( "${FILESDIR}"/${P}-broken-__unused-macro.patch )
+
+src_install() {
+	default
+	dodoc doc/*.txt
+}
diff --git a/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch b/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch
new file mode 100644
index 000000000000..9c3ba3da2f4b
--- /dev/null
+++ b/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch
@@ -0,0 +1,39 @@
+--- a/src/jtag2usb.cc
++++ b/src/jtag2usb.cc
+@@ -739,7 +739,7 @@
+ 
+ #ifdef HAVE_LIBUSB_2_0
+ /* USB thread */
+-static void *usb_thread(void * data __unused)
++static void *usb_thread(void * data)
+ {
+   struct pollfd fds[2];
+ 
+--- a/src/jtag3io.cc
++++ b/src/jtag3io.cc
+@@ -350,12 +350,12 @@
+     throw jtag_exception("doSimpleJtagCommand(): too many failures");
+ }
+ 
+-void jtag3::changeBitRate(int newBitRate __unused)
++void jtag3::changeBitRate(int newBitRate)
+ {
+   throw;
+ }
+ 
+-bool jtag3::synchroniseAt(int bitrate __unused)
++bool jtag3::synchroniseAt(int bitrate)
+ {
+   throw;
+ }
+--- a/src/jtag3prog.cc
++++ b/src/jtag3prog.cc
+@@ -106,7 +106,7 @@
+ }
+ 
+ 
+-void jtag3::downloadToTarget(const char* filename __unused, bool program __unused, bool verify __unused)
++void jtag3::downloadToTarget(const char* filename, bool program, bool verify)
+ {
+     statusOut("\nDownload not done.\n");
+     throw jtag_exception("Target programming not implemented for JTAGICE3");
diff --git a/dev-embedded/dc-tool-ip/Manifest b/dev-embedded/dc-tool-ip/Manifest
index 3111557b5072..141c63bb3889 100644
--- a/dev-embedded/dc-tool-ip/Manifest
+++ b/dev-embedded/dc-tool-ip/Manifest
@@ -1,5 +1,6 @@
-AUX 1.0.4-bfd-update.patch 909 BLAKE2B 02a5b3be9db1c98e01cbda6e75de14bcefa4c8abb4400855be4effa046adfd6382612a1c4c33d2999b8eca45aec40256dcf3c7d864947c3174fe6688a7a092d7 SHA512 a1a24436104012ec5c56028dd4f7b16d9bcf23923d64d3ba14fd9a6b413770d1ccaaa91d56f62e49afbe77bfb0fdc3bb4eeba12d24b547f0f8598a4f3f6ceb8c
+AUX dc-tool-ip-1.0.4-bfd-update.patch 836 BLAKE2B 3922fa68372b32793007615cdd4a87c7ae09692940781933c8246843795c8a6b7d6b1de1dd60c7130274c7ac9e097f18fab98a256965f9a765a335cc7e1a75ff SHA512 6e63013efc503e68a80d5e0911d74813b8ea18607f4740111e3da1b535b464437085a0f358ded4b640c8d9e5e81ebe7cf8a0fd50dc211d8739fca95f3c668d7d
 AUX dc-tool-ip-1.0.4-headers.patch 487 BLAKE2B bfe1eee99d73a0a37428fa8015f3b073762b3f295f83066de09e3cf7efd00aa904d16c9f1cd111be7c8eaa41c755a93024fa8e0210f87d7f4be09c0181a1eb31 SHA512 a83b3d0f214de12fc25ef250f106e325d39e78afacb56db31a7f4c6033e8c848b934260c589967cb6fe1751ca401584b1b66f3593b4cbc2d7c2bcc108d8ab4c2
+AUX dc-tool-ip-1.0.4-makefile.patch 1125 BLAKE2B 5a60e4257d1fe420855b33dbd66db0a9ed389b85563ff6d3c9cd0e11735e30842cd1ff24ab0dd7186f782a54065a4d74c238241c17b7359b86bcc61ef9429fd1 SHA512 7007f4f7e5f0e2eb02b7188e5cbfe2f92b3ab0ffb48883570cc80de21423bf7a50d7e14967d97b217fa0d04152e3b9b81f4f508cdbc94975573c2e2357e16b5d
 DIST dcload-ip-1.0.4-src.tar.gz 104758 BLAKE2B 4c8c52077b047da81341a133272a5569de9e6b304942c181da01a617a00243ace2847bbd380ac723710d91dc43d6de134d3a34e083ef9fa61471ba49ce5021f3 SHA512 c58f574bf13dd44a00395060af4c718593471242366d09dddb234490d20a6e0322a2c3853613aa1c8a5269802cf6434407d3f6c62c934e8b66f8fc1e86a12536
-EBUILD dc-tool-ip-1.0.4.ebuild 970 BLAKE2B 58708d998ae1c0eb9cdb8d839d457dba421d6df4f43d5c01e4e2bf14910445db7530db58afff29bb5bda61491657646e7fd6d7c2fa849c755d86960a9d993539 SHA512 3d1960b451f08bb823f5755c2c1d3298579bb1edcc0d9a3f3e2f7df7264fa02b3fbce3a4265d33f2e8ed27a1760086ca6247f1b2ab0bd77bddc1d49d9480bd53
+EBUILD dc-tool-ip-1.0.4.ebuild 840 BLAKE2B 75623e288bfc987893e1e4717e8332edaea1e2ccc6f23afd0322389ceb8ea0208bb446f36a6b117ca3ebb192e657ce55060397f80801ce85b3ea34c1bcfa39bb SHA512 57bd72222ab622f0f90d4bbf62cc3c2581a80f920857cd14f15d25db927681dd38e24c4ccbf1fc593adb23e8c9fc8f5fac0dcec6705af395fbb4f608f4f1b12e
 MISC metadata.xml 328 BLAKE2B 9964bd2ac60606daf86e3106759f41dcc9475b4f4b5f4c8d3cd4b673c9565bac27b364fafeb5d54053dc548afa784f166a846ef6f7f517d8460a41d3c699b4ab SHA512 fb2b6c7f3cd9c73e6ddbeb92effeeb1d6a2a58884eae0ea33913227403f1fbeda9b9691ec09f0f1f89e092e4f669b43a2e056008ecc397eaec0c9534e6fa49a3
diff --git a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
index fc9a8492d5ea..ff03cd024553 100644
--- a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
+++ b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="ethernet program loader for the Dreamcast"
+DESCRIPTION="Ethernet program loader for the Dreamcast"
 HOMEPAGE="http://cadcdev.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cadcdev/dcload-ip-${PV}-src.tar.gz"
 
@@ -14,18 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-S=${WORKDIR}/dcload-ip-${PV}
+RDEPEND="sys-libs/binutils-libs"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-bfd-update.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
+S="${WORKDIR}/dcload-ip-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bfd-update.patch
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_configure() {
+	tc-export CC
 	append-cppflags -DPACKAGE -DPACKAGE_VERSION #465952
-	sed -i \
-		-e "/^HOSTCC/s:gcc:$(tc-getCC):" \
-		-e "/^HOSTCFLAGS/s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e 's:-L/usr/local/dcdev/lib:$(LDFLAGS):' \
-		-e 's:/usr/local/dcdev/include:.:' \
-		Makefile.cfg || die "sed"
 }
 
 src_compile() {
@@ -34,9 +36,8 @@ src_compile() {
 
 src_install() {
 	dobin host-src/tool/dc-tool
+
 	dodoc README NETWORK CHANGES
 	dodoc -r make-cd
-	if use doc ; then
-		dodoc -r example-src
-	fi
+	use doc && dodoc -r example-src
 }
diff --git a/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-bfd-update.patch
index 62da02f12e98..2b3b32d7e3f4 100644
--- a/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch
+++ b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-bfd-update.patch
@@ -1,5 +1,5 @@
---- host-src/tool/dc-tool.c.orig	2004-11-13 19:38:50.007151024 -0500
-+++ host-src/tool/dc-tool.c	2004-11-13 19:38:58.320887144 -0500
+--- a/host-src/tool/dc-tool.c
++++ b/host-src/tool/dc-tool.c
 @@ -431,13 +431,13 @@
  		if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_LOAD)) {
  		    printf("Section %s, ",section->name);
diff --git a/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-makefile.patch b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-makefile.patch
new file mode 100644
index 000000000000..ae902dcc2a6b
--- /dev/null
+++ b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-makefile.patch
@@ -0,0 +1,45 @@
+--- a/host-src/tool/Makefile
++++ b/host-src/tool/Makefile
+@@ -1,18 +1,13 @@
+ include ../../Makefile.cfg
+ 
+-CC	= $(HOSTCC)
+-CFLAGS	= $(HOSTCFLAGS) -DDREAMCAST_IP=\"$(DREAMCAST_IP)\" -DHAVE_GETOPT
+-INCLUDE	= -I$(BFDINCLUDE)
++CPPFLAGS += -DDREAMCAST_IP=\"$(DREAMCAST_IP)\" -DHAVE_GETOPT
+ 
+ OBJECTS	= dc-tool.o syscalls.o
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) $(INCLUDE) -o $@ -c $< 
+-
+ all: dc-tool
+ 
+ dc-tool: $(OBJECTS)
+-	$(CC) -o $@ $(OBJECTS) $(BFDLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(BFDLIB)
+ 
+ .PHONY : install
+ install: dc-tool
+--- a/Makefile.cfg
++++ b/Makefile.cfg
+@@ -8,8 +8,8 @@
+ # the ones in your system
+ 
+ # these must point to your sh-elf bfd, not the system one
+-BFDLIB		= -L/usr/local/dcdev/lib -lbfd -liberty
+-BFDINCLUDE	= /usr/local/dcdev/include
++BFDLIB		= -lbfd -liberty
++BFDINCLUDE	= 
+ 
+ # cygwin
+ # these must point to your sh-elf bfd, not the system one
+@@ -24,7 +24,7 @@
+ 
+ # you generally shouldn't change this unless you are making forked
+ # versions (or test versions)
+-VERFLAGS	= -DDCLOAD_VERSION=\"1.0.4\"
++CPPFLAGS += -DDCLOAD_VERSION=\"1.0.4\"
+ TARGETCFLAGS	+= $(VERFLAGS)
+ HOSTCFLAGS	+= $(VERFLAGS)
+ 
diff --git a/dev-embedded/gnusim8085/Manifest b/dev-embedded/gnusim8085/Manifest
index 4c4ba87b4b35..61851761ba4f 100644
--- a/dev-embedded/gnusim8085/Manifest
+++ b/dev-embedded/gnusim8085/Manifest
@@ -1,5 +1,5 @@
 AUX gnusim8085-1.3.7-cflags.patch 226 BLAKE2B 035291e340d2381fb3076972c5acc55d8ac8b897666f8598bad669c062af30de8a6ac9a59b194112722ced9f2f42f903fcdd701829598f4242cc5ad4b085b6d4 SHA512 62f5ee1e7adcbe9abe20f9e8c8e07f74f7563b8afe666975e579a2f20fb404cbdd314c0ba7dc01a56d818292d264f03ef07ee7fb37b4ace53ee5e934079b7310
 AUX gnusim8085-1.3.7-docs.patch 502 BLAKE2B 7cf60bba055d6e291ae624b502bef2602b21e81db7eda61ca47af773147164ce14fc66dc761b6b61f00b5405b88a8f9fb8b9c2fa57258cf8122ef590d1a62fb7 SHA512 c7051c237e05723571262d3b0ee5b207848c03972ce80c9620fcdb81809a492e59d0d54f0ace2305fd58a5ebbf3c035f150d1dbbed187703a2c71930488b96df
 DIST gnusim8085-1.3.7.tar.gz 365127 BLAKE2B 55637e4ade4be6145f3fbe95a29d01565caafd54a45c90d693a940e645153da3eac52e685d648b3be18cc05ba080133a26978a99a841f37f09eebfeaf5de89b8 SHA512 b1b701ef3292c2b3ea7a599f450ee495fdec730fa53e2ad9ea27c716a7de61d503f32345ed3cf6eeef3ef698ed4f0b957cb7ae207df0bee46363e76b5176b822
-EBUILD gnusim8085-1.3.7.ebuild 903 BLAKE2B 6a5be123689b639a10d6f7c77c83b1ec0ed2936e6112be91a4a471815418b18c8f804ae2b1ba1c1f6c2bcc470805737f2fed0eff2c3b54b7b8f352c0a6d50f55 SHA512 456a439e4822f7ff5fcfb29a5c426386157cf0a467dc1f9196fc71e9180d81c7b915cd0e4396415b73088adf907edf98b6894943ab543a85461e141e5098463b
+EBUILD gnusim8085-1.3.7.ebuild 887 BLAKE2B 645831e5053aa687ca07f90849e6da971af4f43328ff441aee4fa381f6ca3512e57b560ab054c404941ace1ac6e969c304a7b74eb100ee2989674caab2168831 SHA512 fb2fc880f5b761dfc3121ddcb3ffcca4a20d236447df99173c60410c45f03ce93dfaa64f8c6e62819f1b6235ba8a1c701e3d96a18cd99d06982d916043f59392
 MISC metadata.xml 329 BLAKE2B cd8484c759dd16c6d4222f47a75d3483cfc6095112fa0a6c38fa3bbb35a47c3c4033d94fb2bde3627e5a957419c3aae75cb049e9ef67034ae9e3a6272d8e9fbd SHA512 7959e94cb6da565f3a4ebe9a4e9cc5ec6d484b2b3a43df144afd37d0b4dcdbebc875a76e355d2d1061f92a2bed29192d27b240db4704d6f95e87612d572fa882
diff --git a/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild b/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
index ba7da67ac506..ebad63d49c2b 100644
--- a/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
+++ b/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools
+inherit autotools xdg
 
 DESCRIPTION="A GTK2 8085 Simulator"
 HOMEPAGE="http://gnusim8085.org"
@@ -12,20 +12,27 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="nls examples"
+IUSE="nls"
 
-RDEPEND=">=x11-libs/gtk+-2.12:2
+RDEPEND="
+	>=x11-libs/gtk+-2.12:2
 	x11-libs/gdk-pixbuf:2
 	dev-libs/glib:2
 	x11-libs/gtksourceview:2.0
 	x11-libs/pango"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -35,11 +42,10 @@ src_configure() {
 
 src_install() {
 	default
+
 	doman doc/gnusim8085.1
 
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.asm doc/asm-guide.txt
-	fi
+	docinto examples
+	dodoc doc/examples/*.asm doc/asm-guide.txt
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/dev-embedded/icdprog/Manifest b/dev-embedded/icdprog/Manifest
index 397e610004af..a2bf4bac4d91 100644
--- a/dev-embedded/icdprog/Manifest
+++ b/dev-embedded/icdprog/Manifest
@@ -1,3 +1,3 @@
 DIST icdprog-0.5.tar.gz 47195 BLAKE2B 66ba011f1809bce21db64074da1fb52c1373caa20d6843abbad023da466f32888b8b4e906512975d29bc9bfb73bb9726b49040e52a70f187f1fea5eab3122b91 SHA512 3e238cbbbcfc034a5100c78c1e8ffea669deeec26cdf2a2ad1d27577acff1a114badfb67453d4241b9a239326d0d624616fc8383affc3d34380edfdc0fcf7989
-EBUILD icdprog-0.5.ebuild 657 BLAKE2B bd766e0e9c490618254d69094b87ec7fb4f008451c74e9ad51f859cf11b427fde441b0727ebaeee0d85b5d6733972dad564a2ece840276a5fee6959c92bb0f28 SHA512 1786d708deb8c35ed2cbeefebafe0e326b29f98668ae2b6efd1f4e672788a524e5951c06702091041b954dd527d320881652abea94021e2c8bfdb5074bb7845a
+EBUILD icdprog-0.5.ebuild 675 BLAKE2B dd1960f98e339f82582e0a6b7e19aeb6eb74d7373dfa6eccfc42dbdd721f194382b9f6b2d06c181aa45dc49d726bf05405f8fe7e81dda50c0dcf1815631a409c SHA512 8d94d689c4faf1388ea5e609669fa9ac2aab2f806dcdb7cf1c7fd5cb4d17e53f1dbc507bebd46cf0dcefdb3db0b8129f82e21092f8baaeb87a79bd9fddab171d
 MISC metadata.xml 504 BLAKE2B 33d002d44acc57a9d550653fc4fe0946ae480bbb921f4ce6b67fbec840d19db7311b605875f5967ce5ef00e7c8b81274a6ef947f0b03c7ce672bd9c3b4c8b148 SHA512 6fd63603b4dfd1bcc7cbd6e9706f23e60d80392d5608b6b5bf86a2f0cbcd4ec0282017763f205944f1ad5392abcd65b5d5e5af9de7507c753c4e17af7bdad291
diff --git a/dev-embedded/icdprog/icdprog-0.5.ebuild b/dev-embedded/icdprog/icdprog-0.5.ebuild
index 5b1a9e09b0d9..41a887a64a6d 100644
--- a/dev-embedded/icdprog/icdprog-0.5.ebuild
+++ b/dev-embedded/icdprog/icdprog-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,22 +12,23 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
-src_compile() {
+src_configure() {
 	tc-export CC
+}
 
-	cd "${S}"/src
-	emake CFLAGS="${CFLAGS}"
-	cd "${S}"/src/icddump
-	emake CFLAGS="${CFLAGS}"
+src_compile() {
+	emake CFLAGS="${CFLAGS}" -C src
+	emake CFLAGS="${CFLAGS}" -C src/icddump
 }
 
 src_install() {
 	dobin src/icdprog
 	dobin src/icddump/icddump
-	dohtml readme.html
-	dodoc src/README.coders
+
+	DOCS=( src/README.coders )
+	HTML_DOCS=( readme.html )
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/dev-embedded/include/Manifest b/dev-embedded/include/Manifest
index 636485cac546..fc33245ef099 100644
--- a/dev-embedded/include/Manifest
+++ b/dev-embedded/include/Manifest
@@ -1,3 +1,3 @@
 DIST include-0.4.2.tar.bz2 110312 BLAKE2B d6104fce3dd95d003b5704449300e1d70bfc225b25e24ab717e0249197eebeb0063c9c5d73e5f65050f11e0920950959ce3a525801e436bef8cdcffa4e8052c0 SHA512 5c8f6eab27bfbc7628107162cae71d2e88ce6d96b655427468b81de052abf02ef48b7fe05435fc1468855e21665e4e973ef63d94265351f09e078119180dc07b
-EBUILD include-0.4.2.ebuild 379 BLAKE2B 354fab4154fff0e2cf2a2eff9d17fb625b13f2992449c94fd17412a926b23684b30402d8ad9a20fcdbf361c714f5e051b421b5d287c4acf76f5b7cfd94b6a8e0 SHA512 8c1a9593298eef88f9ef3d9479978fd3351efcca347f6c0bf21f6ba60067ef45161007aab70fc66bda4cb469faf91e2d7b8941e98f469ac386cb250e5a9efa7a
+EBUILD include-0.4.2.ebuild 366 BLAKE2B deba9f1bfbdcfe79c4ffc15ca3de44f429e8fa57f648b4986f77f1792869ab0b2923c8ec3c24fd6be5f7c1edbe4eab93ea222e590bdb1b5f0085666fb08431f3 SHA512 9088c096f5de653ee64a70f879d03758bd0b25095ce50dfa7f483c7e912934cea058e15e8147f940b5332ecdb62eeaf53bbdc7dd007a1c6086387880aeb3fd75
 MISC metadata.xml 330 BLAKE2B ebbc7d714b79e3ac894b34044d3ddaa7e224963547a76443734cf63dbc479c82c261c6bcafcd81a55a464cfb4362186de6b368d75006181b60af97745fed4dcd SHA512 778e63c367986779da9a1fce3c07983721e8c3cc961ef6bbfdd717b61487ab8d7e4e135a8b58103c1b5f5b3b10f9b506bf8b45e0b9504da29714fe6601f7a65b
diff --git a/dev-embedded/include/include-0.4.2.ebuild b/dev-embedded/include/include-0.4.2.ebuild
index 98e9687d0b98..dfa827f0951c 100644
--- a/dev-embedded/include/include-0.4.2.ebuild
+++ b/dev-embedded/include/include-0.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="A collection of useful, independent include files for C/Assembler developers"
 HOMEPAGE="http://openwince.sourceforge.net/include/"
@@ -10,4 +10,3 @@ SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/dev-embedded/jal/Manifest b/dev-embedded/jal/Manifest
index dfb21ce07276..1b994e014b6f 100644
--- a/dev-embedded/jal/Manifest
+++ b/dev-embedded/jal/Manifest
@@ -1,3 +1,3 @@
 DIST jal-0.4.62.tar.gz 429020 BLAKE2B 65e04feb0379050b535c0dcb513e0955a6f20bd0f8cd8a50179bbf20ee6d114cf301a85dfa9553533db81c9db819a014409aa44e54287ff69a663df8bae2e0a3 SHA512 2354359507c2d33d8eeb7a5b9d40471a2d8cff245eb59d64484a89e4aff14d7d3c6021f0b26f1e48adb986fc221e4dade1037cef50167cbe249da445c77dbcb1
-EBUILD jal-0.4.62.ebuild 386 BLAKE2B 93e5e8632c4f7b60f97532b72ce4503b784b9d6cb17b1a733f786e66084651a48cb2c3b123c0d28cf3c27d4a2e7e97dab1764412a4644d03bf21680cc7825e05 SHA512 cfb3fe280b959bc2af28469f6ff6df3816a784d4b6562b3f201b6c5fcf51fa1baffbef1a8c4b64da34e1937642f92cb6715ec8b1cc74b08f6a6e89be107284f5
+EBUILD jal-0.4.62.ebuild 355 BLAKE2B 2a03637a2971ce67934862e1ea50d15581052a2c8c46e0173f7ccb3aad9b5e58bcf366d12c9ae582a628347c4ad617939ab66204925e2d18798ba70fc8216bb2 SHA512 9dd0cceed42446db089007c17353ec7d002c26deb699a26970cfe9a99b5fc0f9a031983b16805dcc2807ef74d65ff58954476087bbf95c1cf0754a83c1e262d2
 MISC metadata.xml 530 BLAKE2B 25ff84b957537922bda377fc7c700ef86aae5a2bfd7fa0546986631348b2601bdb15199071ff68def9389518eef0858e287d4ac63e12a6dc05793e6e1b355afc SHA512 fa41a9576afb80be565ef5d2d34d4786b93f954b6865b167eaa5eafd257b438fb86f1be42261dae3f6b3a1cc94970119baf12d028e4b1a4a9287a301f69a19da
diff --git a/dev-embedded/jal/jal-0.4.62.ebuild b/dev-embedded/jal/jal-0.4.62.ebuild
index e13541879b99..bd489fc91e3e 100644
--- a/dev-embedded/jal/jal-0.4.62.ebuild
+++ b/dev-embedded/jal/jal-0.4.62.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="A high-level language for Microchip PIC and Ubicom SX microcontrollers"
 HOMEPAGE="http://jal.sourceforge.net/"
@@ -10,9 +10,5 @@ SRC_URI="mirror://sourceforge/jal/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
diff --git a/dev-embedded/kobs-ng/Manifest b/dev-embedded/kobs-ng/Manifest
index c3e24a8b0538..71e82de5c6fe 100644
--- a/dev-embedded/kobs-ng/Manifest
+++ b/dev-embedded/kobs-ng/Manifest
@@ -1,6 +1,7 @@
 AUX kobs-ng-fix-array-violation.patch 338 BLAKE2B f8eeb81566e16d67b9d8d2df4c40a950cfbd0c8d29dd754f5ebffc68889366a142c84078428172693e096904fb913305dc6dbdb020ed22028e57ff5bc8f64e35 SHA512 311fac99b85264a25dc3984096e7467894a286be2ff6ee1fb8a11681ba5833e61b5938ef01312a35bb3a4e7cf90c0fbec163a54e9cc6c844e49da3bb856d2937
 AUX kobs-ng-fix-mtd-defines.patch 2170 BLAKE2B 97a067399e534d7c1d468aa1657e3a6212f37f99a470a9f789752388b7d1fb428c3704dc045e2f41fca4b489ba2db0f46768e0befb2bed150162af67105d58d8 SHA512 5d192d1b6f36ccd1500f33c8a89bbd8bdd7b8f489fe04be56142101b93dd1f7c5b00ca5dffb681aeec15ed58927530dcd487e80b9a02e4af1c3ff46b732d6697
 AUX kobs-ng-fix-open-without-mode.patch 390 BLAKE2B bacf3a3a0c40ff0663f398eeb75648db3ed6cdda8b18accfbd7fa9192446bc2f66c6c81f0e46fda205312e5fde7eb393de13a53e4841e5a618997a652fa3f0c4 SHA512 6574ab1e96833a8fa90fcaa81d71258b28069177fd66d69d0b5b4f7c4988faceac86c6655dfccea192c930bc0c08adb01ff33c68e48447f53bb482ea40dd708b
+AUX kobs-ng-fix-stdint.patch 1947 BLAKE2B 8e82138a29c1a73e2520defed1d49452549cef7f162fbfe7af69ede03b502d64426dc4ccec4ecde47a31ed60173887a87dc4509fd23e3c45deb838f770d3190d SHA512 1efe648deea0c8972bba03a01944288c3b6db504d8005bde9e0f62c5828ae41768b74a0d4891876f7de7ddeddbc4c390fd65a38419ba7dbd62c3e2d9e9fc9303
 DIST kobs-ng-3.0.35-4.1.0.tar.gz 145817 BLAKE2B eed8a20be261c5ee03f0cff0d0381079353a7f0887202201eabe1377bc14387b7e5b2240bdf4e5d908aaa38dd58ec3299e8a1ea264122970a872cc29aadaf23b SHA512 b2bb27202ecbf31bebec8eadcf04362178ec74337400416259237880b94ac2e5fcffae59b48857e9fcfa1b1aae584b181901d4dafea63eb1e0972ed3bc3b9e6e
-EBUILD kobs-ng-3.0.35.4.1.0.ebuild 763 BLAKE2B 5eb5e2d5f24191157c89fc5d06751b6e3d15740de24e6c42d485a608010005092536328a69e3afec3088f411fd832941991ec9da2be13fb0d4001cb0482ceb63 SHA512 16ccc0739c6145526374e0adc2121c57a2968b9b8bf9c2c0c846ba5b44587d0fc3f764903a99d5e5da1c8097950f40521c4eafb741a89c9dee46190ee5bc4437
+EBUILD kobs-ng-3.0.35.4.1.0.ebuild 687 BLAKE2B b89342e123bc816562178616a61a9479ecf5bbd1dbb658a775cc91df73de185e396b1f3fae1aa5825a1d44b9a4f8692dc8333ffda668c284d16d4532399422f3 SHA512 03eb55026cf257559f81820bc33256e37052a9568b0ff7e01445b90e115e1aaf015a08ae4f80b33e002388c23a0461ec2b9e5dec08d6bb760b44ca868cf9a032
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch
new file mode 100644
index 000000000000..d323da1d09ec
--- /dev/null
+++ b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch
@@ -0,0 +1,93 @@
+--- a/src/BootControlBlocks.h
++++ b/src/BootControlBlocks.h
+@@ -20,6 +20,8 @@
+ #ifndef BOOTCONTROLBLOCKS_H_
+ #define BOOTCONTROLBLOCKS_H_
+ 
++#include <stdint.h>
++
+ #define NCB_FINGERPRINT1	0x504d5453	//!< 'STMP'
+ #define NCB_FINGERPRINT2	0x2042434e	//!< 'NCB<space>' - NAND Control Block
+ #define NCB_FINGERPRINT3	0x4e494252	//!< 'RBIN' - ROM Boot Image Block - N
+--- a/src/bootstream.c
++++ b/src/bootstream.c
+@@ -30,6 +30,7 @@
+ #include <time.h>
+ #include <alloca.h>
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ #include "config.h"
+ #include "mtd.h"
+--- a/src/dcp_bootstream_ioctl.h
++++ b/src/dcp_bootstream_ioctl.h
+@@ -20,6 +20,8 @@
+ #ifndef DCP_BOOTSTREAM_IOCTL_H
+ #define DCP_BOOTSTREAM_IOCTL_H
+ 
++#include <stdint.h>
++
+ /* remember to have included the proper _IO definition
+  * file before hand.
+  * For user space it's <sys/ioctl.h>
+--- a/src/mtd.c
++++ b/src/mtd.c
+@@ -24,6 +24,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <stdio.h>
++#include <stdint.h>
+ #include <malloc.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+--- a/src/mtd.h
++++ b/src/mtd.h
+@@ -25,6 +25,8 @@
+ #ifndef MTD_H
+ #define MTD_H
+ 
++#include <stdint.h>
++
+ #include <mtd/mtd-user.h>
+ #include <endian.h>
+ 
+--- a/src/ncb.c
++++ b/src/ncb.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <stdint.h>
+ 
+ #include "mtd.h"
+ #include "config.h"
+--- a/src/plat_boot_config.h
++++ b/src/plat_boot_config.h
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ 
+ #include "mtd.h"
+ 
+--- a/src/rom_nand_hamming_code_ecc.c
++++ b/src/rom_nand_hamming_code_ecc.c
+@@ -32,6 +32,7 @@
+ //   Includes and external references
+ ////////////////////////////////////////////////////////////////////////////////
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include "rom_nand_hamming_code_ecc.h"
+--- a/src/sha1.c
++++ b/src/sha1.c
+@@ -23,6 +23,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include "sha.h"
diff --git a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
index fa662e6a10ef..0b1be3432977 100644
--- a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
+++ b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4-)"
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4-)"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="utility to write u-boot images to NAND on Freescale iMX devices"
+DESCRIPTION="Utility to write u-boot images to NAND on Freescale iMX devices"
 HOMEPAGE="http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX6_SW"
 SRC_URI="http://storage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/kobs-ng-fix-mtd-defines.patch
-	epatch "${FILESDIR}"/kobs-ng-fix-open-without-mode.patch
-	epatch "${FILESDIR}"/kobs-ng-fix-array-violation.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-mtd-defines.patch
+	"${FILESDIR}"/${PN}-fix-open-without-mode.patch
+	"${FILESDIR}"/${PN}-fix-array-violation.patch
+	"${FILESDIR}"/${PN}-fix-stdint.patch
+)
diff --git a/dev-embedded/libdisasm/Manifest b/dev-embedded/libdisasm/Manifest
index 6b1ed633c1c7..8573ef448dda 100644
--- a/dev-embedded/libdisasm/Manifest
+++ b/dev-embedded/libdisasm/Manifest
@@ -1,3 +1,4 @@
+AUX libdisasm-0.23-user-AS-OBJDUMP.patch 460 BLAKE2B e498ece9c38f8f2e7575787c5fdbc7095f4a06079c7f66e1656e26855f5d9746d174c99e0b513d91a4bb8074edc9fc2bdd8b765c8cad15191547302ee1282bf6 SHA512 588d0a4ef6cd56a3ba1f1d5025659f7c2523f79dd01e32911ba98ca1be4e12b18eebb884fcb852cbf0f4ea0e476de4fb122dcd3594614b74680eebd58fc543ef
 DIST libdisasm-0.23.tar.gz 454721 BLAKE2B d695b9e102e361c0f005fa8f04163d54fbdcc5254f6e203eee967c58733a2bfdb4ffd9ebfedac3d6e2f06364df03a5c961514f3db6897707402e342c4777e806 SHA512 29eecfbfd8168188242278a1a38f0c90770d0581a52d4600ae6343829dd0d6607b98329f12a3d7409d43dd56dca6a7d1eb25d58a001c2bfd3eb8474c0e7879e7
-EBUILD libdisasm-0.23.ebuild 405 BLAKE2B b2182f5f014f02db429154ba20f8bab43aa262bbb31ed69ad15cee0b1c3c19f20f39987293d9b50db15a4760e21dce4102c2e469c0230a16694d4e27e59c1091 SHA512 7c0283fce40e2aa3e6dd3196481485910f043dc472af3da8ba39168105c64b79550d3f079cb799c1e4d13d846549556179ef20749c9a92addb953fd03e891834
+EBUILD libdisasm-0.23.ebuild 648 BLAKE2B c59ff4607c86be7d2833cd33d1cb903d678b32f8e38048a5685e5ee4afd20da0c811f039747b80c34ad4cf0b5665c7cc287059685c9f1cb2a74b61bb20cd69fe SHA512 8f288179a3c70cf57d560d1d9adc874f912109fa1c3f64a7a5a359ee198b6719dc2be4f05309978cfe5985488a3abf0eda8b5d9c1c49db55e8d65a9f90d7260e
 MISC metadata.xml 328 BLAKE2B 7aaab0ac2233431c5ea2685525e85cc80c59cfa349213cefa40c4b876de7a657b58758d8cda8778585e95eed0d3972b3b4a63b04819baea32b52a87b4fc5d35e SHA512 5de816ee833c35c55ae77c2b3413e439a649ee819b850122bd28eafb1ccd1027f1f5fd911ce99419d57af4758251f7196d629d28a4f724a975f4b38213b3737c
diff --git a/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch b/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch
new file mode 100644
index 000000000000..93e1131b0c81
--- /dev/null
+++ b/dev-embedded/libdisasm/files/libdisasm-0.23-user-AS-OBJDUMP.patch
@@ -0,0 +1,15 @@
+--- a/test/asmdisasm.pl
++++ b/test/asmdisasm.pl
+@@ -22,10 +22,10 @@
+ # uninitialized stuff
+ my ($line, $output);
+ 
+-system "as --32 -o $obj_file $asm_file";
++system "$ENV{AS} --32 -o $obj_file $asm_file";
+ exit(1) if ($? != 0);
+ 
+-$output = (grep(/\.text/,`objdump -h $obj_file`))[0];
++$output = (grep(/\.text/,`$ENV{OBJDUMP} -h $obj_file`))[0];
+ $output =~ s/^\s+//g;
+ my ($idx,$name,$size,$vma,$lma,$offset,$align)=split(/\s+/,$output);
+ $size = hex($size);
diff --git a/dev-embedded/libdisasm/libdisasm-0.23.ebuild b/dev-embedded/libdisasm/libdisasm-0.23.ebuild
index 311207917f62..732ccd521c0a 100644
--- a/dev-embedded/libdisasm/libdisasm-0.23.ebuild
+++ b/dev-embedded/libdisasm/libdisasm-0.23.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Provides basic disassembly of Intel x86 instructions from a binary stream"
 HOMEPAGE="http://bastard.sourceforge.net/libdisasm.html"
@@ -10,4 +12,19 @@ SRC_URI="mirror://sourceforge/project/bastard/${PN}/${PV}/${P}.tar.gz"
 LICENSE="Clarified-Artistic"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-user-AS-OBJDUMP.patch )
+
+src_configure() {
+	# bug 722606
+	tc-export AS OBJDUMP
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/picasm/Manifest b/dev-embedded/picasm/Manifest
index bd7bb6c1640c..ddc0bbc87788 100644
--- a/dev-embedded/picasm/Manifest
+++ b/dev-embedded/picasm/Manifest
@@ -1,3 +1,4 @@
+AUX picasm-1.14-makefile.patch 667 BLAKE2B 7639914eebc6b91bb066cc8831c1f2c22b795d22f22ae7770ff5c23314f7ce28d3296036e0227a9d8251e770643feef3812e07ac3a82f00ef775d42890e7510c SHA512 831159f5ba9f692f501791b7028e3c5643ab26a630c02442a6cb34ce8e09f6986e5ea4c7da71aa837480b32fbf68f5167893a4ae5a4c61a6c9910d4b2075fb01
 DIST picasm114.tar.bz2 35429 BLAKE2B 6d6e1093904c3cbcaf6fd40c46890257e35e7b197bec92e3728f06595b98ad6be5e2b4c4b19fe67103b871ed9f8e002edd1fae6ab59a85480789bac5a661002a SHA512 a6a8490156afe8af1fc85700890570c745c076396890491f4efe004d7dd701a324f9c7e764fcc710c8954c761f3abb4ed8e97c72ce098100192ead334b335fb7
-EBUILD picasm-1.14.ebuild 871 BLAKE2B a94d983a4dca2e91db54b687b7511660c85ebc15f6e06a181ec3502d556651b1b697692df01e9e89c64dad1c736806f5b3737907928a472b3eada358d526bb78 SHA512 c6fc4f2fbce3ed02ff81cc6fe088fc4e43078cc7d19927cb8ee5492a54601ee17e35179f6644761da604ce34dd213d647b03e09be2f43bacf4591f7aea1b6fa0
+EBUILD picasm-1.14.ebuild 745 BLAKE2B 37d43aa27d32bfdad4ce87e3e3a11d089939ec401a025b10d658af371f919583a2ea9e123ae711e15d123a70364a60c88cbdacb27bae0f2a92a24439df914cbe SHA512 1d9b4d61f211a7af24a93ffaed600ad3289e2eb2748855aa9ab0c45b37be839cd55ee1742da449e8663c7039b546b19688e1ceae662331754607c471d9706579
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picasm/files/picasm-1.14-makefile.patch b/dev-embedded/picasm/files/picasm-1.14-makefile.patch
new file mode 100644
index 000000000000..0ac5bacd7305
--- /dev/null
+++ b/dev-embedded/picasm/files/picasm-1.14-makefile.patch
@@ -0,0 +1,27 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,21 +5,19 @@
+ # See the file LICENSE for license terms.
+ #
+ 
+-DEFS=-DBUILTIN_INCLUDE1=\"/usr/local/share/picasm/include\"
++CPPFLAGS += -DBUILTIN_INCLUDE1=\"/usr/share/picasm/include\"
+ #DEFS=-DBUILTIN_INCLUDE1=\"/home/trossi/bin/picasm-include\"
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wshadow -W -Werror -O2 $(DEFS)
++CFLAGS += -Wall -Wshadow -W
+ RM = /bin/rm -f
+ 
+ VERSION=114
+ 
+-OBJS = picasm.o config.o token.o symtab.o expr.o \
++OBJS = config.o token.o symtab.o expr.o \
+        pic12bit.o pic14bit.o pic16bit.o \
+        util.o
+ 
+ picasm: $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o $@
+ 
+ clean:
+ 	$(RM) picasm *.o examples/*.hex examples/*.lst
diff --git a/dev-embedded/picasm/picasm-1.14.ebuild b/dev-embedded/picasm/picasm-1.14.ebuild
index c8fa9d90d9a6..b0ac54ba35ee 100644
--- a/dev-embedded/picasm/picasm-1.14.ebuild
+++ b/dev-embedded/picasm/picasm-1.14.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs
 
 MY_PV="${PV//.}"
 MY_P="${PN}${MY_PV}"
+
 DESCRIPTION="An assembler and disassembler for 12 and 14-bit PIC chips"
 HOMEPAGE="http://www.iki.fi/trossi/pic/"
 SRC_URI="http://www.iki.fi/trossi/pic/${MY_P}.tar.bz2"
@@ -14,17 +15,13 @@ SRC_URI="http://www.iki.fi/trossi/pic/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	sed -i -e 's:$(CC):\0 $(LDFLAGS):' Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	append-cflags -DBUILTIN_INCLUDE1=\\\"/usr/share/picasm/include\\\"
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
@@ -34,8 +31,10 @@ src_install() {
 	insinto /usr/share/picasm/include
 	doins device_definitions/*.i
 
-	dohtml picasm.html
 	docinto examples
 	dodoc examples/*.*
 	docompress -x /usr/share/doc/${PF}/examples
+
+	docinto html
+	dodoc picasm.html
 }
diff --git a/dev-embedded/picp/Manifest b/dev-embedded/picp/Manifest
index 3acc59ad9ba5..d31030e2cf4d 100644
--- a/dev-embedded/picp/Manifest
+++ b/dev-embedded/picp/Manifest
@@ -1,4 +1,6 @@
+AUX picp-0.6.8-C99-stdbool.patch 1455 BLAKE2B 29f7fd036ea0424959e063ff69e175d66fa64bd1fb7be33cd5c91d99d8cb3b357e38a7f5cf3292fd55302dd3095c20c4b5687588e506db86c39a5856bce5dcef SHA512 e67c6a5c10d694a1bb18bcebb95c6a9b5ab343a59e68f9cbefdfbc3ce41f00dbe83ca7dc4273e4897d8b9d716a90e4458186eb98d789b6444f3ca356a15fe393
 AUX picp-0.6.8-errno.patch 212 BLAKE2B 9c72090aeb3d774dbc70925d7f2e18dfa8ed633cc878bc1ea9e8313ba214bddf808688938ace0325d19471a8fe7b26cee172390b71160fa2747c9d827e92fd8b SHA512 b45e714ef750f2bab2feebfedbe9e07be2b53b5400e25d4af5d4cf415055cef54639689555a85e21e38c6c28feab2042574b1fc702075632aae3c3cccad94a28
+AUX picp-0.6.8-makefile.patch 1621 BLAKE2B b58e7570b80ba7001ebca1067c55f483ec9db432d7638d44eed6fbd8692c04d8c23a4bd51c0cc116ad1303b3d9560eb2dfd066b9da3c780b143eb38e9135720c SHA512 c4b70e5275bbf4112b8203bd9f4df6b769c77b9beddb7e90b1e242ebff53daf6f2965db99705fd4bd5c13e8408210750319ceda1a4ed329360563249a85a7632
 DIST picp-0.6.8.tar.gz 125303 BLAKE2B f445499fa86bc683ba253a5f9a218da6fdc72a3851557225fc91d1542c26a87ddc1926c10500c382288d71fc41beccc88a3c7c863ac7bba7251d3245c7a784ea SHA512 03b8f55f3ae69d87dc02a2df6cad718c3d9fec725eae469b9e28e411620c95e7c1f2d241110cb6a5561e8d9727da3319e2b7caaeefa7a68239009317c8df9471
-EBUILD picp-0.6.8.ebuild 1043 BLAKE2B 011e46d9df776c51b8b3f0b0c0569547afff0794265c4903a61e6818b2bacedf4da12085aefa6a99a3f20f4e635a7ac7841def34d997d84e31f374b4662536ec SHA512 224dc3cf194a3be86579663e662a0dc5c7d89fd21ea19f1fdf0e0877d99c7a02cbd3fcbbce48adee44155dd79ab5bc912a9715add2e1bdd75174e181c622074c
+EBUILD picp-0.6.8.ebuild 951 BLAKE2B c76fb1ac99bfa9c42e5c9ec37608da2cdcf720318ef3886bbe82d1eabd5c833838499da6caa760f01b6fa4400688fedcb956ce91a32033eb93b03420111ac424 SHA512 ce021bac85b4abf176d92a0152611ac2252f9cd551730941e0f992b5ab86ff193baa764bb85ef307d2250037ee7c24ad4ce29fbaa64999a80048c9ab537dca2c
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picp/files/picp-0.6.8-C99-stdbool.patch b/dev-embedded/picp/files/picp-0.6.8-C99-stdbool.patch
new file mode 100644
index 000000000000..f458a5674621
--- /dev/null
+++ b/dev-embedded/picp/files/picp-0.6.8-C99-stdbool.patch
@@ -0,0 +1,83 @@
+--- a/atoi_base.h
++++ b/atoi_base.h
+@@ -17,6 +17,8 @@
+ #ifndef __ATOI_BASE_H_
+ #define __ATOI_BASE_H_
+ 
++#include <stdbool.h>
++
+ #ifdef WIN32
+ #define	bool	int
+ #endif
+--- a/parse.h
++++ b/parse.h
+@@ -17,6 +17,8 @@
+ #ifndef __PARSE_H_
+ #define __PARSE_H_
+ 
++#include <stdbool.h>
++
+ bool	GetNextByte(FILE *theFile, unsigned int *address, unsigned char *data);
+ void	InitParse();
+ 
+--- a/picsnoop/dos/serial.h
++++ b/picsnoop/dos/serial.h
+@@ -2,7 +2,7 @@
+ #ifndef __SERIAL_H_

+ #define __SERIAL_H_

+ 

+-#define	bool	int

++#include <stdbool.h>

+ 

+ #define	KEYINT		int86(0x16, &regs, &regs)

+ #define	KBHEAD		0x41a

+@@ -10,15 +10,12 @@
+ 

+ 

+ #ifndef	FALSE

+-#define	FALSE	0

++#define	FALSE	false

+ #endif

+ #ifndef	TRUE

+-#define	TRUE	1

++#define	TRUE	true

+ #endif

+ 

+-#define	false	FALSE

+-#define	true	TRUE

+-

+ #define	INUM1		12			// interrupt vector for com1

+ #define	INUM2		11			// interrupt vector for com2

+ 

+--- a/picsnoop/serial.h
++++ b/picsnoop/serial.h
+@@ -2,6 +2,8 @@
+ #ifndef __SERIAL_H_
+ #define __SERIAL_H_
+ 
++#include <stdbool.h>
++
+ #ifdef WIN32
+ #define	bool	int
+ #endif
+--- a/record.c
++++ b/record.c
+@@ -49,6 +49,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include <stdio.h>
++#include <stdbool.h>
+ 
+ #ifdef WIN32
+ #include	<windows.h>
+--- a/serial.h
++++ b/serial.h
+@@ -17,6 +17,8 @@
+ #ifndef __SERIAL_H_
+ #define __SERIAL_H_
+ 
++#include <stdbool.h>
++
+ #ifdef WIN32
+ #define	bool	int
+ #endif
diff --git a/dev-embedded/picp/files/picp-0.6.8-makefile.patch b/dev-embedded/picp/files/picp-0.6.8-makefile.patch
new file mode 100644
index 000000000000..7bad31af4d88
--- /dev/null
+++ b/dev-embedded/picp/files/picp-0.6.8-makefile.patch
@@ -0,0 +1,87 @@
+--- a/fixchksum/Makefile
++++ b/fixchksum/Makefile
+@@ -2,11 +2,9 @@
+ # Makefile for fixchksum
+ #
+ 
+-CC=gcc
+ APP=fixchksum
+-INCLUDES=-I.
+-OPTIONS=-O2 -Wall
+-CFLAGS=$(INCLUDES) $(OPTIONS)
++CPPFLAGS+=-I.
++CFLAGS+=-Wall -std=gnu99
+ SRCS=fixchksum.c
+ OBJECTS = fixchksum.o
+ 
+@@ -17,10 +15,6 @@
+ 
+ all: $(APP)
+ 
+-$(APP): $(OBJECTS)
+-	$(CC) $(OBJECTS) -o $(APP)
+-	strip $(APP)
+-
+ clean:
+ 	rm -f $(APP).o
+ 	rm -f $(APP)
+--- a/Makefile
++++ b/Makefile
+@@ -3,11 +3,9 @@
+ # PIC programmer interface
+ #
+ 
+-CC=gcc
+ APP=picp
+-INCLUDES=-I.
+-OPTIONS=-O2 -Wall -x c++
+-CFLAGS=$(INCLUDES) $(OPTIONS)
++CPPFLAGS+=-I.
++CFLAGS+=-Wall -std=gnu99
+ SRCS=main.c serial.c record.c parse.c atoi_base.c
+ OBJECTS = main.o serial.o record.o parse.o atoi_base.o
+ 
+@@ -19,16 +17,7 @@
+ all: $(APP) convert convertshort
+ 
+ $(APP): $(OBJECTS)
+-	$(CC) $(OBJECTS) -lstdc++ -o $(APP)
+-	strip $(APP)
+-
+-convert: convert.c
+-	$(CC) -O2 -Wall -o convert convert.c
+-	strip convert
+-
+-convertshort: convertshort.c
+-	$(CC) -O2 -Wall -o convertshort convertshort.c
+-	strip convertshort
++	$(CC) $(LDFLAGS) $(OBJECTS) -o $(APP)
+ 
+ clean:
+ 	rm -f *.o
+--- a/picsnoop/Makefile
++++ b/picsnoop/Makefile
+@@ -3,12 +3,9 @@
+ #
+ 
+ APP=picsnoop
+-CC=gcc
+ 
+-INCLUDES=
+-OPTIONS=-O2 -Wall -x c++
+-CFLAGS=$(INCLUDES) $(OPTIONS)
+-OBJECTS = picsnoop.o serial.o
++CFLAGS+=-Wall -std=gnu99
++OBJECTS = serial.o
+ 
+ WINCC=/usr/local/cross-tools/bin/i386-mingw32msvc-gcc
+ WINCFLAGS=-Wall -O2 -fomit-frame-pointer -s -I/usr/local/cross-tools/include -D_WIN32 -DWIN32
+@@ -18,8 +15,6 @@
+ all : $(APP)
+ 
+ $(APP) : $(OBJECTS)
+-	$(CC) $(OBJECTS) -lstdc++ -o $(APP)
+-	strip $(APP)
+ 
+ clean :
+ 	rm -f *.o
diff --git a/dev-embedded/picp/picp-0.6.8.ebuild b/dev-embedded/picp/picp-0.6.8.ebuild
index 9957ee011e31..491f48e79828 100644
--- a/dev-embedded/picp/picp-0.6.8.ebuild
+++ b/dev-embedded/picp/picp-0.6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A commandline interface to Microchip's PICSTART+ programmer"
 HOMEPAGE="http://home.pacbell.net/theposts/picmicro/"
@@ -12,30 +12,39 @@ SRC_URI="http://home.pacbell.net/theposts/picmicro/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-C99-stdbool.patch
+)
 
 src_prepare() {
-	sed -i -e '/strip/d' \
-		-e 's:$(CC):\0 $(LDFLAGS):' \
-		{.,fixchksum,picsnoop}/Makefile || die "sed failed"
+	default
 
-	rm -f picsnoop/{picsnoop,*.o}
+	# remove stale binaries
+	rm picsnoop/{picsnoop,*.o} || die
+}
 
-	epatch "${FILESDIR}"/${P}-errno.patch
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
-	emake -C picsnoop CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
-	emake -C fixchksum CC=$(tc-getCC) OPTIONS="${CFLAGS}"
+	emake
+	emake -C picsnoop
+	emake -C fixchksum
 }
 
 src_install() {
-	dobin picp
-	dobin picsnoop/picsnoop
-	dobin fixchksum/fixchksum
-	dodoc README HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT BugReports.txt TODO
+	dobin picp picsnoop/picsnoop fixchksum/fixchksum
+
+	einstalldocs
+	dodoc BugReports.txt HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT
+
 	newdoc picsnoop/README.TXT PICSNOOP.txt
 	newdoc fixchksum/README fixchksum.txt
-	dohtml PICPmanual.html
+
+	docinto html
+	dodoc PICPmanual.html
 }
diff --git a/dev-embedded/picprog/Manifest b/dev-embedded/picprog/Manifest
index 185ecf97a22c..d36ef7a10434 100644
--- a/dev-embedded/picprog/Manifest
+++ b/dev-embedded/picprog/Manifest
@@ -1,3 +1,3 @@
 DIST picprog-1.9.1.tar.gz 76452 BLAKE2B 7c6c5d1eda83c9bdc2c9a3c32c97d06b983cb335d2d37e291fabce3955603adcad293934f2cf1964af1e062b800a6e392f97f80ae1dfd94c03bbc269fafb0785 SHA512 1f24c372aa149d86dd4778904f0abb782510168ce36676b820a5b675f53a7207f62cdcb374c8ec2c60fc51fdfd5780ad9f8f464365403d3d2232187dade91887
-EBUILD picprog-1.9.1.ebuild 583 BLAKE2B 2ff6166553f9d301b609b24fffb0b8219ac2c0b14fd3f8658343954917bd3f72c6e34448371abc59e7ac6a441cb18d1760e8f5adf3013490aa61bd63884341e2 SHA512 6c2e46d4b48f098aff8ae492960cbfda541ddc76e70d8a9baa4263b46c61eadbf77decaedb886f4a5316520f7221ae89480b5aecdb24ff0891710b8f123fac0c
+EBUILD picprog-1.9.1.ebuild 585 BLAKE2B 7f01092b05016cc405850474e092aaf6fd71e72f490b2d6ab0b040ee7d6afff76073e14de38a31c34c288eb0b2495e1233b5131b57dede10446d21067f5bf53b SHA512 e7b35ae6d5430d1ba6f6481ae9a0b78cb0477237d9077aa3175492b623024d01ea793f6641f47d2a9db78ed1e7a216bed7b94759314650989a0b5dec78103b74
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picprog/picprog-1.9.1.ebuild b/dev-embedded/picprog/picprog-1.9.1.ebuild
index 49908460f478..1959d42a4d8a 100644
--- a/dev-embedded/picprog/picprog-1.9.1.ebuild
+++ b/dev-embedded/picprog/picprog-1.9.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 src_compile() {
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -21,6 +20,7 @@ src_compile() {
 src_install() {
 	dobin picprog
 	dodoc README
-	dohtml picprog.html *.png
+	docinto html
+	dodoc picprog.html *.png
 	doman picprog.1
 }
diff --git a/dev-embedded/smdk-dltool/Manifest b/dev-embedded/smdk-dltool/Manifest
index 469efaadeff0..744b5d3a49d1 100644
--- a/dev-embedded/smdk-dltool/Manifest
+++ b/dev-embedded/smdk-dltool/Manifest
@@ -1,8 +1,6 @@
-AUX smdk-dltool-0.20-add-S3C64xx-support.patch 2057 BLAKE2B fec0c1684e5b94231fe5eafbbf53f82d0f1a77a21b7a59c0fe56564841e341fbb806ed5aea15aaef41ef2b9fcc9a552b57326058c7ac275d1c37e93e910fa1f8 SHA512 7ae02b298390ab3bbdfe27c3f5cea55c8f2b75f60853227f37adee7a547ef2d1069286a633e2017a79440f257c25d4f26fe1eaad0ef51c04a067af8d1b815d64
-AUX smdk-dltool-0.20-build.patch 430 BLAKE2B 8a4bbe4170780554f7171f0fd5bc548367688240bfebab40f51c4efbad44df7f6b6fe2c1c700e908275fd9f38ee17ab39ba23843a176daf45a407c7e432ac6b6 SHA512 8bd0918ebe2f7f583dd076ed9b4cc01e6d9dc397fe52981e97029727872552d4d01838c1602d170d2c1bb92e9a4759fef7eecc31336bcad22adb2c0e84e5d297
+AUX smdk-dltool-0.20-add-S3C64xx-support.patch 2022 BLAKE2B dd30445f49c092181ebb39c59673766c18020a71bf9c8378081b499fcd8ab6c360c53e06794d76d1a5ee7848ec83e6e83f6d4b8d757c841dd46def452295e3d6 SHA512 8d1ad92ec2927f7dcab474cd5df5c5c72b0f9d5934620a924166c6915df2bd7a6f0eb72fa86055a1141cba7ad8513a96cd57ad31a02d0c140f3b2467f6b9623b
+AUX smdk-dltool-0.20-build.patch 364 BLAKE2B 59d431de84ac65abbeb5a902036c7b696b59d8b96c28179d4950163a48b8873dc237d937b63aae9c2aeb0c59a27f91f87fc20bb6c554ffe38911ee7bdcd17a7e SHA512 6bd0a75df43e38f88b07d490b320e1812f9651dc8e72e903e77b800cf901e3edca60b05bc1cc78b1715de6871de5e95a7fec72482a58b77ea9480e65bfd5cd45
 AUX smdk-dltool-0.20-libusb-1.0-r1.patch 8859 BLAKE2B 333b774375e8ea48e811cd54fe6e6bbfa0c8c5ece0fa2cda806a6d60022b4f791ed06131930e829cab5ca5600bb1948ab8f852542048f9fcb2967e4682c51457 SHA512 7c1a39c7b6da1e2aecd651be6d78ec30383cd9a7858c40477e84bddd2cb80b8138a6cae55e3f6be71bd8aad03ff31dc3250f1579c63c106953fef2fb62e3e3bf
-AUX smdk-dltool-0.20-libusb-1.0.patch 8207 BLAKE2B 499e1abf30b30960cbf998a9c06ca22062b8231938fb1ff87e9877fe4613e94c79c0561a67b885a21a11fb56dc670917f82737ca8597c37f723f5e63df3b9c9a SHA512 2c3f47ac0fbf573b8be17721639123607ec4aaf69e1eef602089d75ef614ba761b6f6d0182cbaa0abc57ef0bd5a2c61120b3369c9c73c29cd466fda3f5a99ab4
 DIST smdk-tools-v0.20.tar.gz 5170 BLAKE2B c414938ff98155dd16f64378a5c3524bb2fd7e21b074cb6e656ffc2aa5b7b8cc8cbe27600472a8ef20570818e253f63f1b1460784200aaf0a4fb321f79b0cfdc SHA512 2b0fd113bc9e6e6c07ad4163d404bffa8044150a2da55a8903192b9dcbead5e31d97a9315b561526f0cb2a65e415f34941bea0db3ac40e73048901fe95ff3a17
-EBUILD smdk-dltool-0.20-r3.ebuild 834 BLAKE2B 1146b2cadeb55606412fa197fc3dd33ef48dbefb0c758c5cbcb17b439790e9354535d6c61307dab6a18bf1b2a087fbee9fb301ae53128d61e618c0938d8b2293 SHA512 e9286ccb956faeceffd459c523442a2dd09f329c4d3514e5d55f57f2256bceb6ff73f0acdc83ebcb54f37855f007a6d8f7c6a92876b269e7e44f6be212013843
-EBUILD smdk-dltool-0.20-r4.ebuild 837 BLAKE2B 244d5dfd17acc0fd6763b25bc1c4e4dc2616ab8e49f094584a0d9b99168e308c9804e5d6d0341d3dfc9b30e07f1cc9543056d2882329a5d6a97f789c00ba6340 SHA512 0b9edf675277de1100212371edbdbf0a2a35cf10ad6801b5d88b52b9d4c22b09c9c07e6e436c31ad188c664adc43e5334df6d9589eb842aa97b08446ddb9ba30
+EBUILD smdk-dltool-0.20-r4.ebuild 813 BLAKE2B ec48e8336e15e9327d3cfb5518149b0e91c8ad684de65f263c1ba639fc4a9e9c0aedc6334b324fee4bef2a6b0030f4910534da0c707d86f3ca859a4bba0160fd SHA512 9b978e80e159eb802cc51d6b16f266f0eff3a0c41d16937d3704889e78bb4194cb8d4b4d6625b6fe7e3089737e663bb393689fc2c4aa9286ef48ae9c97f59614
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
index 5b615aeb119b..f2864b012a27 100644
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
+++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Add S3C64xx support
 Author: unknown
 URL: http://dev.odroid.com/frs/download.php/22/Linux-dltool.tar.gz
 ---
- dltool/dltool.c |   19 ++++++++++++++-----
+ dltool.c |   19 ++++++++++++++-----
  1 files changed, 14 insertions(+), 5 deletions(-)
 
-diff --git a/dltool/dltool.c b/dltool/dltool.c
+diff --git a/dltool.c b/dltool.c
 index 4e2d238..e76e607 100644
---- a/dltool/dltool.c
-+++ b/dltool/dltool.c
+--- a/dltool.c
++++ b/dltool.c
 @@ -26,6 +26,8 @@ char *dl_file = "download.dat";
  char *dl_udev = NULL;
  char *dl_ubus = NULL;
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
index c6e3b767394b..9b7162d77cd5 100644
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
+++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
@@ -1,7 +1,7 @@
 respect env build settings
 
---- a/releases/smdk-tools-v0.20/dltool/Makefile
-+++ b/releases/smdk-tools-v0.20/dltool/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -7,8 +7,13 @@
  
  .PHONY:	clean
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
deleted file mode 100644
index 889a439c7fb0..000000000000
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-migrate to libusb-1 by me (Mike Frysinger)
-
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall
- PKG_CONFIG ?= pkg-config
--CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb)
--LDLIBS = $(shell $(PKG_CONFIG) --libs libusb)
-+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb-1.0)
-+LDLIBS = $(shell $(PKG_CONFIG) --libs libusb-1.0)
- 
- all: dltool
- 
---- a/dltool.c
-+++ b/dltool.c
-@@ -13,9 +13,11 @@
- #include <stdio.h>
- #include <getopt.h>
- #include <fcntl.h>
-+#include <errno.h>
-+#include <unistd.h>
- 
- 
--#include <usb.h>
-+#include <libusb.h>
- 
- unsigned int   debug   = 0;
- unsigned long  dl_addr = 0x30000000L;
-@@ -23,12 +25,22 @@ unsigned long  dl_size = 0L;
- unsigned char *dl_data = NULL;
- 
- char *dl_file = "download.dat";
--char *dl_udev = NULL;
--char *dl_ubus = NULL;
-+libusb_context *ctx = NULL;
-+libusb_device_handle *devh = NULL;
- 
- int ep_out = 0;
- 
- #define DBG(x) if (debug) { printf x; }
-+#define err(fmt, args...) \
-+	do { \
-+		if (devh) \
-+			libusb_close(devh); \
-+		if (ctx) \
-+			libusb_exit(ctx); \
-+		fprintf(stderr, "dltool: " fmt "\n", ## args); \
-+		exit(1); \
-+	} while (0)
-+#define errp(fmt, args...) err(fmt ": %s", ## args, strerror(errno))
- 
- void write_u32(unsigned char *dp, unsigned long val)
- {
-@@ -108,25 +120,30 @@ void calc_cksum(unsigned char *data, ssize_t len)
- 	cp[1] = cksum >> 8;
- }
- 
--int verify_device(struct usb_device *dev)
-+int verify_device(libusb_device *dev)
- {
-+	struct libusb_device_descriptor desc;
-+
-+	if (libusb_get_device_descriptor(dev, &desc))
-+		return 0;
-+
- 	DBG(("dev %p: configurations %d\n",
--	     dev, dev->descriptor.bNumConfigurations));
-+	     dev, desc.bNumConfigurations));
- 	
--	if (dev->descriptor.bNumConfigurations != 1)
-+	if (desc.bNumConfigurations != 1)
- 		return 0;
- 
--	DBG(("\t=> bLength %d\n", dev->descriptor.bLength));
--	DBG(("\t=> bType   %d\n", dev->descriptor.bDescriptorType));
--	DBG(("\t=> bcdUSB  %x\n", dev->descriptor.bcdUSB));
--	DBG(("\t=> idVendor %x\n", dev->descriptor.idVendor));
--	DBG(("\t=> idProduct %x\n", dev->descriptor.idProduct));
-+	DBG(("\t=> bLength %d\n", desc.bLength));
-+	DBG(("\t=> bType   %d\n", desc.bDescriptorType));
-+	DBG(("\t=> bcdUSB  %x\n", desc.bcdUSB));
-+	DBG(("\t=> idVendor %x\n", desc.idVendor));
-+	DBG(("\t=> idProduct %x\n", desc.idProduct));
- 
--	if (dev->descriptor.idVendor == 0x5345 && dev->descriptor.idProduct == 0x1234) {
-+	if (desc.idVendor == 0x5345 && desc.idProduct == 0x1234) {
- 		ep_out = 3;
- 		return 1;
- 	}
--	else if(dev->descriptor.idVendor == 0x4e8 && dev->descriptor.idProduct == 0x1234){
-+	else if(desc.idVendor == 0x4e8 && desc.idProduct == 0x1234){
- 		printf("S3C64XX Detected!\n");
- 		ep_out = 2;
- 		return 1;
-@@ -173,6 +190,12 @@ struct option long_opts[] =  {
- 		.val		= 'x',
- 	},
- 	{
-+		.name		= "help",
-+		.has_arg	= 0,
-+		.flag		= NULL,
-+		.val		= 'h',
-+	},
-+	{
- 		.name		= NULL
- 	}
- };
-@@ -181,12 +204,14 @@ int flg_show = 0;
- 
- int main(int argc, char **argv)
- {
--	struct usb_bus *bus, *busp;
--	struct usb_device *result = NULL;
--	struct usb_device *found  = NULL;
-+	ssize_t num_devs, i;
-+	libusb_device **list;
-+	libusb_device *found;
-+	int dl_ubus = -1;
-+	int dl_udev = -1;
-+	uint8_t bus_num, dev_num;
- 	unsigned long fsize;
--	usb_dev_handle *devh;
--	int ret;
-+	int ret, transferred;
- 
- 	printf("SMDK42XX,S3C64XX USB Download Tool\n");
- 	printf("Version 0.20 (c) 2004,2005,2006"
-@@ -197,7 +222,7 @@ int main(int argc, char **argv)
- 		int index = 0;
- 		int c;
- 
--		c = getopt_long(argc, argv, "a:b:d:f:s", long_opts, &index);
-+		c = getopt_long(argc, argv, "a:b:d:f:shx", long_opts, &index);
- 
- 		DBG(("option index %d\n",c ));
- 
-@@ -218,117 +243,127 @@ int main(int argc, char **argv)
- 			break;
- 
- 		case 'b':
--			dl_ubus = optarg;
-+			dl_ubus = atoi(optarg);
- 			break;
- 
- 		case 'd':
--			dl_udev = optarg;
-+			dl_udev = atoi(optarg);
- 			break;
- 
- 		case 'x':
- 			debug = 1;
-+			break;
-+
-+		case 'h':
-+			puts(
-+				"Usage: dltool [options]\n"
-+				"\n"
-+				"-a <download addr>\n"
-+				"-b <bus #>\n"
-+				"-d <dev #>\n"
-+				"-f <file>\n"
-+				"-s               Show found devices\n"
-+				"-x               Enable debug\n"
-+			);
-+			return 0;
- 		}
- 	}
- 	
--	usb_init();
--	usb_find_busses();
--	usb_find_devices();
--	
--	bus = usb_get_busses();
--
--	DBG(("usb_get_busses: %p\n", bus));
--       
--	for (busp = bus; busp != NULL; busp = busp->next) {	  
--		struct usb_device *dev;
--
--		DBG(("bus %p: dirname %s\n", busp, busp->dirname));
--
--		if (dl_ubus) {
--			if (strcmp(busp->dirname, dl_ubus) != 0)
--				continue;
-+	ret = libusb_init(&ctx);
-+	if (ret)
-+		errp("could not initialize usb stack");
-+
-+	bus_num = dev_num = 0;
-+	found = NULL;
-+	num_devs = libusb_get_device_list(ctx, &list);
-+	for (i = 0; i < num_devs; ++i) {
-+		libusb_device *dev = list[i];
-+		bus_num = libusb_get_bus_number(dev);
-+		dev_num = libusb_get_device_address(dev);
-+
-+		DBG(("bus %u; dev %u (%p)\n", bus_num, dev_num, dev));
-+
-+		if (dl_ubus >= 0 && bus_num != dl_ubus)
-+			continue;
-+
-+		if (!verify_device(dev))
-+			continue;
-+
-+		if (flg_show) {
-+			printf("bus %u: device %u\n", bus_num, dev_num);
-+			continue;
- 		}
- 
--		for (dev = busp->devices; dev != NULL; dev = dev->next) {
--			DBG(("dev %p filename %s\n", dev, dev->filename));
-+		if (dl_udev >= 0 && dev_num != dl_udev)
-+			continue;
- 
--			if (!verify_device(dev))
--				continue;
--
--			if (flg_show) {
--				printf("bus %s: device %s\n", 
--				       busp->dirname, dev->filename);
--				continue;
--			}
--
--			found = dev;
--
--			if (dl_udev) {
--				if (strcmp(dev->filename, dl_udev) == 0) {
--					result = dev;
--					break;
--				}
--			}
--		}
--
--		if (result != NULL)
--			break;
-+		found = dev;
-+		break;
- 	}
- 
- 	if (flg_show)
- 		return 0;
- 
--	DBG(("device %p, found %p\n", result, found));
-+	DBG(("found %p\n", found));
- 
--	if (result == NULL && found != NULL)
--		result = found;
--
--	if (result == NULL) {
--		fprintf(stderr, "failed to find device\n");
--		return 1;
--	}
-+	if (found == NULL)
-+		err("failed to find device\n");
- 
--	printf("=> found device: bus %s, dev %s\n",
--	       result->bus->dirname, result->filename);
-+	printf("=> found device: bus %u, dev %u\n",
-+	       bus_num, dev_num);
- 
- 	dl_data = load_file(dl_file, &dl_size, &fsize);
--	if (dl_data == NULL) {
--		printf("failed to load %s\n", dl_file);
--		return 1;
--	}
-+	if (dl_data == NULL)
-+		errp("failed to load %s", dl_file);
- 
- 	printf("=> loaded %ld bytes from %s\n", fsize, dl_file);
- 
--	devh = usb_open(result);
--	if (devh == NULL) {
--		perror("usb_open");
--		return 1;
--	}
-+	ret = libusb_open(found, &devh);
-+	if (ret == 0) {
-+		/*
-+		 * Seems to break some recovery modes :(
-+		 * http://crosbug.com/26083
-+		 * These fail:
-+		 * smdk-dltool -a 0x02021400 -f bl1.bin
-+		 * smdk-dltool -a 0x02023400 -f bl2.bin
-+		 */
-+#if 0
-+		uint8_t configuration;
-+		struct libusb_config_descriptor *config;
-+		libusb_get_active_config_descriptor(found, &config);
-+		configuration = config->bConfigurationValue;
-+		libusb_free_config_descriptor(config);
-+		libusb_set_configuration(devh, configuration);
-+#endif
-+	} else
-+		errp("libusb_open");
- 
- 	DBG(("claim interface\n"));
- 
--	if (usb_claim_interface(devh, 0) < 0) {
--		perror("usb_claim_interface");
--		usb_close(devh);
--		return 1;
--	}
-+	ret = libusb_claim_interface(devh, 0);
-+	if (ret)
-+		errp("libusb_claim_interface");
- 
- 	printf("=> Downloading %ld bytes to 0x%08lx\n", dl_size, dl_addr);
- 
- 	write_header(dl_data, dl_addr, dl_size);
- 	calc_cksum(dl_data, dl_size);
- 
--	//ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
--	ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000);
-+	//ret = libusb_bulk_transfer(devh, 3, dl_data, dl_size, &transferred, 5*1000*1000);
-+	ret = libusb_bulk_transfer(devh, ep_out, dl_data, dl_size, &transferred, 5*1000*1000);
- 	printf("=> usb_bulk_write() returned %d\n", ret);
- 
--	if (ret != dl_size) {
--		printf("failed to write %ld bytes\n", dl_size);
-+	if (ret || transferred != dl_size) {
-+		printf("failed to write %ld bytes (wrote %d): %s\n",
-+			dl_size, transferred, strerror(errno));
-+		ret = 1;
- 	}
- 
- 	free(dl_data);
- 	
--	usb_release_interface(devh, 0);
--	usb_close(devh);
-+	libusb_release_interface(devh, 0);
-+	libusb_close(devh);
-+	libusb_exit(ctx);
- 
--	return 0;
-+	return ret;
- }
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
deleted file mode 100644
index d15dedcb728c..000000000000
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Tool to communicate with Samsung SMDK boards"
-HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
-SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
-
-# Email sent to author on 2012-01-18 querying about license
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-libusb-1.0.patch
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	newbin dltool smdk-usbdl
-	dodoc readme.txt
-}
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
index a0fec4846a4f..ece10a6cf42a 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to communicate with Samsung SMDK boards"
 HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
@@ -13,18 +13,20 @@ SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist"
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool
+S="${WORKDIR}/releases/smdk-tools-v${PV}/dltool"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-libusb-1.0-r1.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-add-S3C64xx-support.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-libusb-1.0-r1.patch
+)
+
+src_configure() {
 	tc-export CC PKG_CONFIG
 }
 
diff --git a/dev-embedded/uisp/Manifest b/dev-embedded/uisp/Manifest
index 1b710b42dad9..890d8f0090a0 100644
--- a/dev-embedded/uisp/Manifest
+++ b/dev-embedded/uisp/Manifest
@@ -1,4 +1,6 @@
-AUX mega-48-88-168.patch 1723 BLAKE2B 7b52560d9a516b9d04efc5b3bc6b59759437217bf1632b3d3de952e3975f58762af3733f63ff35dde687e1c3591ef5805f25c00d164ac48b8aee1b12cacfa087 SHA512 5c850c08320bc5888b8d6556e05c06f5e201a6cc311a89c394d6ad76a9a1332bfe2296731d952cf0b911c8ab94ea34520535fa8011976829abc9cd4b48303fa5
+AUX uisp-20050207-autotools.patch 1109 BLAKE2B 689fb3d07318922f8cc542fad583fa3965e8c97301d9cc08d62e2f730dc3ef5ee1848131f425019f004e66b3217c8b2129ba34ff6010ef4796d42fbb731fffa8 SHA512 c82dc37ab1e99eeaf1fb559498077430ec290b305452d7cb63146e1c3ee27840a12a45951eb13f6cbc6e3f4c2e6e51ff45288d6cc4aa91eb4e3b52274272f39c
+AUX uisp-20050207-clang.patch 2558 BLAKE2B 50832b8a6a61d6c2d1daf46dc469ea8ab6a61024271a31099c38e2729b14853897556a99492db80020314c976e7a7ac3f62d61160b99bde38144a8612fbfec36 SHA512 518e0e50fbbcc62486470b3d61c8a44d2f0f31fbfadf2ad23aea2acb8cdd6acb4ce17d3fc8d34d5e612bf763948c0f8bcc0c3156ec6bb76ba65e59fdad0c6b49
+AUX uisp-20050207-mega-48-88-168.patch 1723 BLAKE2B 7b52560d9a516b9d04efc5b3bc6b59759437217bf1632b3d3de952e3975f58762af3733f63ff35dde687e1c3591ef5805f25c00d164ac48b8aee1b12cacfa087 SHA512 5c850c08320bc5888b8d6556e05c06f5e201a6cc311a89c394d6ad76a9a1332bfe2296731d952cf0b911c8ab94ea34520535fa8011976829abc9cd4b48303fa5
 DIST uisp-20050207.tar.gz 166745 BLAKE2B a99bd0d39a053797d3dee0a4390d0ffcca014bed465ba2aea3e99022fff8c3f5f4dbe96a0e33422ffcfa33621d94f42d37dac17862fd25e7902b3bf79aa90692 SHA512 1dd62d97c2a459abaed4ce60302e7153564d0fd87689c40d175757549fe8e797749fd2f76c6c02bcb85e56600d7e4c790c396dc2b56e152ead486df8e1bc2fe7
-EBUILD uisp-20050207-r1.ebuild 661 BLAKE2B a33ead36606bba4dbaf31dd0ac88fe50b4aba3c2847a7c0901ed747eca65c8ada004c8df4d88272b0621d17bb4f29a1e4cef0993d449b3b220d12161dde2ccca SHA512 1906e79c1bcd096ea85c7de8c7d52e002bdc386aa5fd1531f0327ec89c8f4ec1514bb55078d00cd333fd47f97623885ef6bbccb1c03af6b65db35f858e74ed3b
+EBUILD uisp-20050207-r1.ebuild 589 BLAKE2B effc7bb35521f4b8c367923aa8f975f33b882bfb0f219b055f109243ce70ca3cae88d1a0dcb66df76295f9517fa817e3a118f16f38ea17d1d50e294ac2e4edaa SHA512 54b75a808c928fe7e808978b141546c1bfe2d4cdc0d66ccea7b15f3d14907306452e70583b57489f8b4c6c6c4da7a073b1c6e3a1a612253597035483fcaa065d
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/uisp/files/uisp-20050207-autotools.patch b/dev-embedded/uisp/files/uisp-20050207-autotools.patch
new file mode 100644
index 000000000000..824ccf3b2b57
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-20050207-autotools.patch
@@ -0,0 +1,35 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,20 +44,8 @@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure src/config-h.in \
+                        src/stamp-h.in $(AUX_DIST)
+ 
+-install_aux_files    = AUTHORS COPYING INSTALL CHANGES CHANGES.old TODO \
++dist_doc_DATA    = AUTHORS CHANGES CHANGES.old TODO \
+                        ChangeLog ChangeLog-2003 ChangeLog-2002
+ 
+-DOC_INST_DIR         = $(DESTDIR)$(datadir)/doc/uisp-$(VERSION)
+-
+-install-data-local:
+-	$(mkinstalldirs) $(DOC_INST_DIR)
+-	for file in $(install_aux_files) ; do \
+-	  echo " $(INSTALL_DATA) $$file $(DOC_INST_DIR)/$$file"; \
+-	  $(INSTALL_DATA) $(srcdir)/$$file $(DOC_INST_DIR)/$$file; \
+-	done
+-
+-uninstall-local:
+-	rm -rf $(DOC_INST_DIR)
+-
+ dist-hook: uisp.spec
+ 	cp uisp.spec $(distdir)/uisp.spec
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,7 +31,7 @@
+ # Turn on all warnings and consider them errors. This kinda forces you to have
+ # to use gcc, but I'd rather have all warnings eliminated.
+ 
+-AM_CXXFLAGS          = -Wall -Werror
++AM_CXXFLAGS          = -Wall
+ 
+ bin_PROGRAMS         = uisp
+ uisp_SOURCES         = \
diff --git a/dev-embedded/uisp/files/uisp-20050207-clang.patch b/dev-embedded/uisp/files/uisp-20050207-clang.patch
new file mode 100644
index 000000000000..c08943b9d9b1
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-20050207-clang.patch
@@ -0,0 +1,84 @@
+--- a/src/AvrAtmel.C
++++ b/src/AvrAtmel.C
+@@ -185,7 +185,7 @@
+ 
+ void TAvrAtmel::SetAddress(TAddr addr){
+   apc_address = addr;
+-  TByte setAddr [3] = { 'A', (addr>>8)&0xff, addr&0xff};
++  TByte setAddr [3] = { 'A', static_cast<TByte>((addr>>8)&0xff), static_cast<TByte>(addr&0xff)};
+   Send(setAddr, 3, 1);
+   CheckResponse(setAddr [0]);
+ }
+@@ -294,7 +294,7 @@
+       if (flush_buffer){WriteProgramMemoryPage();}
+     }
+     
+-    TByte wrF [2] = { (addr&1)?'C':'c', byte };
++    TByte wrF [2] = { static_cast<TByte>((addr&1)?'C':'c'), byte };
+     
+     if (apc_address!=(addr>>1) || apc_autoinc==false) SetAddress (addr>>1);
+     if (wrF[0]=='C') apc_address++;
+@@ -346,7 +346,7 @@
+  */
+ void TAvrAtmel::WriteOldFuseBits (TByte val)
+ {
+-  TByte buf[5] = {'.', 0xac, (val & 0x1f) | 0xa0, 0x00, 0xd2 };
++  TByte buf[5] = {'.', 0xac, static_cast<TByte>((val & 0x1f) | 0xa0), 0x00, 0xd2 };
+   Info (2, "Write fuse high bits: %02x\n", (int)val);
+   Send (buf, 5, 2);
+   CheckResponse (buf[1]);
+@@ -423,7 +423,7 @@
+ }
+ 
+ void TAvrAtmel::WriteLockBits(TByte bits){
+-  TByte lockTarget [2] = { 'l', 0xF9 | ((bits << 1) & 0x06) };
++  TByte lockTarget [2] = { 'l', static_cast<TByte>(0xF9 | ((bits << 1) & 0x06)) };
+   Send (lockTarget, 2, 1);
+   CheckResponse(lockTarget [0]);
+   Info(1, "Writing lock bits ...\nReinitializing device\n");
+--- a/src/AvrDummy.C
++++ b/src/AvrDummy.C
+@@ -81,12 +81,12 @@
+ TAvrDummy::GetPartInfo(TAddr addr)
+ {
+   if (at89) {
+-    TByte info [4] = { 0x28, addr & 0x1f, 0, 0 };
++    TByte info [4] = { 0x28, static_cast<TByte>(addr & 0x1f), 0, 0 };
+     Send(info, 4);
+     return info[3];
+   }
+ 
+-  TByte info [4] = { 0x30, 0, addr, 0 };
++  TByte info [4] = { 0x30, 0, static_cast<TByte>(addr), 0 };
+   Send(info, 4);
+   return info[3];
+ }
+@@ -289,7 +289,7 @@
+ void
+ TAvrDummy::WriteOldFuseBits(TByte val)
+ {
+-  TByte oldfuse[4] = { 0xAC, (val & 0x1F) | 0xA0, 0, 0xD2 };
++  TByte oldfuse[4] = { 0xAC, static_cast<TByte>((val & 0x1F) | 0xA0), 0, 0xD2 };
+   Send(oldfuse, 4);
+ }
+ 
+@@ -533,7 +533,7 @@
+ {
+   /* This handles both old (byte 2, bits 1-2)
+      and new (byte 4, bits 0-5) devices.  */
+-  TByte lock[4] = { 0xAC, 0xF9 | ((bits << 1) & 0x06), 0xFF, bits };
++  TByte lock[4] = { 0xAC, static_cast<TByte>(0xF9 | ((bits << 1) & 0x06)), 0xFF, bits };
+   TByte rbits;
+ 
+   if (at89)
+--- a/src/Stk500.C
++++ b/src/Stk500.C
+@@ -518,7 +518,7 @@
+ 
+ TByte TStk500::ReadCalFuseBits(int addr)
+ {
+-  TByte cmd[] = { 0x38, 0x00, addr, 0x00 };
++  TByte cmd[] = { 0x38, 0x00, static_cast<TByte>(addr), 0x00 };
+ 
+   return UniversalCmd(cmd);
+ }
diff --git a/dev-embedded/uisp/files/mega-48-88-168.patch b/dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch
index dad337b740a7..dad337b740a7 100644
--- a/dev-embedded/uisp/files/mega-48-88-168.patch
+++ b/dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch
diff --git a/dev-embedded/uisp/uisp-20050207-r1.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
index 2a92a428cdd4..3db55410303d 100644
--- a/dev-embedded/uisp/uisp-20050207-r1.ebuild
+++ b/dev-embedded/uisp/uisp-20050207-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils
+inherit autotools
 
 DESCRIPTION="Tool for programming AVR microcontroller through the parallel port"
 HOMEPAGE="https://savannah.nongnu.org/projects/uisp"
@@ -12,17 +12,19 @@ SRC_URI="https://savannah.nongnu.org/download/uisp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-mega-48-88-168.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_prepare() {
-	sed -i -e "/^DOC_INST_DIR/s:/[^/]*$:/${PF}:" Makefile.in || die
-	cd src
-	epatch "${FILESDIR}"/mega-48-88-168.patch
-	sed -i -e 's: -Werror::' Makefile.in || die
+	default
+	eautoreconf
 }
 
 src_install() {
 	default
-	dodoc doc/*
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	dodoc -r doc/.
 }