gentoo resync : 12.05.2022

24 files changed, 270 insertions, 494 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 88ba981a39e9..3a3047a889ec 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 0982df92150a..eb16bef312af 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -3,11 +3,8 @@ AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014
 AUX libftdi-1.5-cmake-cxx.patch 1448 BLAKE2B f43c592cc17481e21dc1b0fe4a4cf583c3b2f192197133443f90dc1f9bd134fe903598dc9d12f92a8376bcd58f4cb698b9bd34ff4c06cf2df180260d2456126c SHA512 9881153611aa75dcc53f739bd510898f55d9fc56a07cec41e09fed37768c462663160d8491f7eaaa5dd7bc8935d36f33379d3529cfe355a3391507415a9e7cae
 AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
-DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
-EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B d8ab414f3cb68b292a278e255539a0d9405f28cec65f9e2dd987977546e165c755ef016bf73cc82f8d3902af8ebdcf96b7f7249f1522a2070f06ce413ea1f30e SHA512 7fb88f7af1926878f39bada106db0027bde6e664b858be06eb76021b7e5ae497e6bd708f0c47a4eee0c966cc9810384312e3f365095b2d2de0016c611b5c7a0a
-EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f
-EBUILD libftdi-1.5-r2.ebuild 2114 BLAKE2B dbf8580b54472c409190380262a20411ce7ffa5240378658822e4a6f775d34324af8295487363c06d460d8fb492860b2c58ef6d5cdf0277f82f2e95e212e9c5c SHA512 06e30bf4d68716f18573c4ed2797252dba1cb7bea1341b4541e94477d1e80d3d1afbc5df42455b8c908b7511bf1f3235673a37085f7ec3d6db971c2fcd48e6e6
+EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B 4f05cfeed6c13b4f5c8e28a084aed8066ade89c9540eafdc985b92b3e0d130547760695e1beab9420d1f1eda701c40c59e548e91b4898d69eac835d7b883326d SHA512 01c49655a48494976bdda22045a22ed8c3d3ae6747cfb3ef9a040e032925f3e3a4f4d4fd36de80db226d7c9fab43711e2ec4eb71c03a2ee5c8371fb45ac9fbfe
 EBUILD libftdi-1.5-r3.ebuild 2159 BLAKE2B 37f16150cdfbd9062e68159db7ba60b349aaac2a528114c3fd021ef0fed9ab2607a38818796ff984ef6dc8f30154ecbe281200f53ac835812f4ff7653255547a SHA512 01ee27b0c73e71c7cffb2e939415563265717784e596f111b7a5e7d35eb78cb5d06a0ffe4c574b1e53217f2c35d3c24746172f128fff876709439c60321f5057
 EBUILD libftdi-9999.ebuild 2071 BLAKE2B dfc52ea7939a177867d14e6ad201ecc1432696018e79342b1ea1ede35985aa9d0a0a19ec14db8bc80f5f20df8f9e503e24cc2c207a336d2658bce4e8998d7e07 SHA512 f1d12721f6a0c1757ee96782c114a7de4af502a46b039ba04ddb1c5d071d776ef92da39d4d6337cd4ae2818457baf32f2bdc3400936ef0ae18539de21258fffb
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index ebf844aaa8c5..c12bf68d6ff9 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
diff --git a/dev-embedded/libftdi/libftdi-1.4-r1.ebuild b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
deleted file mode 100644
index 9a39562ff955..000000000000
--- a/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	MY_P="${PN}1-${PV}"
-	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python test tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	virtual/libusb:1
-	cxx? ( dev-libs/boost )
-	python? ( ${PYTHON_DEPS} )
-	tools? (
-		!<dev-embedded/ftdi_eeprom-1.0
-		dev-libs/confuse:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFTDIPP=$(usex cxx)
-		-DDOCUMENTATION=$(usex doc)
-		-DEXAMPLES=$(usex examples)
-		-DPYTHON_BINDINGS=$(usex python)
-		-DBUILD_TESTS=$(usex test)
-		-DFTDI_EEPROM=$(usex tools)
-		-DSTATICLIBS=OFF
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use doc ; then
-		# Clean up crap man pages. #356369
-		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
-
-		doman "${BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild b/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
deleted file mode 100644
index e2753eafd084..000000000000
--- a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake python-single-r1
-
-MY_P="${PN}1-${PV}"
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python test tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )"
-RDEPEND="
-	virtual/libusb:1
-	cxx? ( dev-libs/boost )
-	python? ( ${PYTHON_DEPS} )
-	tools? (
-		!<dev-embedded/ftdi_eeprom-1.0
-		dev-libs/confuse:=
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/boost )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-tests-no-cxx.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFTDIPP=$(usex cxx)
-		-DDOCUMENTATION=$(usex doc)
-		-DEXAMPLES=$(usex examples)
-		-DPYTHON_BINDINGS=$(usex python)
-		-DBUILD_TESTS=$(usex test)
-		-DFTDI_EEPROM=$(usex tools)
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-		-DSTATICLIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-	LD_LIBRARY_PATH="${BUILD_DIR}/src" ./test_libftdi1 -l all || die
-}
-
-src_install() {
-	cmake_src_install
-
-	# Fix up pkgconfig files
-	# bug #766818
-	if use cxx ; then
-		sed -i -e "s/libftdipp1/libftdi1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdi1.pc || die
-		sed -i -e "s/libftdi1/libftdipp1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdipp1.pc || die
-	fi
-
-	use python && python_optimize
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use doc ; then
-		# Clean up crap man pages. #356369
-		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
-
-		doman "${BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index eb95cd304f3c..05f2c9823779 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,7 +1,4 @@
-AUX openocd-0.10.0-fno-common.patch 259 BLAKE2B f209b830242cc2f93faa1000c50805889b2abc7d99634302d48c011adad885137f86774740e4316300440c5c503729a6f6a89e941bf11e98b4f27e17d265bc47 SHA512 bc60476c74599bc6eae2d50dac7ee723732fb693923b487caae83475779bde31c2e71ea8b837fb0ca78b814ee8a2634ac2e887c91c3839425c5d980d61e49c7d
-DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
 DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b
-EBUILD openocd-0.10.0-r1.ebuild 2235 BLAKE2B 5c3bb924ad4f04172d3a6020c1c0463e9b3a0481b536c620a9217894ee35aede3825b6b9740a5ab8540d5b2c3f36068278d2620c8ae4d8c1351b9b877160f3c7 SHA512 9722e83dd2416b57a4d245d9eb88234efc175ce24d1b72bf2a7775f4973cf5c855f7981f3ccbdc3bc8529896a796f026320030154f9cfdf3b10fddbb1185912d
-EBUILD openocd-0.11.0.ebuild 2222 BLAKE2B 2ecc6e3f841a2a69ea7153ad69789ef465da3b9a00fb3cd2379627b1405d1c9eb25d668ed76e4611aa06b12573719ddeda506efaa1ea0708feec0374ecc6b9bd SHA512 5e49528012266d6e1ba2b231e023e3e20d50c8bff389796f471b709b37374619df528dfb8835f75d4e88784e907989fd47eb63784cd3b86e3d390340ea2eda46
-EBUILD openocd-9999.ebuild 2216 BLAKE2B c9963a550d494a58de3577a2d75635ba25234b243cc5ccfb99bbd1886a463c110de03a3eba880a8f9c9c1a99bbeea15b255b2a0a4d0f154b88b6d336bbb46c7b SHA512 ca57152b7c19904a31abd40ce7c3ac122be687d9eb5ce0d262940cf595763260a2485f43db4e2f31bcd9412d26cfcd4f633688604d49f7dc843e62f9eda1b898
+EBUILD openocd-0.11.0.ebuild 2246 BLAKE2B 12ab806fe2fe3c4ac1e659c39fc3fb63e3ce97d5cf99f7ddfc7f30ae5c4f91c2d3849989bbf8545bb5bbbfc32557f35247b37ee2b51c6f41f6831512844bdc97 SHA512 fb2b83dafe1a4b3383291e5542e76dccfadd30c8bc000f4063e48982467a8cfd1f4be79211e33b9e70867c32ae09f43ba71afa88d80c6424ade028834b8380bd
+EBUILD openocd-9999.ebuild 2215 BLAKE2B c836664ec2d196515f12f8bed1c2d1d0a14f43f44ac0e314b2023ca3d50efa10826c182cf73e2a123ce208cbf7a6f53fead6221c328b7cacfdc0faaddb71acf1 SHA512 43e78873a40ba0275e2faaad0b14c054d50cc929320560cb9eaa944a77cda9a589aad5de2110b32b2b19abea6b4cc36a009133ddedeef90fb3c6a7769e997fb9
 MISC metadata.xml 1086 BLAKE2B a44beaaa3151f1c84b11610cdae8e9319b8b6383f84fb4f4db3411b04455f9dd39af81a2804f2ca0113d395e618a2038530bfde97cf8e7546e41b62452c8c120 SHA512 747fca05ad33fc4d459726270f2418eca31e94c0841f57d69a6dc66de6b9dc8a80dcea0390f1e74a9f6262857080e2eebfebc08e79f75d5fd8fd7fc8f1f33c8d
diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch
deleted file mode 100644
index c924b2f8fec0..000000000000
--- a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/jtag/drivers/bitbang.h
-+++ b/src/jtag/drivers/bitbang.h
-@@ -35,7 +35,7 @@ struct bitbang_interface {
- 	void (*swdio_drive)(bool on);
- };
- 
--const struct swd_driver bitbang_swd;
-+extern const struct swd_driver bitbang_swd;
- 
- extern bool swd_mode;
- 
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
deleted file mode 100644
index 6c7a9d5bcfa7..000000000000
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="	https://repo.or.cz/openocd.git"
-else
-	MY_PV="${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="amd64 ~arm x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND="
-	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76:0=
-	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( dev-embedded/libjaylink )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]] ; then
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-amtjtagaccel
-		--enable-arm-jtag-ew
-		--enable-at91rm9200
-		--enable-bcm2835gpio
-		--enable-buspirate
-		--enable-ep93xx
-		--enable-gw16012
-		--enable-sysfsgpio
-		--disable-internal-jimtcl
-		--disable-internal-libjaylink
-		--disable-werror
-		$(use_enable cmsis-dap)
-		$(use_enable dummy)
-		$(use_enable ftdi openjtag)
-		$(use_enable ftdi presto)
-		$(use_enable ftdi usb-blaster)
-		$(use_enable jlink)
-		$(use_enable parport)
-		$(use_enable parport parport_ppdev)
-		$(use_enable usb aice)
-		$(use_enable usb armjtagew)
-		$(use_enable usb ftdi)
-		$(use_enable usb osbdm)
-		$(use_enable usb opendous)
-		$(use_enable usb rlink)
-		$(use_enable usb stlink)
-		$(use_enable usb ti-icdi)
-		$(use_enable usb usbprog)
-		$(use_enable usb usb-blaster-2)
-		$(use_enable usb ulink)
-		$(use_enable usb vsllink)
-		$(use_enable verbose-io verbose-jtag-io)
-		$(use_enable verbose-io verbose-usb-io)
-		$(use_enable verbose-io verbose_usb_comms)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dostrip /usr/bin
-	udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules
-}
-
-pkg_postinst() {
-	elog "To access openocd devices as user you must be in the plugdev group"
-}
diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild
index 263017ff35fa..1d898dd89d7c 100644
--- a/dev-embedded/openocd/openocd-0.11.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,8 @@ RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76:0=
+	>=dev-lang/jimtcl-0.76:=
+	<dev-lang/jimtcl-0.80:=
 	capstone? ( dev-libs/capstone )
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index f7d5c4b834cb..4212ec037aeb 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76:0=
+	>=dev-lang/jimtcl-0.80:=
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
 	usb? (
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 2347cd119736..f591e08699f9 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
 DIST platformio-5.2.5.tar.gz 254813 BLAKE2B 96911a64f8e73567820ef2c7b2297ed9e32c36c65c49572af6037c2666da4072bdf920dc31e8de7e07296eb7f1b407c47191d68a80ed212a9c351dfca604b408 SHA512 cf939254c231bb2cb97ac509175b7235a6a2ba447e55a2d9a59a9fe610656743c190f00cb7bfa1fc2e6b64487be7f02a193e2f270236bbb9200537f19175dc22
-EBUILD platformio-5.2.5.ebuild 2496 BLAKE2B 5f76581a4d3f25b5782111e8ddccf698f2192700817f1d4217fab83d54206ce22db4acce8af731f8ed9d0b47a38ce2ed984f12b23a39f5d52c90e6374e56e74a SHA512 20d19030b8f4373653df4185931bfe71760fbb5ce9fdd8772bd3717d066f7fc9bcd896a002c56d5ce61d642334a02313e66e97fa89b2d5898d75ccf390e43d53
+EBUILD platformio-5.2.5-r1.ebuild 2546 BLAKE2B 3b290185b67fa64ed7f0530a801577a3eac024c30801b6290aa843ca837335eb42d94e4f9e920fa3bb37f1f62372bac16d24a65a692bed480c784c5c5eb50e2a SHA512 add9d9d7cd52e142b2b9e54a6f6246799061430c81ee891ff361a633b4c9ac0113dd2144aebbcdbb3d9d9997db5f131213d6a1fe6a5ef8f831a733a0c5d07781
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/platformio-5.2.5.ebuild b/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
index 6d3c7cad5bfd..9c73bc3fd57d 100644
--- a/dev-embedded/platformio/platformio-5.2.5.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
 		=dev-python/starlette-0.18*[${PYTHON_USEDEP}]
 		=dev-python/uvicorn-0.17*[${PYTHON_USEDEP}]
-		=dev-python/wsproto-1.0*[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
 		>=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
 	')
 	virtual/udev"
@@ -70,7 +70,10 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	# Allow newer versions of zeroconf, Bug #831181.
-	sed -i '/zeroconf/s/==/>=/' "${S}"/setup.py || die
+	# Also wsproto.
+	sed -e '/zeroconf/s/==[0-9.*]*//' \
+		-e '/wsproto/s/==[0-9.*]*//' \
+		-i setup.py || die
 	default
 }
 
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index b5a5aa884070..61fbaee33c5f 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,4 +1,7 @@
 AUX ponyprog-3.1.2-fix-build-system.patch 1434 BLAKE2B 081198cca88c1650be783e8f2507c1d97ebecc5e493e99ccfa2b462bb4ae0d51752b1b5b1a549f5ec1c350bd6b7f01b382ca6471ab1cf3f23fc019807290fcba SHA512 2b4529152ed3eb61ec453b32397a1751a788c7709d03a7df51331986b8ccfdea0907c8ddb8ee79cbbd96efa7b075e2b9ef528b3900f897a2ae5e21f40403d9c4
+AUX ponyprog-3.1.3-fix-build-system.patch 2321 BLAKE2B 88f510b03611ef6f484611bb7759bcd9d40c831247c52bc07a00642e7d8e3c0ae0b09b1805d2b8f8f8b1820ff2ff0c54755263a7f7271b405c8b802845b71859 SHA512 2932745c7b6932a3d760ac09811f4966b6231f18842f15ca444831872e97ef01f4055df3bdfa9338522d10f4c4d4fb026b951b8fa7729849f140d54cb4f44c95
 DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
+DIST ponyprog-3.1.3.tar.gz 11479313 BLAKE2B 56704b28877687c356c72b1f28f28115cb11f40c701e207f5d3ec4aa4fa7194991162f0940400016d9ee5d42ff0a7e7da5b252f9b76417d0d8272638989fedec SHA512 09e702f3f98e65799e8c59b9c8eca6f477db3f36a2648a1fab3797f91d56c7c4e9533e32bef1fe4c641512e31828a39df4d3d83639b7541714a3cc9050cd4e67
 EBUILD ponyprog-3.1.2.ebuild 1054 BLAKE2B 3f2d835c365d8c104ff2a70e8474b016dbdb88cdaf3e82eeab55bf4c03c8309a92658c2e07ed1bc72be76fccc2e8d53cbfcee4eb8b44f8c6eba7858cd4f3b3cb SHA512 57edcfd0bfdcfb71f5e1edbdbd846a7de830adc0ad15d4cb77a09db7bc4d92eb699e3689581a8aea01077a72c6fbb591deec7151b71928d3263ef75e3d4a52e8
+EBUILD ponyprog-3.1.3.ebuild 1074 BLAKE2B 23797e8868a8e365b69f288a46ff311ceab41e88c41b73bda997aa1f4a241e397b081e9ebd7eccea187928c7d2dc2d725880b3502be053d2d4fea6d276b093da SHA512 be97856d8a038e415bd9711a4857ad955ee9d54359f47b4c0194c8e61dccb3bf0a1d4c88c1d5d91153ade817a48b77e23d0064c35d772e2f8d01ec6342f2af17
 MISC metadata.xml 385 BLAKE2B 0fc7287b04632bf56f76d6a8f98ce3b9463eb6db2feacbf11df5f21e17f8fc632bbeb3992f5131ab984bebcac05c29d8a29053fa3be045899a5433e866565ab1 SHA512 d6af66fab5ea0bcf476e802fceaf685d3e3e1beee10a429cb47b56e56245d980b6120d3b6cc0d00a36d033675b0a4b7e8a9ba20fd60a6e944557a7dc90400b3c
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.3-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.3-fix-build-system.patch
new file mode 100644
index 000000000000..acff26538cd4
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-3.1.3-fix-build-system.patch
@@ -0,0 +1,79 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99e6ff1..d80dcc8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ PROJECT(ponyprog)
+ 
+ # Configure CMake ...
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+ # CMAKE_POLICY(SET CMP0003 OLD)
+ # CMAKE_POLICY(SET CMP0015 OLD)
+ 
+@@ -46,14 +46,7 @@ OPTION (USE_DEBUGGER "Include in binary file debug information" OFF)
+ OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
+ 
+ 
+-IF(${USE_DEBUGGER})
+-  SET(CMAKE_BUILD_TYPE Debug)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+-ELSE()
+-  SET(CMAKE_BUILD_TYPE Release)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
+-ENDIF()
+-
++ADD_COMPILE_OPTIONS("-Wall")
+ MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
+ 
+ INCLUDE(CheckIncludeFile)
+@@ -239,11 +232,12 @@ SET ( MOC_DIR temp )
+ SET ( UI_HEADERS_DIR temp )
+ SET ( UI_SOURCES_DIR temp )
+ 
+-ADD_SUBDIRECTORY(qhexedit2/src)
+ ADD_SUBDIRECTORY(SrcPony)
+ 
+-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
++find_library(QHexEdit_LIBRARY NAMES qhexedit)
++set(QHexEdit_LIBRARIES "${QHexEdit_LIBRARY}")
+ 
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
+ 
+ IF(${USE_QT_VERSION} MATCHES "4")
+ #     QT4_ADD_TRANSLATION(APP_TRANSLATIONS ${TRANSLATION})
+@@ -312,7 +306,7 @@ ELSE()
+ ENDIF()
+ 
+ #TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDI_LIBRARIES} )
+-TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDIPP_LIBRARY} ${LIBFTDI_LIBRARY} ${LIBUSB_LIBRARIES})
++TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDIPP_LIBRARY} ${LIBFTDI_LIBRARY} ${LIBUSB_LIBRARIES} ${QHexEdit_LIBRARIES})
+ 
+ ADD_CUSTOM_TARGET (tags
+     COMMAND  ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
+diff --git a/SrcPony/e2cmdw.cpp b/SrcPony/e2cmdw.cpp
+index 252c730..cec93cc 100644
+--- a/SrcPony/e2cmdw.cpp
++++ b/SrcPony/e2cmdw.cpp
+@@ -44,7 +44,7 @@
+ #include <QMessageBox>
+ #include <QDesktopServices>
+ 
+-#include "qhexedit.h"
++#include <qhexedit.h>
+ 
+ #include "version.h"
+ #include "e2profil.h"
+diff --git a/SrcPony/e2cmdw.h b/SrcPony/e2cmdw.h
+index c349bf3..df47206 100644
+--- a/SrcPony/e2cmdw.h
++++ b/SrcPony/e2cmdw.h
+@@ -57,7 +57,7 @@
+ 
+ 
+ #include "ui_mainwindow.h"
+-#include "qhexedit.h"
++#include <qhexedit.h>
+ 
+ 
+ 
diff --git a/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
new file mode 100644
index 000000000000..ae75c85ebf41
--- /dev/null
+++ b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+DESCRIPTION="EEPROM and microcontroller programmer/flasher"
+HOMEPAGE="https://github.com/lancos/ponyprog/"
+SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>app-editors/qhexedit2-0.8.8_p20200625
+	dev-embedded/libftdi:1[cxx]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	virtual/libusb:1
+"
+# blocker on libftdi-1.5-r2: see #775116
+RDEPEND="${DEPEND}
+	!=dev-embedded/libftdi-1.5-r2
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+
+pkg_postinst() {
+	udev_reload
+
+	elog "To use the COM port in user mode (not as root), you need to"
+	elog "be in the 'uucp' group."
+	elog
+	elog "To use the LPT port in user mode (not as root) you need a kernel with"
+	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
+	elog "rights to write to /dev/parport? devices."
+}
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 352d97a84a17..90068d09fd91 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -1,14 +1,8 @@
 AUX init.d_rpi-eeprom-update-1 394 BLAKE2B 4a42ba2bca9f1cc646f2b39f33f1752a34b62ee01234a595d7d11c32507b92d2cb6909d739f4deda9381222596278d5e7e4faab60933f43d01a4be0df2f0f3a7 SHA512 1a88b1e73b2a40f644e1b37cc89a1a32d8ef25d0e09ee8b7dc005f0a834ec20a66e029a0a6a7d7d4e8a3066593bb277800a464783c2bf2e5923a71d4416b5eea
-DIST rpi-eeprom_11.0-1.debian.tar.xz 10248 BLAKE2B a83230dc13ce296963ed206725d465a69536f5cd23f52076fda2601ceea06354f365e1f8b2d9a93a4396826b5e9d9ab5ad40fd6336116e693419fd3b4630b5e1 SHA512 939fa16fbd8c21340ca77cc74f3cee22772d25cd6dcb70c178d70c1762ae9b9acb9e7a070b2c3a7f114841712142284c1f2bdb23fb528a229507d8eae6477c84
-DIST rpi-eeprom_11.0.orig.tar.gz 8075596 BLAKE2B ccbd895de728566bfb0402c2378f6eb13f88948490e14f1e251f6440f3ef31879ea66c0fe94761e1abf40a23924742e8c2f33c49200e710542131091b223b292 SHA512 0ea2971b752a53a4529b2c3d3b814b9e743440397f8c4d21c9a06493561a37bc8cd8c0adaaab389f41b1697584d12641f49d7a93d6541f9dda3bba5d6dd1371c
-DIST rpi-eeprom_12.5-1.debian.tar.xz 11808 BLAKE2B 82eccb61fbac25c9f20343ebccd4571fbc0c3df0c2388b92474f2a9ba042c6da8dc26ed21dffbf2a81be7c10561cffacf8ed80cb63435b28632cba9d505363bf SHA512 33581d017f5817202f7fe62e89f1a09c25ff63b30a11eb61fc08dcba4a512332d9dc32d6431240981e9690625e76d7cb9a3f601ef59cc1a3eba222c4d3c64e81
-DIST rpi-eeprom_12.5.orig.tar.gz 13662998 BLAKE2B 6c3937f4c4a950c6cc78285134bb8ee0b5459e9c9ba39ac020c6cd5e0b0bb6d6647d788c81ff1d639a87dd825d8b5fcaa29318f63823e56f6884ec4ce9a52361 SHA512 82608eee6106380b09657d729013e953f50bba2a45084fb9d38238142505a4f51f1f7c586dbd10a29e79b02d0b82670498f3dae16e368506a8187f1076d790fc
 DIST rpi-eeprom_13.3-1.debian.tar.xz 12768 BLAKE2B 823b1f25cda98cb2888b6b423b6120f5c1474735c58933ac11fe9380fa31fcbef260afb2ebcced423301bee207c171c5ccea3ba9c8cc4dae579c2dba55a60cba SHA512 0b8e15b1c827506dcdf7a6f19acd1ceb32f0901b9c438994af7f1e38a0ced05b7f123225ae8ecca4147ce04e1d7500ddcdfaeddeb90f0342af2dee9e4ffbfe04
 DIST rpi-eeprom_13.3.orig.tar.gz 17497524 BLAKE2B f65fc9b6a98dd3a4d3f4095e03279d832a64d0f12f9edd7e7af2b8afe8b290f4db6ec39e755df9fb5b317930235bf1c7205be4b3f838f6cbbf92e1d80574b342 SHA512 d5885444fd90a5f24c94a3af4f093744f4a63947a119059c851cd6639e572138205a48f7cd126c3deafe104e76985197e1fa36c8aa72a16bb173f11750b85151
 DIST rpi-eeprom_13.8-1.debian.tar.xz 13232 BLAKE2B a5c4a12eca86a5f44c6a18e06c3108a353adca055facd80ced42dfcdd518508358823bd31ef051b29dd47e46c59f056c36dc6628144c192eec26c57fc0658095 SHA512 dba8342af463a9d628a1f71dd30df803699a858873dc618a25aa4be682e5357d090345346ff686cb2c1bde7ad678362bf138f952115f186c841414354066a291
 DIST rpi-eeprom_13.8.orig.tar.gz 19328304 BLAKE2B 0cc9fcb2f30065494d8d4d8fd22930ad0229a38f67f02aa091269a099421c6e2781135c2a71dc10b2992832b443cc44e782f2bda424eb11539d0d6d858635129 SHA512 24675a0cc10f6ffc2e170da24999f5310ade1585618adfaf763b8dc1784639044bfdb5cbe513c3369056bb90c482ee65cd518b4161c54c0641feeb132552b1aa
-EBUILD rpi-eeprom-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
-EBUILD rpi-eeprom-12.5_p1-r1.ebuild 3009 BLAKE2B 29ce9339662f1430deacaf551ae26a0f07373013f2eae4f1b25bcea109d81682ec4434831c8496329bbe7dc483319387263fc8784491d448f2cd0359e48e79f5 SHA512 587810a696f471c952303ea4c6c04191c9dfb3a87a2217180da4b3b8786101dc895c1799e69461829f469ed5c83771a9102c0119a1b644dab5b0927f674438f1
-EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3024 BLAKE2B d13f780b30e2151bb399eda15b04cc2c08ce2e6d40c35244e55d78d79bbcd109930cee42debaa6e196e85c4349be529af4bddc6f16cce3f7eaddf18c08ed4018 SHA512 fb0406cce406333c7323808dc57b8140a178f5a657a60c109459807e8e0c374c12a1044e3c6424ea46a309078ede2b34c84dccf3e058cc0501f67fb05c241821
-EBUILD rpi-eeprom-13.8_p1.ebuild 3025 BLAKE2B 3f9190ccf19fc65499d9a1b2837fbe3eb498d6a439a3dabb61d1553a0e7da1bb34e24d64f5bcfd1498fcd0b19bf087de5b6b8901f9a0b9ef2808f5dbd7914e1e SHA512 3a34415f6a4dc3d762f7366428de02a6631a67cf5f607b51c3db75f54b2b0f0b4a3d863df93e38e59453812eb867570dbc5a0ccc548d3240bba1f5010a27e078
+EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3026 BLAKE2B 76b1bcd3e824d4d34c1639599f6d37dc53842130521a1de54c0f12260da40837272dc6b35e5ca7da6b3e6e50e11006aa8dc91e914635ecad089265f68d7de743 SHA512 0da00c1a51eda6e769bd3d27fa6b2d42410b002a954261b3f7413bfa5419857e7224524182df35cd0c1f937b96b7bce54c300a1187dca10f8cec6ba277822c61
+EBUILD rpi-eeprom-13.8_p1.ebuild 3027 BLAKE2B 7491ef7745dbda801af04a3449274aa9ee178f286cceaf329a602786c9d8d4f2e357c1c0fa28c538b54ea3a9d20faa5b48fbfacffd2878ce2a95ace57e4bd3ba SHA512 9df6ec3e7ef1d147f056de129723685d186dbb498b7c1d60c039d14ef7d2d4183dc40a299376cc3123e15a652a09a3291b7ffd614c635dde908b211a726aeb5f
 MISC metadata.xml 596 BLAKE2B 075812117456e8457ad55e184a322ff86f8bc18a8470fcd52d63ec20e88c81db064ff5f6b023e7400d51d603886cb154a0a1485613cb326b8897f99c5c06c330 SHA512 9ebe09182734a60c3ed3a9e30b2cf9b9433f546e1f4cfc9d75b48813e61dc875b71593300e6bc628650cfbae49fc722713cfc88c8e0a387efe0dd6cca991fa2f
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
deleted file mode 100644
index 00133478d075..000000000000
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-r1 systemd
-
-DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
-HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
-MY_P="${PN}-$(ver_cut 1-2)"
-MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
-SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
-	${MY_BASE_URL}.orig.tar.gz"
-S="${WORKDIR}"
-
-SLOT="0"
-LICENSE="BSD rpi-eeprom"
-KEYWORDS="~arm arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-apps/help2man"
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	sys-apps/flashrom
-	|| (
-		>=media-libs/raspberrypi-userland-0_pre20201022
-		>=media-libs/raspberrypi-userland-bin-1.20201022
-	)"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
-		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
-	sed -i \
-		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
-		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
-}
-
-src_install() {
-	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
-
-	python_scriptinto /usr/sbin
-	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
-
-	dosbin rpi-eeprom-update
-	keepdir /var/lib/raspberrypi/bootloader/backup
-
-	for dir in critical stable beta; do
-		insinto /lib/firmware/raspberrypi/bootloader
-		doins -r firmware/${dir}
-	done
-
-	dodoc firmware/release-notes.md
-
-	help2man -N \
-		--version-string="${PV}" --help-option="-h" \
-		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
-		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
-
-	help2man -N \
-		--version-string="${PV}" --help-option="-h" \
-		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
-			up-to-date and updates the EEPROM" \
-		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
-
-	doman rpi-eeprom-update.1 rpi-eeprom-config.1
-
-	newconfd rpi-eeprom-update-default rpi-eeprom-update
-
-	popd 1>/dev/null || die
-
-	pushd debian 1>/dev/null || die "Cannot change into directory debian"
-
-	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
-	newdoc changelog changelog.Debian
-
-	popd 1>/dev/null || die
-
-	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
-}
-
-pkg_postinst() {
-	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
-	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
-	elog 'or'
-	elog 'rpi-eeprom-update.service (for systemd users)'
-	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
-	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
-	elog 'which release track you get. "critical" is recommended and the default.'
-}
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1-r1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1-r1.ebuild
deleted file mode 100644
index 2de339cb2ba6..000000000000
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-r1 systemd
-
-DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
-HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
-MY_P="${PN}-$(ver_cut 1-2)"
-MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
-SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
-	${MY_BASE_URL}.orig.tar.gz"
-S="${WORKDIR}"
-
-SLOT="0"
-LICENSE="BSD rpi-eeprom"
-KEYWORDS="~arm ~arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-apps/help2man"
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	sys-apps/flashrom
-	sys-apps/pciutils
-	|| (
-		>=media-libs/raspberrypi-userland-0_pre20201022
-		>=media-libs/raspberrypi-userland-bin-1.20201022
-	)"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
-		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
-	sed -i \
-		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
-		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
-}
-
-src_install() {
-	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
-
-	python_scriptinto /usr/sbin
-	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
-
-	dosbin rpi-eeprom-update
-	keepdir /var/lib/raspberrypi/bootloader/backup
-
-	for dir in critical stable beta; do
-		insinto /lib/firmware/raspberrypi/bootloader
-		doins -r firmware/${dir}
-	done
-
-	dodoc firmware/release-notes.md
-
-	help2man -N \
-		--version-string="${PV}" --help-option="-h" \
-		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
-		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
-
-	help2man -N \
-		--version-string="${PV}" --help-option="-h" \
-		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
-			up-to-date and updates the EEPROM" \
-		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
-
-	doman rpi-eeprom-update.1 rpi-eeprom-config.1
-
-	newconfd rpi-eeprom-update-default rpi-eeprom-update
-
-	popd 1>/dev/null || die
-
-	pushd debian 1>/dev/null || die "Cannot change into directory debian"
-
-	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
-	newdoc changelog changelog.Debian
-
-	popd 1>/dev/null || die
-
-	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
-}
-
-pkg_postinst() {
-	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
-	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
-	elog 'or'
-	elog 'rpi-eeprom-update.service (for systemd users)'
-	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
-	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
-	elog 'which release track you get. "critical" is recommended and the default.'
-}
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
index 17798d332728..de2223baedb2 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-r1 systemd
 
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild
index 12e3cb37f8e8..262839cd17ce 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-r1 systemd
 
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
index bcd233dc98ba..6e7ed1e5e353 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -1,4 +1,5 @@
 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-r1.ebuild 864 BLAKE2B 1b0834c75a6ac10f886089ba898a88977ec6f453626af0121743bc038cb847ea3d936ed88bc9df364b69f49f79e86f40d01af750834e9a56608ec7cda5c392e6 SHA512 58ab4c7732358d82744abf6c57f55ca404d9d724e8d9f0d1c71d620972dbd1eda296e39ae8822ca234a25faf0d0ccdd63f087d1d9ee1fe5f53ea0c8b46b6e745
 EBUILD srecord-1.64.ebuild 777 BLAKE2B eeb14c5ed082605a001bb7845d74c799ac86a2101cc66a8fa7fa6c21d3257bcbebbacf053dfca574f7738aa87bfc6592d08ea37d05911911e74ad439479d91b8 SHA512 a48d78f22650d94d5e796ce9399acfc32a6f79c0105c7ba3d44f08baa2217e22f7949e75e3c621a88483315c44e7f49573e74dfde36604e881659022b7bdf870
 MISC metadata.xml 329 BLAKE2B 57309c1adc73fe6208a3ba78353b77f629742a1756b4ede329c094ef36233ca822a07a66150d41ac0c0107ce2b93a85ab27b4ec04bfc41327be2a08e8e5bdd31 SHA512 6eb1dfcd4bdd3fb54539edd11c0493c8d2d1029479554e87da0888771628985690ae640ed917e41701a3617548f0cae54b129170b48434f6ee8764a040d54473
diff --git a/dev-embedded/srecord/srecord-1.64-r1.ebuild b/dev-embedded/srecord/srecord-1.64-r1.ebuild
new file mode 100644
index 000000000000..aa4b0214e17d
--- /dev/null
+++ b/dev-embedded/srecord/srecord-1.64-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A collection of powerful tools for manipulating EPROM load files"
+HOMEPAGE="http://srecord.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libgcrypt:0"
+DEPEND="${RDEPEND}
+	app-text/ghostscript-gpl
+	dev-libs/boost
+	sys-apps/groff
+	test? ( app-arch/sharutils )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.57-libtool.patch )
+
+src_prepare() {
+	default
+
+	cp etc/configure.ac "${S}"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}"
+}
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 5c6ce6ddb7fd..95cdd16e132a 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,3 +1,5 @@
 DIST u-boot-2022.01.tar.bz2 17449627 BLAKE2B 574f9d248a8c19aa20b1b16cb55bb201d6c1ab2162da3f8789d39286a4f4a5a76b772d4a49c17e5572ff69f489d1d6fdc02d6e8f67a8bf6c50159b1a41e7c81d SHA512 d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
+DIST u-boot-2022.04.tar.bz2 17772787 BLAKE2B 5d2035130c0631f8f1b7f7963bedf71578a66994e3950eb103a404a08e85686cd971ba51e8172093ccb75d975101024bf2a94d4064763ad57ad8950c11092319 SHA512 113056e542db049eea3b1d1ccbbe52c79539a2f9bb6129d284ec9200dcffec7bd5969821913a9899631575b80991c84ad01bc845b4bba614e42e54466d9f0d64
 EBUILD u-boot-tools-2022.01.ebuild 1507 BLAKE2B d37b4028142f0adc3289080fd615ace265e0117a85a77dd20008ed2621b7e4bf864cd0e77eea76400d04126f9ec3f8c54eaad6c470d5fab04c9295877eaa3c71 SHA512 78d7da025a69ac1e788788e988605181c87b0b9854d076536726dc5cad052bbe23f1efdb00a879c31750cdaf5c03f0a54d664f14050ab50563e9efbb798756c7
+EBUILD u-boot-tools-2022.04.ebuild 1512 BLAKE2B 5019bf622e60b1eb1334ad0d0d2da99941c5f215114d68d63d5872fac5b2c60f3281bde3951bd74e0a3ab5f2f4c5d1d369b8fce6780f18712a46d8f743bd211e SHA512 14443876e7eb6fab8d7ef777eacac8183aa3aea394855894a2884306271f7529f88fec0a61845ff6c7891b5cbc349844ef0b6dee77068148ebc554ab2fc4ddc0
 MISC metadata.xml 451 BLAKE2B 8634c7b8cd333dadddeb3622fbe298d19b5a470b85743717fb972e310869ee2a897110a9fd7b5781de016ba9a8c9baf7c6b5ed89279e98f086a4d326cdcce807 SHA512 981503c1d3a7dd42ca141b00a29fac43eb379603140767f0e0de94f54fd4180b498cebea56692c017ab7dbf9a2afdfb222edc5942c58429490456c064b5fa41d
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
new file mode 100644
index 000000000000..2c89fa57625c
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="envtools"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
+		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
+		scripts/kconfig/Makefile \
+		tools/Makefile || die
+}
+
+src_configure() {
+	tc-export AR BUILD_CC CC PKG_CONFIG
+}
+
+src_compile() {
+	# Unset a few KBUILD variables. Bug #540476
+	unset KBUILD_OUTPUT KBUILD_SRC
+
+	local myemakeargs=(
+		V=1
+		AR="${AR}"
+		CC="${CC}"
+		HOSTCC="${BUILD_CC}"
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)'
+		HOSTLDFLAGS="${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" tools-only_defconfig
+
+	emake "${myemakeargs[@]}" \
+		NO_SDL=1 \
+		HOSTSTRIP=: \
+		STRIP=: \
+		CONFIG_ENV_OVERWRITE=y \
+		$(usex envtools envtools tools-all)
+}
+
+src_test() { :; }
+
+src_install() {
+	cd tools || die
+
+	if ! use envtools; then
+		dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+	fi
+
+	dobin env/fw_printenv
+
+	dosym fw_printenv /usr/bin/fw_setenv
+
+	insinto /etc
+	doins env/fw_env.config
+
+	doman ../doc/mkimage.1
+}