gentoo resync : 28.04.2021

32 files changed, 49 insertions, 308 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 7e7ebcb0cbf4..e94181f8eb72 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
index e5113a37ea26..deb6335b2372 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -1,5 +1,5 @@
 DIST avr-libc-2.0.0.tar.bz2 3590893 BLAKE2B cc628f5f55d12c78ca9215e3e37b4a0061feae3c7c19653384b5d789fb6e1c70efe420631bf987379ae5524ec0f65c6df459eaad0fcfb80833cc4732ed5e796b SHA512 fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6
 DIST avr-libc-manpages-2.0.0.tar.bz2 151137 BLAKE2B 7fbaa9c1014e8cf9b4caac723b57f9c24272da458b987ba302730116437bb3a5b49296c6804d857b421e6f71f2c4efda959d278ebcc14aba35fdd44a958dfca8 SHA512 8b4aaa6ae176076171e90e629e0e6142c4c56f9cc4f1640432384276df2f7b457f5137739535b07b9cede9b5b2e564db7fe200203faa4e2d0cd9874432507823
 DIST avr-libc-user-manual-2.0.0.tar.bz2 932920 BLAKE2B d3190af26dbe38719bc78e73de31af1ce69d885b928f48a4fb9ccd145a33f19f71c017253ad16eadc641fc88495c642dd5fd1668c6bebddf7d813f70db01a3f6 SHA512 246180be1f793b46335a49f33028ff59bd7cc06ca3d8627309521801e405e0e1305663a2c0760521467e75732ad513749bf707732b59fb17744e51acda9bb2c6
-EBUILD avr-libc-2.0.0.ebuild 2017 BLAKE2B d04d957bfe9ffe04f95184d7628c84e52772c57790e4a7f903edd7e415cce2bba007f79b9e0a6fa0367bc29484541f59bb3f8e9aac23ba8609563574b2cb940f SHA512 12e157b71ac9eafe9bd9add60ecdf999f5af83ae24657265751f1b5e0b8e9e4270c4e806e8bbc8da800645de25b8ebf62d6dedbed7e1e45944b20e60a23db26c
+EBUILD avr-libc-2.0.0.ebuild 2014 BLAKE2B 15dcd75cc2aa1d278d6d4fab634bb1a11be36fa821171c050252e44688780f3fe8bad57d2bf03fc0da5bd96160e668143c9e7777521f8ee5fd82e9e4c37e8462 SHA512 f05a818e293500ea432793b62d12142e13a10ab920c976dba764077f3ec37ad64ebe34766bd00346f56c2b943477b6bf2baee884302c0538258e9df1d79639db
 MISC metadata.xml 470 BLAKE2B 8855ba12ec2147f31efb154d314b9e2e625076453bc4ddf43022b08a597a1f1ea5bb401768e38b000718b200b8e60d16214a89c1642b66d31386152e242a4e03 SHA512 0a09da72e78c945fa53ee056913bc563897dcb65c33e8cba04dfd15d57a1578a502f18071b0a3cd5feecdbc7e570bfddfde05deda12746e70962b841d90d566a
diff --git a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
index 79b7f1163fc2..62a2c265795c 100644
--- a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 CHOST="avr"
 CTARGET="avr"
 
-inherit flag-o-matic eutils
+inherit flag-o-matic epatch
 
 DESCRIPTION="C library for Atmel AVR microcontrollers"
 HOMEPAGE="http://www.nongnu.org/avr-libc/"
diff --git a/dev-embedded/freaklabs-boards/Manifest b/dev-embedded/freaklabs-boards/Manifest
index 6edc2a22cbf4..19fbc38e3c9c 100644
--- a/dev-embedded/freaklabs-boards/Manifest
+++ b/dev-embedded/freaklabs-boards/Manifest
@@ -1,3 +1,3 @@
 DIST freaklabs-v1.0.0-manual-install.zip 123494 BLAKE2B 5ac9d31782c217f074a73bf9b3b1e832e1cea89f4f767ec01e1b3c3672bca1245adba4c8d661a7af62f306f5a104978913809b232d9287b6938f3550bc109067 SHA512 8fd265265a31c39bc4637492ff0fec564d1e9a4450a9a709adf436536c2320f14676259f70857b332c9f0e5766fa5eb3640b168f450ab8820733c2100fe4b36d
-EBUILD freaklabs-boards-1.0.0.ebuild 1106 BLAKE2B 6ea8e9466d108f8be29f6226c51ff34dc704220e0a1210d51a15e62978e822cb976dfeadc93b4c1743f5682ed3e5148f69691260ca8a822d1a478d7d672cab8d SHA512 33c9fe6709e2c057637ffa67087498e04410a0e9fe71251a2fcd5e947dbdd9579d3ea473779b244c1b18d72049fd18332df3102b18cce2b1273b721010297aa5
+EBUILD freaklabs-boards-1.0.0.ebuild 1078 BLAKE2B 84466482c606c6673ad0fe580f741d82fcb3e3e1b090c09d9b0f370d685d1df22d573d6f381e357c9d0e45380d85d5bc986d9e40dd7658da394e171e0bacdb1e SHA512 a42507c24bc0487a7a9bf98c8df6b7d6278e32e032d403acc22983824ed18e2411d91f75f0e73be9d773b253ebf21e897a060d0746f01cbc06d4f1edaeec3445
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild b/dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild
index 57336622114f..5fecb8d78b9b 100644
--- a/dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild
+++ b/dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,23 +10,21 @@ HOMEPAGE="https://freaklabs.org/chibiarduino/"
 #GIT_COMMIT="ff3ebd11934c123091d485e6dc2845d78bda4255"
 #SRC_URI="https://github.com/freaklabs/freaklabs-boards/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 #S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-S="${WORKDIR}/freaklabs-v1.0.0"
 
 SRC_URI="https://freaklabs.org/pub/chibiArduino/boards/freaklabs-v${PV}-manual%20install.zip -> freaklabs-v${PV}-manual-install.zip"
+S="${WORKDIR}/freaklabs-v1.0.0"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-BDEPEND=""
+BDEPEND="app-arch/unzip"
 PDEPEND="dev-embedded/arduino"
 
 src_install() {
 	insinto /usr/share/arduino/hardware/freaklabs/avr
 	doins -r avr/*
+
 	#non working 1.0.3
 	#doins -r boards/1.0.3/{boards.txt,platform.local.txt,variants,bootloaders}
 }
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 2aec8822d838..e37dcd3ed70c 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,6 +1,3 @@
-AUX gpsim-0.29.0-gui.patch 259 BLAKE2B c22bdbd705d2607caa4330431a64918126dfe4411d56e51de6a00d6839c1b28e9ec6f3addf05cf10e31b339fa9d7927da6c6473a5d5c5ea7f447f893fc16d148 SHA512 983d83627a9ec4ebe350e22890fafc55bea72dbb3f59f75f17abe72760c4ac1df57b29ae01603187d458964399606fcef5bd3b79f0dc6b489ed8890d62a8ec1a
-DIST gpsim-0.29.0.tar.gz 3301050 BLAKE2B e71aec8d3ed5c421a050a2b1c6de4a1ee561c3fdc91abe896aa02de08523e7e0d7e917d1a313cbb6a590a7590748edc9b48f8e04eaeffa86541e0bd4f7b57d06 SHA512 f24997e7bc360afbc87f9cc1e36cf5fa25aecf23c21ba043eabb333b5de9ddfa24b1373fdaa48ba8043a7fcda72558d54691db2579345255dd453e94b3752920
 DIST gpsim-0.30.0.tar.gz 3385728 BLAKE2B 05be3672cb31253ef132dd600a39710cb952cef356ebb69d0b09119e578faa05e6f25613a83e076ddca568f0560da25df6361331364e70ff8db8f4f47b8f5de5 SHA512 8681f06e73569b801d2961858c8676490d93f7ef40e99f07e7a5eff16955850b66bcd8182aa22ba0edca0b10723cb3a5b7b8bf52fdb0cc94955c3072352292df
-EBUILD gpsim-0.29.0.ebuild 894 BLAKE2B 7a4b87894778c934f8006589507bd35b79e147761d94d92e905bd7c334f923874ccc33298b4a35af8292d908b4d27cea789d12fc03a670fa1f81fa4309422937 SHA512 fe72c9d36d7690f8a85b94a445c4ad25d90e939fe201b0a2b05d33cd1853f6827f7bb2c8d092f59ad587237f532a047a195db7acaa03bb5dd247bcde4a5db609
-EBUILD gpsim-0.30.0.ebuild 824 BLAKE2B 7ea1f570855df419d59ee15f8d9ebd3f11005bfa71a2d939dc066565a3c9fbb52434a889f648e8f56dfcf0f2a9532783f5add574c49a68c7da2ab7161e82a0a3 SHA512 593cab1b15eeb52b5f89f1f4975850e945b7c90b5c5bc5f27c508355ffce335a89193e73b060899ea8cce6ce716d25063f4fb5cfbef76b86e6893f6792d1d07a
+EBUILD gpsim-0.30.0.ebuild 819 BLAKE2B 9583acf4c5306855784abdf71ec8e7faea1900797313ab3795bc02840b74059d6a2db56db2862c0dd4bbd32188906e3132a84862ba525f072b80758409188c4c SHA512 e1a63b0a25e2e9812102fba99dd6a092b7daf568ad3d7e321b06bb98eff2a5a76cd36518d5f889aec0ca9fc07876bbcffa52958d9559c536e7bd44b4d6465a53
 MISC metadata.xml 326 BLAKE2B 894c44eb2da989117a768b9e03fb039b61b4246023c99a43c218fee73d3d6ef98d6e993ac8149266a6ba5fdf5288186e2cee9d4514d6919d66f463e393f78b14 SHA512 73998eee3ecc03e0b524a6cf1f4e4dc4fb670c75fc1c559dc3a1ed327f53ea282a5aca2516af93d1cbf2cc2871970f3b5377a6837204fca07c4ec17080077636
diff --git a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch b/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
deleted file mode 100644
index b055e01b0d8c..000000000000
--- a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gpsim-0.29.0/modules/logic.cc
-+++ gpsim-0.29.0/modules/logic.cc
-@@ -269,8 +269,10 @@
- 
- LogicGate::~LogicGate()
- {
-+#ifdef HAVE_GUI
-   if (pixbuf)
-     g_object_unref(pixbuf);
-+#endif
- }
- 
- //--------------------------------------------------------------
diff --git a/dev-embedded/gpsim/gpsim-0.29.0.ebuild b/dev-embedded/gpsim/gpsim-0.29.0.ebuild
deleted file mode 100644
index 018d9ffbbd81..000000000000
--- a/dev-embedded/gpsim/gpsim-0.29.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils ltprune
-
-DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
-HOMEPAGE="http://gpsim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc gtk static-libs"
-
-RDEPEND=">=dev-embedded/gputils-0.12
-	!dev-embedded/gpsim-lcd
-	dev-libs/glib:2
-	dev-libs/popt
-	sys-libs/readline:0=
-	gtk? ( >=x11-libs/gtk+extra-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-gui.patch )
-
-src_configure() {
-	econf \
-		$(use_enable gtk gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/gpsim.pdf
-
-	prune_libtool_files
-}
diff --git a/dev-embedded/gpsim/gpsim-0.30.0.ebuild b/dev-embedded/gpsim/gpsim-0.30.0.ebuild
index 7c6e310bd228..a14305e6a54f 100644
--- a/dev-embedded/gpsim/gpsim-0.30.0.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc gtk static-libs"
 
 RDEPEND=">=dev-embedded/gputils-0.12
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index 2c153f613125..eedc34678726 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,7 +1,5 @@
 DIST libftd2xx-arm-v6-hf-1.4.8.tar.gz 882724 BLAKE2B 4ffe647272467698cfe10a2ef201f8adb4bc991df517945ee8f057a07e55c4804bc4d541b6e2bd523fc4f6375b0a28ae7241fdafaed9eae61739d83d0327540a SHA512 bd07f57f9a75c2195aaf71ed1c229e04256a9c9a59f3d2e8f2111bef8a1c58c05457b5d04d7a8f77f9daf076ce3f0b77e317ff1cedce4e3cd4146422cd5cf634
 DIST libftd2xx-i386-1.4.8.tar.gz 891331 BLAKE2B 742be8418ac598b0c4b6b1e4be99a57c85e70310c2a15936dba3a765b0168eac37a080619ed92816a96f93106f96b812545d1cf212f5d6d32b03e5100870f6a7 SHA512 d66415b9ecdc2b38370c2c6b97e5d14c3891910ceaf5aee2740b2e893891c4f2ebf395960748d55508f4b63edd3d829d9c0020898c1b83b453496d18b4a85528
 DIST libftd2xx-x86_64-1.4.8.tar.gz 898269 BLAKE2B e491b58f66ec64014511469e7eb0a628e799ffa4cc52cb94ca66c082dbc56793e3435a80bde7433ce1bea96eea1a52461606ce78a9b2e447f3f9c5a7faef1f1b SHA512 b738b764bcebb5f93f5a968b266547b8775cbc72df8587bfcf67591ce95557b6a43dce2f5dbd9de451f8c9421ec41c25c8fb9bed37b76aec4cd5bac854d4af06
-DIST libftd2xx1.1.12.tar.gz 950540 BLAKE2B 6d55e8ff9b17a6b0220f5f4f3022c3495262b0ac47687ad9f28023c9f7b822f3956f2e42787edbdafe44ceea9b65b5ae687e2acb840f3e5546e5b2ac8a7ccec8 SHA512 afe0a8a7ccc47eb8888346dabdbfb41e182f7dadee7a57a1c4ffce544aebe5cab45c3e64de4ebeebdc0f31961617a79cbcf11dadfebde65ee79ca38e6234995a
-EBUILD libftd2xx-1.1.12-r1.ebuild 1055 BLAKE2B 89740f43be1692559b24924b0012765fc564b714eb5a0d656cd1f56191d442b5dd3fb61235799d2655d102882bba77e1c969abd5ced2b333b3362e620b3f6dc6 SHA512 81422f5732455b1bac7803707904fbb72297c7756d488af0f0ec20ca807065e8a8565ad02bbcfcdb8c714b2ca5e465b35ac35f4eeaeb90151b156cc406489b49
 EBUILD libftd2xx-1.4.8.ebuild 1207 BLAKE2B f3561a38eb0b0c90699bf15ee7654562bbe1ce6f07a7d29eb954b0e2ea83d7f695e6cc70f92ea48f43853e27506dcfe9749ae016339257a7c8f405b7276c7093 SHA512 7f7a756a678e636884170e05e740c01ad8690e5abab54dc1369ace56f0bf672994b970df86e3b61c612068240936b35aa48a87f756e6dad05809b34423b3f8e6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.1.12-r1.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.1.12-r1.ebuild
deleted file mode 100644
index 906b66ad597c..000000000000
--- a/dev-embedded/libftd2xx/libftd2xx-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Library that allows a direct access to a USB device"
-HOMEPAGE="http://www.ftdichip.com/Drivers/D2XX.htm"
-SRC_URI="http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}.tar.gz"
-
-LICENSE="FTDI LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="examples"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-
-	use arm && cd "${S}"/release/build/arm926
-	use amd64 && cd "${S}"/release/build/x86_64
-	use x86 && cd "${S}"/release/build/i386
-
-	into /opt
-	dolib.so ${PN}.so.${PV}
-	dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1}
-	dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so
-	insinto /usr/include
-	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
-
-	dodir /etc/env.d
-	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${D}/etc/env.d/50libftd2xx || die
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/sample
-		doins -r "${S}"/release/examples
-	fi
-
-	dodoc "${S}"/release/ReadMe.txt
-}
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
index b1c8628d8d1d..4865a70683d2 100644
--- a/dev-embedded/libjaylink/Manifest
+++ b/dev-embedded/libjaylink/Manifest
@@ -1,6 +1,4 @@
-DIST libjaylink-0.1.0.tar.bz2 53672 BLAKE2B 9dbe687b97e76bf4f928cbb8010af0fff95025d3989294b959c6187f0549e9f0dc495f88c39b57d0f98e34d8df2df0cb3bef31047208d4807588416a72401b9f SHA512 5b420c816809c4d2a458d2e28591a2e97bdc161c42ada12f6e0a1cff3490463c0cbef49ecefd8c1ff51e661345185e6087bfc12e259b20fab8b177bb4f3f4638
 DIST libjaylink-0.2.0.tar.bz2 59078 BLAKE2B 7928875248972bc00ec46511861e160491f7a53f729e0fbfe3a6d08335532fffc9e285e8a354a390037bebe696b6740bdc422164238947baf5e0fcf8f55c0dd5 SHA512 5a8c458982fdea2025aa3ce774d41cc58a283824dcd90a94531ee5e6ca50d9961b0ebb40a6dd3a97fdfcb44625437d685151560185449c3161fe399e0651da44
-EBUILD libjaylink-0.1.0.ebuild 683 BLAKE2B dfff512f28a66aa90e945d14006eccfb904e5238824fc2a2855427a233377fe18531b1aa80a3816c8ed4a20f24488c769a204db746774bd6646c8963c97be056 SHA512 f518a67882f6085d62a00a9a50a7cf21584a8ad7e54e7088896880e4ed0ee2781af5e5b3dde76298cb8b62e794d4f5c841c4ba625dba265845a14a1324bdfae4
-EBUILD libjaylink-0.2.0.ebuild 818 BLAKE2B 77f43249021e1d95a6a467215559baac294692867cab6beb4808051285cde3343e415af7a8c200abd9232ffa9bd703f7949a2133a541ef1e97124b1d3f25099b SHA512 8bbb4a8099ddfc337b6c44118f41dce51e5b86994217cbfdd3921fdca79e4145330f73c3a7fefc52e69ea3c7f1662b3f1b321cb7b18d8727ecabd812928527e5
+EBUILD libjaylink-0.2.0.ebuild 815 BLAKE2B 2f4e81cd2d7c27c181a8d0c9125c44e0904077bacb51e5abcae48b3223296d3fc77b530811e3f54de257319c0e6865cd1a5cc0480a9ba4be6f64dc8f8efb4025 SHA512 f287263f6a96df081506559f1fa4b1e6d43251131c5137ddee17b460452e5803752999cc5138945cab5eea4a1f5fa429e383922979e65b47aa9e80550a182f45
 EBUILD libjaylink-9999.ebuild 790 BLAKE2B 72c7377905e1b424d249bf18e7b1d46b09707e41bb70099d5811b7fc7ae72177e8eeb9d61827ee5653df64cc80eee20747e0bc5a9893d11f09406f77e3d8091d SHA512 68f0b0d7e3b8c06e88195bb008eadc710c193be68d8bea41c009c98dbb50e406e7c8493937699936433ee3f6cc6417c0ff823929b3290babbc8bec0dc8934870
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
deleted file mode 100644
index daffa2fb2392..000000000000
--- a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
-
-SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
-	eapply_user
-	eautoreconf || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
index c532bb87780a..b45656dc9095 100644
--- a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="static-libs"
 
 DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
diff --git a/dev-embedded/mspdebug/Manifest b/dev-embedded/mspdebug/Manifest
index a0607a439c1e..939f31c1bc89 100644
--- a/dev-embedded/mspdebug/Manifest
+++ b/dev-embedded/mspdebug/Manifest
@@ -1,5 +1,3 @@
-DIST mspdebug-0.24.tar.gz 329321 BLAKE2B 398fad64be73ab60d3dbfb37ee1eaaaaf478521c3fb4fd8bdf90918ea7d4d4be3d5426f803900032372eddcb2342d0002996436e62eca3cdba3dcd82a5ad2cd4 SHA512 443731defe48de0c5c16faa42855c31583c125edcd4c35fca7234556e7d5f8f1b12e0fabe2d07442671426d6e2a03058f615a0f1dc5b016c32b961b34c35973c
 DIST mspdebug-0.25.tar.gz 333878 BLAKE2B d2104e49d904a057858bd7c3b48977b57f9e315c2a188428af4d492560d0c479ae77302ec313da1a264ef47cdaf108dae13ac75e952b6fb23bbafb024c19283c SHA512 5eba1d4fa6773daa89cccd8eb1964a5dfd5fb5e6719769ab6241c71010aca05c43217a8fcb6bebe1c2d9f58824f1dda5787f27b2e119f0d086eb9ae40e7fca90
-EBUILD mspdebug-0.24.ebuild 792 BLAKE2B 156ab503c8f46769c8b69433ff5454e1c761042395f4fb849de71ef0e71047d770f0f11c177a19f295645286f9f0f0775911207436aee460232dfb1cc4fb18ff SHA512 c4391c50d629055abad3831ccacc1fe15ff574007eb0793b20f8409d7155c63b9415ab4e826e542211b991dfe073c74a7b0cd37d1fe90f4c75481f35aa843910
 EBUILD mspdebug-0.25.ebuild 792 BLAKE2B 156ab503c8f46769c8b69433ff5454e1c761042395f4fb849de71ef0e71047d770f0f11c177a19f295645286f9f0f0775911207436aee460232dfb1cc4fb18ff SHA512 c4391c50d629055abad3831ccacc1fe15ff574007eb0793b20f8409d7155c63b9415ab4e826e542211b991dfe073c74a7b0cd37d1fe90f4c75481f35aa843910
 MISC metadata.xml 693 BLAKE2B 931afca679ec2d1969213361c47e91823e7a406252263a41452c2367e8270014de2dde9d8e6f9f667427baf8c3831e0ce28c3250b5f51e43ad93c055a8571baf SHA512 f4eda70a367350a5b180534287e63fd7a5bc1e95a217d17ae9d08aed009dbabf2ccf44216f6616242c8e08dce3d38922dd18b3bcf55544406926cd5399729fd6
diff --git a/dev-embedded/mspdebug/mspdebug-0.24.ebuild b/dev-embedded/mspdebug/mspdebug-0.24.ebuild
deleted file mode 100644
index a4ff1ba9081b..000000000000
--- a/dev-embedded/mspdebug/mspdebug-0.24.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free debugger for use with MSP430 MCUs"
-HOMEPAGE="https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug"
-SRC_URI="https://github.com/dlbeer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i "s:-O1 \(.*\) -ggdb:\1:" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR=/usr/lib $(usex readline "" "WITHOUT_READLINE=1")
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR=/usr/lib PREFIX=/usr install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-embedded/pk2cmd/Manifest b/dev-embedded/pk2cmd/Manifest
index 5fcc63022e99..97f56765afa1 100644
--- a/dev-embedded/pk2cmd/Manifest
+++ b/dev-embedded/pk2cmd/Manifest
@@ -1,4 +1,4 @@
 AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 668 BLAKE2B e8d8f7283231ae231d7a5372b16cfdc28fe493eccf4ed85eafc995583c7a1ee7e8db4d1a0c58df0cb8e87f5bb1c82aed46eb05c275e51cf337f67a7e6ea9b1fe SHA512 f586c7eed0eac0d68e495d582c85c802c98ac8c84f7f21b00616edbbace74b877d21fd43334e5accfd02413d4a6d9d9811241feec1eaeae3a7647c745206d638
 DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 BLAKE2B b2d53763d5030341f13cb1bee534cfbed160ee4e4a839d5f900bb334f50a0ca52968fd8dc3f27e0fa8ecb47ad2b1d251881ed4646be41b5862e4fd0c452102a9 SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24
-EBUILD pk2cmd-1.20.ebuild 1212 BLAKE2B d1d5de21151d63f4fc0f17c59336631e93080b44ffef1e3b1e01e8e3ad1bbb5f2c010094b9c5f42db17de4fdc0ad8cbd6a542101ca5c96c64adfbd3700280227 SHA512 16960cfdb7887768008d8dc61d04b66cdf402852bee35542c93dab6d7b43c41dae4d4c8b80549d26b9801bb8df430bf982106219072efda4c20fb08919386358
+EBUILD pk2cmd-1.20.ebuild 1209 BLAKE2B a3a3edaa93a9cf4357c42fac2114359b7584cfcb683d052ed9d47ba6a5ffb210b852bc2d9912ca508215661da6ae80c5863bdc2d1198aa55c174502f4d83442e SHA512 fe954cf667a37fb9aaadd9901eb37f4aef9064c1993fa2826b74d20db07601f1f3080f9ea80619b9ea9da2d4c1783cd92649c097b6340dd119957fa4f77001e1
 MISC metadata.xml 249 BLAKE2B 79ce0a00edaba32d07719f0937fa67f6730756c17ac4ac307b35c78a7e8e61c138ef829bab0b2b4c26f6be62ba6cd898f2ee2eb8e94f7d7ba782480b9d6898ec SHA512 8d7016491c6a36350d1d036340da97c4422908902bafccaa257d9e82c4fc299914dca5ce3d938751c398dff9aaeb4e0f7dff4956e0c7344630d8e09282178a23
diff --git a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
index 24cfe4769c1b..a37ef5bd81df 100644
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="An application for working with the Microchip PicKit2 PIC programmer"
 HOMEPAGE="http://www.microchip.com/pickit2"
diff --git a/dev-embedded/smdk-dltool/Manifest b/dev-embedded/smdk-dltool/Manifest
index 744b5d3a49d1..084b8307b3ca 100644
--- a/dev-embedded/smdk-dltool/Manifest
+++ b/dev-embedded/smdk-dltool/Manifest
@@ -2,5 +2,5 @@ AUX smdk-dltool-0.20-add-S3C64xx-support.patch 2022 BLAKE2B dd30445f49c092181ebb
 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
 DIST smdk-tools-v0.20.tar.gz 5170 BLAKE2B c414938ff98155dd16f64378a5c3524bb2fd7e21b074cb6e656ffc2aa5b7b8cc8cbe27600472a8ef20570818e253f63f1b1460784200aaf0a4fb321f79b0cfdc SHA512 2b0fd113bc9e6e6c07ad4163d404bffa8044150a2da55a8903192b9dcbead5e31d97a9315b561526f0cb2a65e415f34941bea0db3ac40e73048901fe95ff3a17
-EBUILD smdk-dltool-0.20-r4.ebuild 813 BLAKE2B ec48e8336e15e9327d3cfb5518149b0e91c8ad684de65f263c1ba639fc4a9e9c0aedc6334b324fee4bef2a6b0030f4910534da0c707d86f3ca859a4bba0160fd SHA512 9b978e80e159eb802cc51d6b16f266f0eff3a0c41d16937d3704889e78bb4194cb8d4b4d6625b6fe7e3089737e663bb393689fc2c4aa9286ef48ae9c97f59614
+EBUILD smdk-dltool-0.20-r4.ebuild 841 BLAKE2B 14a1579fc834af1c66d1f67bc74999a8a7e389d2b9deed35d87e9766df2922f6590414c2f1957d05abb141ad1079c94ddf5cda8d981cf037bc03a97b3ed490b4 SHA512 7864ef6ebb6ee23c88f19e13ee4a77582a819f9c527848848284a58bba1f3dac55e6f184c48c3401e8b92e2075666309d68ea48b3970af1ef7e595f32bfe6b7a
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
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 ece10a6cf42a..2f9139eec71b 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ RESTRICT="mirror bindist"
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/releases/smdk-tools-v${PV}/dltool"
 
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
index fd20dd5b45e5..3e6430d895db 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -1,4 +1,4 @@
 AUX srecord-1.57-libtool.patch 1733 BLAKE2B bf3e3758ba00e01a7a2325a3d23f500055c9e4f01299e9e21e42d6516fce3055c49f28bb8384fe186ac6111d75d6f6e689b6425368182576d13f68ad624ea0c5 SHA512 f4b9d701ac7b364f5f43dab835c0249d9d2f54903a371cdd9a03a63f082e4c93f15adc4cc9a39ccf5dd8feb56f579c2f96697c0c7b8d2730cf845ac477b20a83
 DIST srecord-1.64.tar.gz 942513 BLAKE2B 5bd4e8706f2499968930883e624b3dc7f8f061e8d697584b63a8792d111fd51e37b198fd81a81d8ede6f7eeb42860e83e86a0abeb0856e4cb5847d3db2d30382 SHA512 f96f2d9cd2c475d040c0474a35a17ebca2f0fb737856cdafe1227758a3e52176e4ab3e8577520c21e75e468d74fa98695128c02120734b6e92d8573e76af50b3
-EBUILD srecord-1.64.ebuild 771 BLAKE2B 46236a06a24a9d33f337a4d1cd8daee4642480d43d099d316afc5835f00ed97bca15ea63f517d696e2bce9adcf6aec86143c7e6dfe2e5be62b09ac4434516f8a SHA512 c5df2fa4b2ce42c838eec8fb783b44953400476405445035fd56535a782e9dcdfec486baa2c3d557b4a96efad55a7e4eb7eb69d18927f13589c41eeb04a7969b
+EBUILD srecord-1.64.ebuild 764 BLAKE2B 0be042d30598477707dafbedcddc2ba559cd1c3efbc97bcbe5817b9a5643a56d6dfefec5e458c224b0d4dd4e48ac4ca8982946da594d46b4b25e288ffa8ac941 SHA512 2e1d52c960589a10fc4923fc37a3a7fb1c318f8a12204ca9dcabe9114c9bee11ac2ca40d580095e87af724ea14ab5538bf0be41478980abce526bfd3de15ed71
 MISC metadata.xml 328 BLAKE2B 1bed15dd3f037adb21a98a9e59a02b8f724c961ef781efff8a3fad95edd528f6905e3e980a35cb377f11f5e2f7d52496ee2b7026d23021f1df0d3d0ccfefb31b SHA512 57604381aa2cb030c59c4177ad35fb90620066a791b5d157ce7ca2ebb90320fb17d343b9dbb16633efc6961fc89089604b5e8e9aac16583249527b0a92577944
diff --git a/dev-embedded/srecord/srecord-1.64.ebuild b/dev-embedded/srecord/srecord-1.64.ebuild
index aa0bc2110688..a6d41e526bcc 100644
--- a/dev-embedded/srecord/srecord-1.64.ebuild
+++ b/dev-embedded/srecord/srecord-1.64.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools ltprune
+inherit autotools ltprune
 
 DESCRIPTION="A collection of powerful tools for manipulating EPROM load files"
 HOMEPAGE="http://srecord.sourceforge.net/"
diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest
index a70e9ad4936c..7f474810bb50 100644
--- a/dev-embedded/sunxi-tools/Manifest
+++ b/dev-embedded/sunxi-tools/Manifest
@@ -1,5 +1,3 @@
-DIST sunxi-tools-1.2.tar.gz 35378 BLAKE2B b5acc24e2951ab1960f153023e47da650db90507f742ae0607a6b693b063e4e531212f06f9c92798c59745938cde4df46540abb1ed16bf1690b9facfa205522b SHA512 bf050e4c9a338ad0b128f455a415904107efe54878e831074373b20f727a4cf9700a7b4ad73a5b21c91a1f41b588ec35070b54671c01c8ab81e0c340c299a2b1
 DIST sunxi-tools-1.3.tar.gz 52608 BLAKE2B e8c3ed7276f705273598e38a0cc469225de1ee4eb8177b78be63b78ebc584c4fdf2362e21b895f61b4c5e84df98bfd5ccf6d3965ffa9338c98027c9ce4635626 SHA512 954c95963013aee8a38b3583ba1b7ec7e7049c7e09c5fa9ec564dfc33f304d3669fdf68c2fa5e4b5a6265640a3d1ee8bc13bcd71d804c714884b6a780d193615
-EBUILD sunxi-tools-1.2.ebuild 621 BLAKE2B 4661e894651a4c5ff072dc65b1c2a914eea92b68a29a427fd20e63ff79eb56be75923df7989bf0ae8f66908ed65ff48380344e01139764d441e10d4909c729fa SHA512 5b66c660a11b090d1b59be6a15ebbe90a3295066da4a3826d7ade9e191950352371181fe528fec4f8aa08d2e1502d4eb4016e6c3817060650b2470ff022eeeaf
-EBUILD sunxi-tools-1.3.ebuild 723 BLAKE2B 42a831a3e66be96cd0bed7b92b304d8cecd70ee242a85c5cc2f4a5d3fe67f38c1f6d13215e7d61398d4f79eb0c71dc75154e30ba3af5aa613473e6f399deb06d SHA512 df9debd93ef5acc28c44b59768b15d0a30c10debad644521b35d338bfa84b8ed56b7a4e7ab6294399da20d8a3364c03098d77e774bc773d6472eb7e7565be8ed
+EBUILD sunxi-tools-1.3-r1.ebuild 713 BLAKE2B dcaa09ca036ad434e1763ff3a80d463a986c8cc49c66b471b6e5eb4b665f18856d2bc0bfd8e390ec8dd3e1255605197aaba5b641b3e6a5431dd4339f51862236 SHA512 99ff493ba000a37d3e29151fe254cf2097104cd66cb7720493c5a2da4d9942b7cb6e726075859f376cab72f86ab8e1e342b3539d233bed6cf4b777feb825ce59
 MISC metadata.xml 445 BLAKE2B 7f48b3211e92049eed919e01c66b1426af951ac66112e24d93a0966aaeae8f5fec6c5cea6f158f555783007d0bbf59527bab559bab6ec499f8feef0308f032a0 SHA512 9b27e2b262f1401c49d75e0ea2fa03f91259da53a3a9ee2af54e5963471b3ef605d12ec3486752e89dd77c7721f49ab0fa0ac9705ff0a65b9875b6552dae50b3
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild
deleted file mode 100644
index c332d4dea74b..000000000000
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_PV="v${PV}"
-SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Tools for Allwinner A10 devices."
-HOMEPAGE="http://linux-sunxi.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64"
-
-DEPEND="virtual/libusb"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" all misc
-}
-
-src_install() {
-	dobin bin2fex bootinfo fel fex2bin fexc nand-part phoenix_info pio
-}
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.3.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
index aa263865c0de..4a73a61da176 100644
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.3.ebuild
+++ b/dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV="v${PV}"
 SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 86241970e5f1..a49881228f9a 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,5 @@
 DIST u-boot-2020.04.tar.bz2 15065656 BLAKE2B 29cf8be6027ce46e3bf3fae9b6736e6aba46dba2904112f845d79f50b52b7c7ff3437c71dac6ab22d112347467fb5baaa3ec421cb842ba3ae9b547e4f8378d03 SHA512 e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8
 DIST u-boot-2021.04-rc2.tar.bz2 16620315 BLAKE2B e16c167346ef3999443855b9a702bf28faacf51b7887c84096f7a372a0c820d6ed9f06c1dd209b4070adf8000853b58b7b9b81c5b32a973d37558acf1da2edfa SHA512 7bf07f15e0c5f5e63ef8cb9568278ea7c209e484bbb599c47b22a8d2e5c007cc204eec365e5328dea3e7b016cd6ba0cb4c917330cc76163b1016f7c7762ad1bf
-EBUILD u-boot-tools-2020.04-r2.ebuild 1455 BLAKE2B 7c7508400679596a57e31fd05549f75e3a0b776192d57a3e9fbfa544abff839d4a1daa75ddb084f4c682b166f6526c921301723cd0b922662ddcf8b55aa58109 SHA512 42fd08e063172d4320c7f04f075baf005da547d4bfe8d09b2effd7e8c95a26134925b86c9900e401e8177f44a2ebff6d10efe1d9cae3a7244ca620803adb923b
-EBUILD u-boot-tools-2021.04_rc2.ebuild 1507 BLAKE2B 9a245219b22ff73691303acd59d5c211dd8bfcadddd6f14c649be5d6285cb760b3051ac94b5bb008f0e93d34bd120ce8b777e9dd52383bbb4520544403034891 SHA512 f649b15a78cb7b4a193e7ff8b000b0584b5995c1dd2fab0c47da792e710be4287a16909027c42235f2f18387ead2aeee1118ce787035220c7a80564855ba6f1f
+EBUILD u-boot-tools-2020.04-r2.ebuild 1474 BLAKE2B 12ad0a7c69c0deff7186d8fdb95dcfd83891586f73cf3644c222fda42580c1b6e15892150178c011818d039d7d9cfc90f32154aa669c9c6731461a8500e4ffb5 SHA512 a1a5abe2b414d75e9570bad5e59b8fc1a45ceaeac8faf93e5994be36001792b7e9bd99b6dff9454c610217dc0b50adabbb0cc0c673232377759d04a5ec741c3e
+EBUILD u-boot-tools-2021.04_rc2.ebuild 1526 BLAKE2B 0c50dbe2e4925049305a9c8a9493de162129a3694a77985ec815f829ff0c1e95016da442b1b5dc147a6d5dd88c8b25d50de01aa7779cb90a3b3ea96c2be58f07 SHA512 2428ab8614ea1a5c8f38ec82fb03c4db7a82b52e94e2ffd22c5d9f5251dd0b1a225992df3048fd17e1d9621a675adb933df829649b508a26afe33baf7e97fd96
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
index d387a3bf6e79..161bcfbd7fc2 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
@@ -18,6 +18,7 @@ IUSE=""
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
index fac11bef4161..fe9f799ed944 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index 1da1baedab10..231d7e791ccf 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,6 +1,4 @@
-DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff
 DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
-EBUILD urjtag-0.10-r1.ebuild 1068 BLAKE2B 5a9566d2fcf63d1cdd3bbabffaf166a3fc76ce1e4d7a0aad82593502c86687e5cac2a7a0ad73f34e37d9124dcd2fc421e5de8ccff404f614ceeaec6b66df31ea SHA512 0cd41fcccf30f89fb310e5a95e86d9fa69538baf5a53658b09fe023b8631c0f203d5f60e9d06cf663416139978bfbd7a907258b1b728ddda01175fd02418fd37
 EBUILD urjtag-2019.12.ebuild 1147 BLAKE2B 3d9ba4538f8e6c5903baee8df72caa0d9bf3471f4dae55b8c825cb2147e1294524433fea5d0046f0949e9c5fb0811224b1b80415fbdfde6ae418cff92ffebf85 SHA512 85979daea74b637a6f3067e4ce5cc6096fe2d5a0517f55ad1a1b079455a9d66a78044ead3036de0e53a6060358cf96a62d35bc66fc509769a4c4b445b8c4c732
 EBUILD urjtag-9999.ebuild 1081 BLAKE2B af03442b0e29f3e60b73ab4edbea83f258b916b9abc57e555428d2f9a8f307a151703442bacb2c947e0069d15cc34f1ae0818ddcb1dd9609660cb4ca8dc414c5 SHA512 e8171862ad821fd5157b1653267ebfb41ac2a88e733f1e251cd51700356510526d9d8f33a5200473bcf0114cb8fe805e87820b55ca810eb08882818bf82b2217
 MISC metadata.xml 540 BLAKE2B 5cace8526e0edb053bb7b56bed518d237eb0c16c1eb94a6ab136166a09631a9f005a7f60404fb6dcf6cedb8b69e367da028b51738f5a06e7a836cb0d22a2a066 SHA512 cb3523611ffcd7e007e06a630b1299aa610511ef20073c5e8a8efada52ba58ff34fcf2ccc4c04f51676e224b3d2b388a871995499fda480c0d51dc063a0777ce
diff --git a/dev-embedded/urjtag/urjtag-0.10-r1.ebuild b/dev-embedded/urjtag/urjtag-0.10-r1.ebuild
deleted file mode 100644
index 873826e374d7..000000000000
--- a/dev-embedded/urjtag/urjtag-0.10-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: figure out htf to make python.eclass work
-
-EAPI="5"
-
-inherit eutils ltprune multilib
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
-	inherit git-r3 autotools
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc sparc x86"
-fi
-
-DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="http://urjtag.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ftdi readline usb"
-
-DEPEND="ftdi? ( dev-embedded/libftdi:0 )
-	readline? ( sys-libs/readline:= )
-	usb? ( virtual/libusb:0 )"
-RDEPEND="${DEPEND}
-	!dev-embedded/jtag"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		mkdir -p m4
-		eautopoint
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use readline || export vl_cv_lib_readline=no
-
-	econf \
-		--disable-werror \
-		--disable-python \
-		$(use_with ftdi libftdi) \
-		$(use_with usb libusb)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest
index d0dc5c06878b..8c1c4bb1b340 100644
--- a/dev-embedded/usbprog/Manifest
+++ b/dev-embedded/usbprog/Manifest
@@ -1,4 +1,4 @@
 AUX usbprog-0.2.0-wx3.0.patch 919 BLAKE2B 7cf2d5fb2caa18268df5e09264e5263763777e4d671bc47f42cb067de987639d62c25e09cd7a2a697f4fe1bfe5513c1ffa669aaf8d6b6d1c5ae8293563c26321 SHA512 30aed7a7ef1ef04133ef8555131604782f50875c307884781314d3448e57ee1eb8e027a27f72f3fa5cda830a0f422437534968d0189c115927593865ab325164
 DIST usbprog-0.2.0.tar.bz2 4388629 BLAKE2B 39f9408523757d3627d727b45f15dc23176619f5aa17d4f8640282d56f6d3e02b729617d5c31de573afb0518706f752d33a6458efdbe1f589d2734a9c95016a2 SHA512 b670da8c578b5afc5e0909e4e961468f6e2f54fe00c2061a21e8c88018c5fb40679c728b03dfeaf1a18f1b3fd527af4e1ceb563b922adb1f38fbb3a07a4b2216
-EBUILD usbprog-0.2.0-r1.ebuild 889 BLAKE2B d27571ea2729343b8284f326da257f00333e5a131ccc6b39a10891c9370a3e012f9918f24ec76c14406dc09e7fba8fa3a5de6ae24e8dbfc884d1b6a4fb04e502 SHA512 d3592d8eb15869e34bbb35ac9ae2eb9389bcf3745f7feb210fbcb36b0773791bc7c8b0126efd5c1ed0530dc434c1026a361ca74b4b49847c0722a3ba4f56b1df
+EBUILD usbprog-0.2.0-r1.ebuild 804 BLAKE2B 83b089712f2539e884313fc5a79a41bccae18027152d28ad6e48dbdc19b97a16e21e935a308b8e5b0919c7f68811d92deb9f36e948d0d48c7d9129aae5940255 SHA512 c53f8e4f914a966ebc1a646ebd554b4149231d4000d8b6055d2f4c79fb58233c6a544dc6046c8b16035f422cc0b6fc1e06380b42e5bf0d76a13322dbbe08a641
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
index 6af020d73390..f441cf218e4a 100644
--- a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
+++ b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
@@ -1,44 +1,41 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-WX_GTK_VER="3.0"
+EAPI=7
 
-inherit eutils wxwidgets
+WX_GTK_VER="3.0"
+inherit wxwidgets
 
 DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
 HOMEPAGE="http://www.embedded-projects.net/index.php?page_id=215"
-#SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs X"
+IUSE="gui"
 
 RDEPEND="
-	X? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	>=dev-libs/libxml2-2.0.0
+	dev-libs/libxml2
 	net-misc/curl
+	sys-libs/readline:0=
 	virtual/libusb:0
-	sys-libs/readline:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wx3.0.patch
-}
+	gui? ( x11-libs/wxGTK:${WX_GTK_VER} )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-wx3.0.patch )
 
 src_configure() {
-	use X && need-wxwidgets unicode
+	use gui && setup-wxwidgets unicode
 	econf \
-		$(use_enable X gui) \
-		$(use_enable static-libs static)
+		--disable-static \
+		$(use_enable gui)
 }
 
 src_install() {
 	default
-	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }