gentoo resync : 29.12.2022

30 files changed, 325 insertions, 244 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 3a3047a889ec..6298c47e51e6 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 57f3330d770f..dca7f7db7ee3 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -1,5 +1,4 @@
-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 1996 BLAKE2B d5da2cc93bc3c1400d43c3d99867a9d0faf89c47f3f6e0f77ab5df5c41b92a52ea7af60b9b2719539d42e19a29a0ad89ba06b65e4c9ae1afa99f83a96511862d SHA512 aaae63065ca19db36161c574b7fa2636f59c130a605ea41c83274001bd3b12cc46887138225e37f273524fab16b85c458520c04d41b3221d97b898c012ea6e72
+DIST avr-libc-2.1.0.tar.bz2 3638672 BLAKE2B b17f3c4971221abe78d4f1d749c6f093e6fcf77b3435bc280af6025bf1c263a4d4d71c55c285ab7d7b458b361baa1d8b928f3ff706510c22b8c6d9f594c44abc SHA512 207b8844353c45172cc819cd5e694bbfe7cd281359cd01cff520f1e70226852d708f1a4fc2e841b2ceb8e3f7d19f2ce45a3f499aee4a25eeb5f6f0aa919611c8
+DIST avr-libc-manpages-2.1.0.tar.bz2 149031 BLAKE2B 3a2ab8b17ff4954cbe8ba1b1d7751b4d50993559eecb58315b5bcd5a6913f72a2c1138e2bf25f075e89bc7e5d45f00e5e1172b02de84e729c25abed7bdec8754 SHA512 a6fc16b5aa60c25ba1230c0be213bda173f8f437bc71553dc04974cd14e3b9c8ea0abb3a25eac2b6517d34e912880db8eb73fec4a5d5374aa5172e14acbf4fa4
+EBUILD avr-libc-2.1.0.ebuild 1722 BLAKE2B 6ec01fcb2b7a0d0adf5111c5ff8059556fb8080cf9c04788fb6308b147cab63bf3b0bee6c77993a55b82eb03e779793ae500031f6555e346e25d9a4b71fa83c0 SHA512 2f05043098cb55dfe3a716d69c078e1b5f407f29b682a5e0a978b85617336a34869ea2e368d38e583e2925b037b23966e623f00df5726c7f43546cb18151ad9a
 MISC metadata.xml 471 BLAKE2B 87db4c3915b9c8eddfbec4de58e4099fdbdf951000d022a03610d8087658a7218c77e99f7cbbb6d27714cf9a5f482b399f77535367616aa5c3a3c3f8afa66ca4 SHA512 48979ece9be17fc132454d7e954f2301c8982366d5b46e9d26a823a1a09ac8c93111cf8e663a7f1c7129fd99745b5a2de56ed343cad10b20ca93c832cf2a3d34
diff --git a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild b/dev-embedded/avr-libc/avr-libc-2.1.0.ebuild
index f8785af9045e..af637bbc7ebc 100644
--- a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-2.1.0.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="8"
 
 CHOST="avr"
 CTARGET="avr"
 
-inherit flag-o-matic epatch
+inherit flag-o-matic
 
 DESCRIPTION="C library for Atmel AVR microcontrollers"
 HOMEPAGE="http://www.nongnu.org/avr-libc/"
 SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
+	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,7 +19,7 @@ SLOT="0"
 # be any other arch. See bug #620316#c5
 # Don't add more arches to KEYWORDS.
 KEYWORDS="amd64"
-IUSE="doc headers-only"
+IUSE="headers-only"
 
 DEPEND=">=sys-devel/crossdev-0.9.1"
 [[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
@@ -46,7 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch_user #455828
+	default
 
 	# work around broken gcc versions PR45261
 	local mcu
@@ -56,9 +55,6 @@ src_prepare() {
 		fi
 	done
 
-	# Install docs in correct directory
-	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
-
 	strip-flags
 	strip-unsupported-flags
 }
@@ -71,8 +67,6 @@ src_install() {
 	docinto man/man3
 	dodoc -r "${WORKDIR}"/man/man3/.
 
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
-
 	# Make sure diff cross-compilers don't collide #414075
 	mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
 }
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 385587a0bff5..a70bbf835772 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,6 +1,7 @@
 DIST esptool-3.2.tar.gz 7155428 BLAKE2B f81a8b77f1994599c3302915915e225249a5e735accbe47c8936de47564e47a33ae711df47c57e599d980b450dc4d710f819087a97d086b9d0f15a98622c0da4 SHA512 5e67b3a17190e051d7706ee2dbbe855488765a7bfed15b15f5a04022c3fbf19112905ba6a672c37b1bac5501d45d477cfff07c004cd83b2d1a111430992cefc1
-DIST esptool-3.3.tar.gz 7259717 BLAKE2B b9952dff9a1884cae5325730056673d96bd442c82cd799196d99fe5287b72bc567d312102779f64c4a526c19bd36d0f742b4e81434de8b4dadf406a19bd3d423 SHA512 1f1a43832ae5487c570e49c97ca18831371f5a4ac0d4b260fa8b7356c7af40b8514722ded630a6c84e3d59f7fba78c9d70b291d1fa581fc25ea37204ded44363
-EBUILD esptool-3.2-r1.ebuild 1437 BLAKE2B 2d075390f0f2fdd704e51e40aaf9fbc0c5e96778236428eaaacb55aeed5c8867f1c97696b74232bee13372f4d132d35503ff8dc1a458485cbe24a783d8303a45 SHA512 f68ecbcc419c5dd3a08b19f77ce563b424e910179ec483e4a1f359cb88f29fbe7cfb20c566203ebfed1aa8291bc5f0c1b92f11dee348b5a8fec0d64a7b30621f
+DIST esptool-3.3.1.tar.gz 7261340 BLAKE2B c6ee391dcbc331d9f931bfd969333fc3bfc5628d422d52e2963c9d465f4680dca5debaf17cd2f6aca0db9dcc06563fe775d7d6c15dacdff481c52577c26d4364 SHA512 8da34f7b555513d499141ce403f19c3e77b6944eecde440c757faf3bbf5e915e44ff0bcabf1b2cb7f5fe26caa717bb47104ad808c46feaf1dea254d548048095
+DIST esptool-4.1.tar.gz 7275429 BLAKE2B d89e0d2b90a9005deea71ba14328c5616062d0ada82c309fa4ad4f4c3861e0683b99e70328d6ae60f0fc0e788e25d6b0a4e39596c1c6cfac0e779840ec796f18 SHA512 b9df8d361fe1a97f0649fed03abc919df1c2ff118dc4dd05abeec641ba2d16e6c308894bd91657768e03a6801ec9e5393e573b4c3016b624e842fef7c6354b41
 EBUILD esptool-3.2.ebuild 1421 BLAKE2B c15f2a10e98031acaa71f54eb0346a3d060924f518607f5645bd3b32006d1ac4d15844023f9b78d16cd150b2bc7561c0951ca3a8a2002cdc887fde012843e5b5 SHA512 1f0e339a7e0f9a5b6c5978b46ec38974463ec3b6bc40b00c4be82ddda44b7c7d647f207c722283bdebcb435a7f7effb3bc1fbbc766f9bfe2e65316bbf69992b3
-EBUILD esptool-3.3.ebuild 1416 BLAKE2B bf5d8cb643047fef3467e9a6cfd1880197ff9d1b9560bfcb112a070b07e6d37e6c434244d2271717a0f14a214570b3640f785bcb4520d086c78511a1c6bc8216 SHA512 97f900dca1c6852dd15174344de5a0c1114c2a9e9231558446eefd35b36140392605737aae9b15871bbf69deeb641b842df988b72fd8cd3c7ab12f65282b261b
+EBUILD esptool-3.3.1.ebuild 1414 BLAKE2B 8651f22883c4ec4f05e9f8d72a2405852f0b338a4107522f393c6964c14f45d4625aef0c0cad85d2933f9d51e623c9aa09eebf8e14b860775309ab2b6f3825e8 SHA512 37dd050eeef999bfeeb6334c403f125a01311426fbc16b3e3a82238176e36bf4bbab85264ca68e8745a195bd8821eac005657799cefa32c2fbaeb3ad298927d3
+EBUILD esptool-4.1.ebuild 2187 BLAKE2B 709260cbe82ebf278365e516be28612e19ce2a068053cdce16012fc7f94b2a2aaf758c27ef2a23a28a7b235e239ecb03f6312348e6b4da9a6c32ad3ae96ca165 SHA512 79bcd828b00a8286cf9f674f32cef6771692ba7c4eb91ef9837923a0394c01a0f393454ad96aa787a2d364a3dc1c69a4f60d67c7f1b37376c786839cc78c7c13
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.2-r1.ebuild b/dev-embedded/esptool/esptool-3.2-r1.ebuild
deleted file mode 100644
index 8cdeb0f03135..000000000000
--- a/dev-embedded/esptool/esptool-3.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-	test? ( $(python_gen_cond_dep '
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
-"
-
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py || die "espefuse_host test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "espefuse_host test failed with ${EPYTHON}"
-	# test/test_rfc2217.py test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
diff --git a/dev-embedded/esptool/esptool-3.3.ebuild b/dev-embedded/esptool/esptool-3.3.1.ebuild
index 922aa7b84829..fb5d371d3bb7 100644
--- a/dev-embedded/esptool/esptool-3.3.ebuild
+++ b/dev-embedded/esptool/esptool-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-embedded/esptool/esptool-4.1.ebuild b/dev-embedded/esptool/esptool-4.1.ebuild
new file mode 100644
index 000000000000..a0694e75b119
--- /dev/null
+++ b/dev-embedded/esptool/esptool-4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	test? ( $(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	') )
+"
+
+python_test() {
+	"${EPYTHON}" test/test_imagegen.py || die "test_imagegen.py failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_espsecure.py || die "test_espsecure.py failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_espefuse_host.py || die "test_espefuse_host.py failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_merge_bin.py || die "test_merge_bin.py failed with ${EPYTHON}"
+	"${EPYTHON}" test/test_modules.py || die "test_modules.py failed with ${EPYTHON}"
+	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
+}
+
+pkg_postinst() {
+	if ver_test "${REPLACING_VERSIONS}" -lt 4; then
+		ewarn "${P} - new 4.x release with breaking changes:"
+		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
+		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
+		ewarn "  - Flash parameters in an image header can now be changed only when no SHA256 digest is appended"
+		ewarn "  - The ESP8684 alias has been removed, ESP32-C2 has to be used"
+		ewarn "  - Megabit flash sizes have been deprecated, use megabyte units from now on"
+	fi
+}
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 71569fd45308..940e4c87f05d 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,3 +1,5 @@
 DIST gpsim-0.30.0.tar.gz 3385728 BLAKE2B 05be3672cb31253ef132dd600a39710cb952cef356ebb69d0b09119e578faa05e6f25613a83e076ddca568f0560da25df6361331364e70ff8db8f4f47b8f5de5 SHA512 8681f06e73569b801d2961858c8676490d93f7ef40e99f07e7a5eff16955850b66bcd8182aa22ba0edca0b10723cb3a5b7b8bf52fdb0cc94955c3072352292df
+DIST gpsim-0.31.0.tar.gz 3454179 BLAKE2B 449f891c7a765ce06da87c8de1a8adc0d7e15c9af175fc2988d604660108c14cc816247358a71bbb55813c5144f6973c01d3c9c27c44f2a45820b85cedc97d2c SHA512 a6af7e9170cee11c35f0e4731d39876e563edd8ca9cbd0f4b3017f224e5317b4c8bcc8aa4468102fa5c11157f487b6c7354e3aba8778842ed0b5be9bbb9ef45f
 EBUILD gpsim-0.30.0.ebuild 824 BLAKE2B 1ea299cad8321a03b6237792f905e31705ce09cdd13441575020b019380bcc14f80b85515260e82168554dc28574aff8b9fae73f0b36b22562a21094f1bc8817 SHA512 97e6ac77b7c585edd72e7d5b1759b1bdd40cf01641f47448eeaf2de4162dd845db37ad3caf632c564d3f5195c84b99ae0b9d006eb5a27dd2271d50f5e26b53d3
+EBUILD gpsim-0.31.0.ebuild 807 BLAKE2B 45428cf8a2280847e60ee57507fd44461e8b19e4ec16abf2d0a6f2369cde8530b711a742888ed9696bec3a563836d718645b79b94aa63dc4485483bf3b5a7c93 SHA512 956831c1f44b20ec090b07160bfd627171f6e03b0bc16c037df847a1b0daacce627a942ad204456ddf993eb1da4f02349bfb23711d90bfca6b1accfc345cfc93
 MISC metadata.xml 327 BLAKE2B 6134bc5147a2f16e1fb7515159e30894d11a3297e527882aa70594416c7ea8e584850e3867a0cd48f6d22de24aabb830beef2083585c05fad4f8a3687fd2c25d SHA512 5e498d284567971dc868a8eb4ce52623acd99c99123f23ad3ef7ee7ab0fbfe3d1f64d4217e4cf86d7a728059723d407c200f8c5e8f6857503ca59513f5b5d6c1
diff --git a/dev-embedded/gpsim/gpsim-0.31.0.ebuild b/dev-embedded/gpsim/gpsim-0.31.0.ebuild
new file mode 100644
index 000000000000..2149bdf4d859
--- /dev/null
+++ b/dev-embedded/gpsim/gpsim-0.31.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+RDEPEND="
+	>=dev-embedded/gputils-0.12
+	dev-libs/glib:2
+	dev-libs/popt
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gui
+		--disable-static
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	use doc && dodoc doc/gpsim.pdf
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index bc7852d7a38e..2a5324bf85aa 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,5 +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
-EBUILD libftd2xx-1.4.8.ebuild 1207 BLAKE2B f3561a38eb0b0c90699bf15ee7654562bbe1ce6f07a7d29eb954b0e2ea83d7f695e6cc70f92ea48f43853e27506dcfe9749ae016339257a7c8f405b7276c7093 SHA512 7f7a756a678e636884170e05e740c01ad8690e5abab54dc1369ace56f0bf672994b970df86e3b61c612068240936b35aa48a87f756e6dad05809b34423b3f8e6
+EBUILD libftd2xx-1.4.8.ebuild 1209 BLAKE2B 44a4512557b5101931aae5e807e90474893266d8d3e11593921a71aa7e5ec72e444d53e622878b44131867e4c87c7488a97f85a2027024b117fb88c1584eba5c SHA512 9de992a704581f028e20a68f2e4a26e8dfa5100ccfcc914fa63c88cfec7d4232d8428cdcb619aa867ee6819b918f13f8b6d098939030577cfa2ea0b8edb48cb8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
index 3fd89c0f77cc..84c41eeda6d5 100644
--- a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
+++ b/dev-embedded/libftd2xx/libftd2xx-1.4.8.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
@@ -31,7 +31,7 @@ src_install() {
 	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
 
 	dodir /etc/env.d
-	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${ED}/etc/env.d/50libftd2xx || die
+	echo "LDPATH=\"/opt/$(get_libdir)\"" > "${ED}"/etc/env.d/50libftd2xx || die
 
 	if use examples ; then
 		docinto sample
diff --git a/dev-embedded/mavlink_c/Manifest b/dev-embedded/mavlink_c/Manifest
new file mode 100644
index 000000000000..46fd08e87c1b
--- /dev/null
+++ b/dev-embedded/mavlink_c/Manifest
@@ -0,0 +1,3 @@
+DIST mavlink_c-20220518.tar.gz 875511 BLAKE2B d7776e8200b00802d77a07fac68625a9c72c9c6bec4d35be309235d31731581f7f5faf4b94792cc6158cc69ab56607ab4abb40ffd9879f24c861145fe5aded33 SHA512 9dd29cc6d8efb0d3e18a5d992741fa29ff986c328fb56f73f4e49d31787ced4185d76da98e6efecb9ad25e3e620683bba139f9d30e94c2ef457f9d3f22e5dc62
+EBUILD mavlink_c-20220518.ebuild 900 BLAKE2B 1defbb6f37c5d1c756064bc9055fd1cebea5c6a3fa10b27e4a7852d8b27d095399d416b76b95f91a484ea4fb2898b8d33188a194777f58531b4075f793b8d6d6 SHA512 8041ae4cd97cc8c47d13e894a288824744d947ec79ee42cb40de79ea40a16325441d5e8279ce0e5d4c1301a712b2bcbdbbdb1e753730bad1990d7a7d6fb07466
+MISC metadata.xml 441 BLAKE2B b92fdf8a5782f9594104cd66b6da6022d65984e8ea13472bb1fbb696d5ff776c08e810efc21aafc5cd04479dbf6cb015d62389996b08a0305ed65b31bbd9b1de SHA512 999cf9b3ebd1af6d8c470751b5ed1be49fc4c8a8d8ac92f97c32c13b4ab70ced7a0ddf03b7505b668fd073457405fd1210381c4efafe6cccc2ea12a3dedb340f
diff --git a/dev-embedded/mavlink_c/mavlink_c-20220518.ebuild b/dev-embedded/mavlink_c/mavlink_c-20220518.ebuild
new file mode 100644
index 000000000000..5e9873b2d6a0
--- /dev/null
+++ b/dev-embedded/mavlink_c/mavlink_c-20220518.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="c_library_v2"
+MY_P="${MY_PN}-${PV}"
+
+# sadly no upstream tags or releases from gh for ref snapshots
+GIT_COMMIT="241907e288b43513b28f83595d0de3b2088bce0f"
+SRC_URI="https://github.com/mavlink/${MY_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+S="${WORKDIR}"
+
+DESCRIPTION="Official reference C library for the v2 protocol"
+HOMEPAGE="https://github.com/mavlink/c_library_v2"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="test"
+
+src_install() {
+	einfo "Installing base headers required for v2 reference library"
+	mkdir -p "${MY_PN}-${GIT_COMMIT}"/message_definitions/v1.0
+	mv "${MY_PN}-${GIT_COMMIT}"/message_definitions/*.xml \
+		 "${MY_PN}-${GIT_COMMIT}"/message_definitions/v1.0/
+	mv "${MY_PN}-${GIT_COMMIT}" mavlink
+
+	doheader -r mavlink
+}
diff --git a/dev-embedded/mavlink_c/metadata.xml b/dev-embedded/mavlink_c/metadata.xml
new file mode 100644
index 000000000000..142eb38b7019
--- /dev/null
+++ b/dev-embedded/mavlink_c/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/mavlink/mavlink/issues</bugs-to>
+		<doc lang="en">https://mavlink.io/en/</doc>
+		<remote-id type="github">mavlink/mavlink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index f591e08699f9..7302d5f033ba 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,6 @@
+AUX platformio-5.2.5-fix-semantic-version-dep.patch 267 BLAKE2B d15be62a0a01a82ca217d614029c1bafaeda6dc078d975a36f1036da9d453f584b1ca8d8487a0f8995d6eea27a1b34403e53f3ff96ac506d40a5a056b9dc29c5 SHA512 ca59d2df4667a5ec59f35f0b6071fa60d81d24a3fe90129634e802cc850fa4d05380806b3e71192110d96df119f82f27a75eaca41df4d31dac5ffd0c9bba44c1
 DIST platformio-5.2.5.tar.gz 254813 BLAKE2B 96911a64f8e73567820ef2c7b2297ed9e32c36c65c49572af6037c2666da4072bdf920dc31e8de7e07296eb7f1b407c47191d68a80ed212a9c351dfca604b408 SHA512 cf939254c231bb2cb97ac509175b7235a6a2ba447e55a2d9a59a9fe610656743c190f00cb7bfa1fc2e6b64487be7f02a193e2f270236bbb9200537f19175dc22
-EBUILD platformio-5.2.5-r1.ebuild 2546 BLAKE2B 3b290185b67fa64ed7f0530a801577a3eac024c30801b6290aa843ca837335eb42d94e4f9e920fa3bb37f1f62372bac16d24a65a692bed480c784c5c5eb50e2a SHA512 add9d9d7cd52e142b2b9e54a6f6246799061430c81ee891ff361a633b4c9ac0113dd2144aebbcdbb3d9d9997db5f131213d6a1fe6a5ef8f831a733a0c5d07781
+DIST platformio-6.0.2.tar.gz 285452 BLAKE2B c70523837b5118fcc1209a36a425fb6ab0aac73e56732916ff3d39fe87d50a47bf7d31d77324f491093ed366b1b3e4f88274e973bc896b164f5a07687a53bd12 SHA512 a2e48ad9ca22024a06509a9e36e5a7586088d0e8abd67d309d1988a8a112a41e301f077f1b466b5db390dc4048add570acd5bb762bbf22db69715dead0d8fc89
+EBUILD platformio-5.2.5-r2.ebuild 2617 BLAKE2B 48f779ce26c27e31beb69349cd8cf621d49112e93eb9f8bd3450afa04ef2e2c9879317436b104bc5992c59ec661323628a6c93d4640088a280a3f9a0af2ae2f5 SHA512 54680dda63927f8435ebc8f302f16cbccbd96d6440d581a51fd472ad513f8c3a62c2f1c78ffa7a840d6993354d383746f1d1a44fd55f4f479bff7358d4d82a64
+EBUILD platformio-6.0.2.ebuild 3221 BLAKE2B fed27e95a092cc7a28dd42d595320ff601ff2493afbbf522edd0c79fe9fd98262b863e5fab7892708269d04353284f7228606b775dab52ec818a1b433722dadb SHA512 70c0fe0ecaa281a109273a88cb6bd35b57321d39ddf0870dcacc153db71b020de7d8519e1bc4a5c5a05832f506a15f767e736ace6cf745df82dbf802f8c6e45e
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch b/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch
new file mode 100644
index 000000000000..1fa92fed8784
--- /dev/null
+++ b/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/853247
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@ minimal_requirements = [
+     "pyelftools>=0.27,<1",
+     "pyserial==3.*",
+     "requests==2.*",
+-    "semantic_version==2.9.*",
++    "semantic_version==2.*",
+     "tabulate==0.8.*",
+ ]
+ 
diff --git a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild b/dev-embedded/platformio/platformio-5.2.5-r2.ebuild
index 9c73bc3fd57d..9c0cbfa5bbd5 100644
--- a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.5-r2.ebuild
@@ -68,6 +68,10 @@ EPYTEST_IGNORE=(
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.5-fix-semantic-version-dep.patch
+)
+
 src_prepare() {
 	# Allow newer versions of zeroconf, Bug #831181.
 	# Also wsproto.
diff --git a/dev-embedded/platformio/platformio-6.0.2.ebuild b/dev-embedded/platformio/platformio-6.0.2.ebuild
new file mode 100644
index 000000000000..bf24334631e4
--- /dev/null
+++ b/dev-embedded/platformio/platformio-6.0.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 udev
+
+DESCRIPTION="An open source ecosystem for IoT development"
+HOMEPAGE="https://platformio.org/"
+SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-core-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/aiofiles-0.9[${PYTHON_USEDEP}]
+		dev-python/ajsonrpc[${PYTHON_USEDEP}]
+		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
+		>=dev-python/click-8[${PYTHON_USEDEP}]
+		<dev-python/click-9[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+		<dev-python/requests-3[${PYTHON_USEDEP}]
+		>=dev-python/semantic_version-2.9[${PYTHON_USEDEP}]
+		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
+		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
+		>=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[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
+	')
+	virtual/udev"
+DEPEND="virtual/udev"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )"
+
+# This list could be refined a bit to have individual tests which need network
+# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now.
+EPYTEST_IGNORE=(
+	# Requires network access
+	tests/test_builder.py
+	tests/package/test_manager.py
+	tests/package/test_manifest.py
+	tests/commands/test_platform.py
+	tests/commands/test_test.py
+	tests/commands/test_ci.py
+	tests/commands/test_init.py
+	tests/commands/test_lib.py
+	tests/commands/test_lib_complex.py
+	tests/commands/test_boards.py
+	tests/commands/test_check.py
+	tests/commands/test_run.py
+	tests/commands/pkg/test_exec.py
+	tests/commands/pkg/test_list.py
+	tests/commands/pkg/test_outdated.py
+	tests/commands/pkg/test_search.py
+	tests/commands/pkg/test_show.py
+	tests/commands/pkg/test_install.py
+	tests/commands/pkg/test_uninstall.py
+	tests/commands/pkg/test_update.py
+	tests/misc/ino2cpp/test_ino2cpp.py
+	tests/test_maintenance.py
+	tests/test_misc.py
+)
+
+EPYTEST_DESELECT=(
+	# Requires network access
+	tests/misc/test_maintenance.py::test_check_pio_upgrade
+	tests/misc/test_misc.py::test_ping_internet_ips
+	tests/misc/test_misc.py::test_api_cache
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Allow newer versions of zeroconf, Bug #831181.
+	# Also wsproto.
+	# ... and semantic_version, bug #853247.
+	sed \
+		-e '/zeroconf/s/<[0-9.*]*//' \
+		-e '/wsproto/s/==.*/"/' \
+		-e '/semantic_version/s/==[0-9.*]*//' \
+		-i setup.py || die
+
+	default
+}
+
+python_test() {
+	epytest -k "not skip_ci"
+}
+
+src_install() {
+	distutils-r1_src_install
+	udev_dorules scripts/99-platformio-udev.rules
+}
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
index 6e7ed1e5e353..d412491d4788 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -1,5 +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-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.ebuild b/dev-embedded/srecord/srecord-1.64.ebuild
deleted file mode 100644
index ad11060c8a11..000000000000
--- a/dev-embedded/srecord/srecord-1.64.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}
-	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
-}
diff --git a/dev-embedded/stlink/Manifest b/dev-embedded/stlink/Manifest
index 01a1e5418df0..57757a00a6fe 100644
--- a/dev-embedded/stlink/Manifest
+++ b/dev-embedded/stlink/Manifest
@@ -1,4 +1,5 @@
+AUX stlink-1.7.0-no-werror.patch 657 BLAKE2B 14a4d9ecf12fefeec84c328255a80600cb2314d83f8ce2e65d9682a03da278e2daf39aa0e9020592c548b3749c62b583e66dbad2e792eda1bdd14a0e1de04a00 SHA512 57168001932bd287f99db661df6e417da7792aa8ba05f0cf56080a3dace2802bd59d5dd79bba4ae068c1ebcdff480783c6aa2fd2116373add85e3c10b444ea28
 DIST stlink-1.7.0.tar.gz 334883 BLAKE2B 7e00a01912e1d21fa29a7299fbb21f8e85540d3e4f4c90be8fcd9b4a8ef14bae2c0cd460463babf04fd52a11ebeac9601a5f31874dd4cce3077434c2bfc96168 SHA512 58b73c7a73809f36ab8ef53370bcbdba7456433c8559f350349febd282188541184b5c171eb2ca1ad38ec4b3ae32d3a89895a208bcacc264ec0aed5f61e6bcd0
-EBUILD stlink-1.7.0.ebuild 823 BLAKE2B b7ccf672b881f41234cdd17b64dcc7a2ac00fda7eafaede5162594a38ad017078e801494f4f45c3e8be579749f5d3f9ff27810fb6bd7b3a26f7924ab5b716f50 SHA512 e6f0a57fb112b33fbf8b9eec6f4bab6823bfbbf878cc47bbeebb2f920af22657ed56a87b4a19b87fcb6bb708a6ee8239152ea642c117386201100990a18d953c
+EBUILD stlink-1.7.0.ebuild 879 BLAKE2B a5f18e266fce50c9d254527b7f048dc538e1376ac5ab7af8e5494e86c346d8a4229a2806993a3aecc89d9e6b4d6686d213a32c7c57a857d2476605a3072dc158 SHA512 ea5ee8f9ce7cad49deb8378e5685a7ce526acb7e878a683519647e809de2877d28020aa9f7b2c846fef0e0f8f34dea13e59212121148d1349e1ebe18e1ed8381
 EBUILD stlink-9999.ebuild 823 BLAKE2B b7ccf672b881f41234cdd17b64dcc7a2ac00fda7eafaede5162594a38ad017078e801494f4f45c3e8be579749f5d3f9ff27810fb6bd7b3a26f7924ab5b716f50 SHA512 e6f0a57fb112b33fbf8b9eec6f4bab6823bfbbf878cc47bbeebb2f920af22657ed56a87b4a19b87fcb6bb708a6ee8239152ea642c117386201100990a18d953c
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch b/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch
new file mode 100644
index 000000000000..79765787de52
--- /dev/null
+++ b/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/746770
+--- a/cmake/modules/c_flags.cmake
++++ b/cmake/modules/c_flags.cmake
+@@ -50,5 +50,4 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+     add_cflag_if_supported("-O0")
+ else ()
+     add_cflag_if_supported("-O2")
+-    add_cflag_if_supported("-Werror")
+ endif ()
+--- a/doc/dev/app-example/CMakeLists.txt
++++ b/doc/dev/app-example/CMakeLists.txt
+@@ -14,7 +14,7 @@ include_directories(${STLINK_INCLUDE_DIRS})
+ find_package(PkgConfig)
+ pkg_check_modules(STLINK REQUIRED stlink)
+ 
+-set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall -Werror")
++set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall")
+ 
+ add_executable(${PROJECT_NAME} ${SRCS})
+ 
diff --git a/dev-embedded/stlink/stlink-1.7.0.ebuild b/dev-embedded/stlink/stlink-1.7.0.ebuild
index e937418ed74f..6f33c17ee856 100644
--- a/dev-embedded/stlink/stlink-1.7.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.7.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=8
@@ -24,6 +24,10 @@ RDEPEND="virtual/libusb:1
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-no-werror.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 95cdd16e132a..73e5fb28f2ad 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD u-boot-tools-2022.04.ebuild 1507 BLAKE2B d37b4028142f0adc3289080fd615ace265e0117a85a77dd20008ed2621b7e4bf864cd0e77eea76400d04126f9ec3f8c54eaad6c470d5fab04c9295877eaa3c71 SHA512 78d7da025a69ac1e788788e988605181c87b0b9854d076536726dc5cad052bbe23f1efdb00a879c31750cdaf5c03f0a54d664f14050ab50563e9efbb798756c7
 MISC metadata.xml 451 BLAKE2B 8634c7b8cd333dadddeb3622fbe298d19b5a470b85743717fb972e310869ee2a897110a9fd7b5781de016ba9a8c9baf7c6b5ed89279e98f086a4d326cdcce807 SHA512 981503c1d3a7dd42ca141b00a29fac43eb379603140767f0e0de94f54fd4180b498cebea56692c017ab7dbf9a2afdfb222edc5942c58429490456c064b5fa41d
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
deleted file mode 100644
index 92b7d18e73fb..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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
-}
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
index 2c89fa57625c..92b7d18e73fb 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="envtools"
 
 RDEPEND="dev-libs/openssl:="
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 41f21f20b697..2c8dc94a23b9 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,7 +1,4 @@
 AUX xa-2.3.10-Makefile.patch 1840 BLAKE2B 1d8b4d7ed1ed97991dd611f77ff8daf6bb404e2892e271404d9b4b02e475b863e8ad3c45c79d07f5bbb9e69c19fd64f4b895a1868444729137ae97837e698b73 SHA512 b16462153b12604c6e3d8fba54e3d1fe19b5d907bed4141319d863d497582fe46fddfa15b0ab1c697ea4536e6fa3e5f86b68266a3b8da2c7d43f9577a10036e7
-AUX xa-2.3.10-fix-gcc10-fno-common.patch 203 BLAKE2B 9f503900b016956a02d2d9a1103884297e1545c624cb94c079abbc3e795ce803f35cf1c150ea233c2b78f9719ce2d15283a9ff5551c5adcbed55b6e98bf13747 SHA512 3862cad04136200447486fd6ac76298118d56a53c21f9db7aaf8f7ec248c10bd2f3ae610112a6dc5e99944da03ec52bc7cdb33879e6f1cb8fa6e9221f71472ea
-DIST xa-2.3.10.tar.gz 152433 BLAKE2B af9ab28e6596f6c96abd075779670955e7bfe79b3e9e18c5c75f35ffb166c705a0ebb60dcca1928c49a836eefcd7b15d12437579fbe645c0b5ce51e81da92d8d SHA512 08b9994e295495744d5252fa983b111f41d0447cdb32d0c065f8fbd942ffa0899476d6cfebe1162e4aa08b1d0a2d8df74c2a60987d2509b8bca45da670f4a67f
 DIST xa-2.3.13.tar.gz 155606 BLAKE2B 8196f8f88bee29dbab9ad026c0d4e3519159c4ed7579dc7db391c0bdd7b1bfe31e2884644258d863e299ac3b5fcc43718b3d95b9b7d7802541a9d58366728ffe SHA512 b8a4c1856e51bbe212b98be06895987d6fb926a229511a67ea90a934da1fcc84daf29bd289c3c4c2254d2bce345333bb92747947f3286376761613b2e181e99b
-EBUILD xa-2.3.10.ebuild 615 BLAKE2B 1a0286b2aeb631d56682c04d391b19c2dff7eefcbe590212f5dd0997030611e669fe20f90553a6f8cbc938b70a00626403c9386f6d00b998d1b1b31798765d7b SHA512 576da5cfb40cca0b8d4a4839bbf26bd9687a84677c9bcdf81722df7a1b7ea7a741942be9928c87b4615e2d2fe13df5662589c1aba5478abfc0f3c8df95731283
-EBUILD xa-2.3.13.ebuild 560 BLAKE2B 12a87ed79e877b44b07cb78d8cc4dbea96b3d4c1afd218753de62c64b8147936b427a2bcad241da8f374e526b101586b459b2128a762b22d5118fd048cbe81b4 SHA512 5e59a18409f82fe2b4ca295f8ed7a6c8eaea2a8ca6c4353600a13771062cddace693ac41eb2a572ae88cfe973f26ede29babc1ab40f9b6daf623d544101418b4
+EBUILD xa-2.3.13.ebuild 558 BLAKE2B 0d744811be2358e430b40ec04ee766c8a531b417bd7691026286d05f6cec9f715baea2aa60056e73d10a88cabc567136a204540ebf97482a44b933e0ce93b720 SHA512 5f499f12b24f67baf9db24f19ff2fdac2e0c4bd3455974530c1438f1a96c05ace39a82d08eab8ca43d887ac1d2b4b5baf4c607e6b992cf68f1879a54d6706bca
 MISC metadata.xml 548 BLAKE2B 3acb4c1e9192f25578d0e57f4527c1fd9af3738f48978cd5af39e9728336a23576f19e48568028c47b9db1394539280553590bcd29c206d11ab4acba50c5dbda SHA512 6b1274a1ee5456a5e2cdee2e1bfd34777b66d5178034b11f314549640c3085d069d96e71da9d476c03977540b6a08f8acb034b8df938b8caac1005eee4d2066d
diff --git a/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch b/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch
deleted file mode 100644
index 5b3486433885..000000000000
--- a/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/xap.h
-+++ b/src/xap.h
-@@ -35,7 +35,7 @@
- long gm_ppm(void);
- long ga_ppm(void);
- 
--Datei *filep;
--char s[MAXLINE];
-+extern Datei *filep;
-+extern char s[MAXLINE];
- 
- #endif /* __XA65_XAP_H__ */
diff --git a/dev-embedded/xa/xa-2.3.10.ebuild b/dev-embedded/xa/xa-2.3.10.ebuild
deleted file mode 100644
index ea526d56aac6..000000000000
--- a/dev-embedded/xa/xa-2.3.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="High-speed, two-pass portable 6502 cross-assembler"
-HOMEPAGE="https://www.floodgap.com/retrotech/xa/"
-SRC_URI="https://www.floodgap.com/retrotech/${PN}/dists/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.10-Makefile.patch
-	"${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${ED}"/usr install
-	einstalldocs
-}
diff --git a/dev-embedded/xa/xa-2.3.13.ebuild b/dev-embedded/xa/xa-2.3.13.ebuild
index 5e9388a99088..9c13b9dcae29 100644
--- a/dev-embedded/xa/xa-2.3.13.ebuild
+++ b/dev-embedded/xa/xa-2.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.10-Makefile.patch