gentoo resync : 29.12.2022

68 files changed, 172 insertions, 133 deletions

diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index daf82463063f..db5480d2172d 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.8.13 b/metadata/md5-cache/dev-embedded/arduino-1.8.13
index ccaffc1822f1..14275ca1c5df 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.13
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.13
@@ -11,5 +11,5 @@ RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.13.tar.gz -> arduino-1.8.13.tar.gz https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2 -> arduino-avr-1.8.3.tar.bz2 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip -> arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip doc? ( https://downloads.arduino.cc/reference-1.6.6-3.zip -> arduino-reference-1.6.6-3.zip https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip -> arduino-Galileo_help_files-1.6.2.zip https://downloads.arduino.cc/Edison_help_files-1.6.2.zip -> arduino-Edison_help_files-1.6.2.zip )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a11f86056ae4ae06f8d1a85c3746577a
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.8.19 b/metadata/md5-cache/dev-embedded/arduino-1.8.19
index 15dad323d015..3f089aed2d11 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.19
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.19
@@ -10,5 +10,5 @@ RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.19.tar.gz -> arduino-1.8.19.tar.gz https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2 -> arduino-avr-1.8.3.tar.bz2 https://github.com/arduino/arduino-examples/archive/refs/tags/1.9.1.zip -> arduino-examples-1.9.1.zip https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.12.0/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip -> arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0902fbd242b3230b433e9608ae1b0908
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.8.7 b/metadata/md5-cache/dev-embedded/arduino-1.8.7
index e535f4e7bbab..6f4a263beb28 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.7
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.7
@@ -11,5 +11,5 @@ RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.7.tar.gz -> arduino-1.8.7.tar.gz https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2 -> arduino-avr-1.6.23.tar.bz2 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.2/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip -> arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip doc? ( https://downloads.arduino.cc/reference-1.6.6-3.zip -> arduino-reference-1.6.6-3.zip https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip -> arduino-Galileo_help_files-1.6.2.zip https://downloads.arduino.cc/Edison_help_files-1.6.2.zip -> arduino-Edison_help_files-1.6.2.zip )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4083a9e37210420e371d8d5f1c327457
diff --git a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0 b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
index 99c08937ddda..fed2019a1c88 100644
--- a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
+++ b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/libserialport-0.1.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/arduino/listSerialPortsC/archive/1.4.0.tar.gz -> arduino-listserialportsc-1.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4f54190814ba94ae580fa0baab45ce51
diff --git a/metadata/md5-cache/dev-embedded/avarice-2.14 b/metadata/md5-cache/dev-embedded/avarice-2.14
index dbf0884cc678..dcc97beea07a 100644
--- a/metadata/md5-cache/dev-embedded/avarice-2.14
+++ b/metadata/md5-cache/dev-embedded/avarice-2.14
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Interface for GDB to Atmel AVR JTAGICE in circuit emulator
 EAPI=7
 HOMEPAGE=http://avarice.sourceforge.net/
+INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/avarice/avarice-2.14.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c9dd4b5f2b974daa685d0e87abcbdbf3
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-2.0.0 b/metadata/md5-cache/dev-embedded/avr-libc-2.0.0
deleted file mode 100644
index 25520edcbaaa..000000000000
--- a/metadata/md5-cache/dev-embedded/avr-libc-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=sys-devel/crossdev-0.9.1
-DESCRIPTION=C library for Atmel AVR microcontrollers
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/avr-libc/
-INHERIT=flag-o-matic epatch
-IUSE=doc headers-only
-KEYWORDS=amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/avr-libc/avr-libc-2.0.0.tar.bz2 https://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-2.0.0.tar.bz2 doc? ( https://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-2.0.0.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a5b2f227edbfd0d3f2bf25d50ed8bf67
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-2.1.0 b/metadata/md5-cache/dev-embedded/avr-libc-2.1.0
new file mode 100644
index 000000000000..d5ecf92881ef
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/avr-libc-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=sys-devel/crossdev-0.9.1
+DESCRIPTION=C library for Atmel AVR microcontrollers
+EAPI=8
+HOMEPAGE=http://www.nongnu.org/avr-libc/
+INHERIT=flag-o-matic
+IUSE=headers-only
+KEYWORDS=amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/avr-libc/avr-libc-2.1.0.tar.bz2 https://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-2.1.0.tar.bz2
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2fafb72089233850d507ecd58c54e938
diff --git a/metadata/md5-cache/dev-embedded/avra-1.4.2 b/metadata/md5-cache/dev-embedded/avra-1.4.2
index f008925bd4d3..4f368dea6c21 100644
--- a/metadata/md5-cache/dev-embedded/avra-1.4.2
+++ b/metadata/md5-cache/dev-embedded/avra-1.4.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Atmel AVR Assembler
 EAPI=7
 HOMEPAGE=https://github.com/hsoft/avra
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/hsoft/avra/archive/1.4.2.tar.gz -> avra-1.4.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5f7aa65f5db711b821891839bfba5e3
diff --git a/metadata/md5-cache/dev-embedded/avrdude-6.3 b/metadata/md5-cache/dev-embedded/avrdude-6.3
index a26e15bd2831..271e68a1ebfa 100644
--- a/metadata/md5-cache/dev-embedded/avrdude-6.3
+++ b/metadata/md5-cache/dev-embedded/avrdude-6.3
@@ -3,11 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurse
 DESCRIPTION=AVR Downloader/UploaDEr
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
+INHERIT=toolchain-funcs
 IUSE=doc ftdi ncurses readline
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://nongnu/avrdude/avrdude-6.3.tar.gz doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9e8591e523f9b737e3271b18ff6802e0
diff --git a/metadata/md5-cache/dev-embedded/avrdude-6.3-r1 b/metadata/md5-cache/dev-embedded/avrdude-6.3-r1
index 834e62312e1a..a355676ac68d 100644
--- a/metadata/md5-cache/dev-embedded/avrdude-6.3-r1
+++ b/metadata/md5-cache/dev-embedded/avrdude-6.3-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/libelf virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/lib
 DESCRIPTION=AVR Downloader/UploaDEr
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
+INHERIT=toolchain-funcs
 IUSE=doc ftdi ncurses readline
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/libelf virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://nongnu/avrdude/avrdude-6.3.tar.gz doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9d8135f97ff2665411bcffae515f12dc
diff --git a/metadata/md5-cache/dev-embedded/avrdude-9999 b/metadata/md5-cache/dev-embedded/avrdude-9999
index b4c15e01120d..818600d43505 100644
--- a/metadata/md5-cache/dev-embedded/avrdude-9999
+++ b/metadata/md5-cache/dev-embedded/avrdude-9999
@@ -4,11 +4,12 @@ DEPEND=virtual/libelf virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/lib
 DESCRIPTION=AVR Downloader/UploaDEr
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
+INHERIT=toolchain-funcs autotools subversion
 IUSE=doc ftdi ncurses readline
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libelf virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=789e789d2dbd41406898e0b4bd754c20
diff --git a/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4 b/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
index 116e36f36bfa..9701039f1830 100644
--- a/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
+++ b/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pikdev.free.fr/cpik-0.7.4-4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1c0ef92ed2424462981bee3e4528ff1b
diff --git a/metadata/md5-cache/dev-embedded/dc-tool-ip-1.0.4 b/metadata/md5-cache/dev-embedded/dc-tool-ip-1.0.4
index c2e511905f1e..6ebefcd6cf73 100644
--- a/metadata/md5-cache/dev-embedded/dc-tool-ip-1.0.4
+++ b/metadata/md5-cache/dev-embedded/dc-tool-ip-1.0.4
@@ -3,11 +3,12 @@ DEPEND=sys-libs/binutils-libs
 DESCRIPTION=Ethernet program loader for the Dreamcast
 EAPI=7
 HOMEPAGE=http://cadcdev.sourceforge.net/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/binutils-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/cadcdev/dcload-ip-1.0.4-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ff6c1804e9c9faf399200859f1dc742d
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
index 96af0f97136f..1e8bec7201b8 100644
--- a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
+++ b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
@@ -3,10 +3,11 @@ DEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev virtual/pkgconfig virtua
 DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
 EAPI=6
 HOMEPAGE=http://dfu-programmer.sourceforge.net
+INHERIT=toolchain-funcs udev
 KEYWORDS=amd64 arm ~arm64
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=5d459867d8cc0f733a06b31ee95ec60f
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.2 b/metadata/md5-cache/dev-embedded/esptool-3.2
index 0e53456c6111..f1671c1d1fd0 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.2
+++ b/metadata/md5-cache/dev-embedded/esptool-3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v3.2.tar.gz -> esptool-3.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5b44b2ae76443495f7687d5aaa76746b
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.2-r1 b/metadata/md5-cache/dev-embedded/esptool-3.3.1
index f2da4b61212c..a3eb143dc202 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.2-r1
+++ b/metadata/md5-cache/dev-embedded/esptool-3.3.1
@@ -5,12 +5,12 @@ EAPI=8
 HOMEPAGE=https://github.com/espressif/esptool
 INHERIT=distutils-r1
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-python/bitstring[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_8(-)] dev-python/pyserial[python_targets_python3_8(-)] dev-python/reedsolomon[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/espressif/esptool/archive/v3.2.tar.gz -> esptool-3.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=137b570a865cac07779a36fa1d7f847b
+SRC_URI=https://github.com/espressif/esptool/archive/v3.3.1.tar.gz -> esptool-3.3.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f0ff2985d6dd5d763c90aeae9a520a6d
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.3 b/metadata/md5-cache/dev-embedded/esptool-4.1
index dec263dea312..8960c28ed48b 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.3
+++ b/metadata/md5-cache/dev-embedded/esptool-4.1
@@ -1,5 +1,5 @@
-BDEPEND=python_single_target_python3_8? ( dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/wheel[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( dev-python/coverage[python_targets_python3_8(-)] dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/coverage[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/coverage[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
+BDEPEND=python_single_target_python3_8? ( dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/wheel[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( dev-python/cffi[python_targets_python3_8(-)] dev-python/coverage[python_targets_python3_8(-)] dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cffi[python_targets_python3_9(-)] dev-python/coverage[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cffi[python_targets_python3_10(-)] dev-python/coverage[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
 DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
 EAPI=8
 HOMEPAGE=https://github.com/espressif/esptool
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_8? ( dev-python/bitstring[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/espressif/esptool/archive/v3.3.tar.gz -> esptool-3.3.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=931ed090b8759b48a2d78d14ed43de14
+SRC_URI=https://github.com/espressif/esptool/archive/v4.1.tar.gz -> esptool-4.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=30b9e854e70d97ec04f35a07663de6ee
diff --git a/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7 b/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
index f59b093faa12..9b5f059a7b06 100644
--- a/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
+++ b/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
@@ -4,11 +4,12 @@ DEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtk
 DESCRIPTION=A GTK2 8085 Simulator
 EAPI=7
 HOMEPAGE=http://gnusim8085.org
+INHERIT=autotools xdg
 IUSE=nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango
 SLOT=0
 SRC_URI=https://launchpad.net/gnusim8085/trunk/1.3.7/+download/gnusim8085-1.3.7.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0acf4c230eecb36ae8cf829b143892f3
diff --git a/metadata/md5-cache/dev-embedded/gpsim-0.31.0 b/metadata/md5-cache/dev-embedded/gpsim-0.31.0
new file mode 100644
index 000000000000..478d3ef6c7ad
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/gpsim-0.31.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/flex virtual/pkgconfig virtual/yacc
+DEFINED_PHASES=configure install
+DEPEND=>=dev-embedded/gputils-0.12 dev-libs/glib:2 dev-libs/popt sys-libs/readline:0=
+DESCRIPTION=A simulator for the Microchip PIC microcontrollers
+EAPI=8
+HOMEPAGE=http://gpsim.sourceforge.net
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-embedded/gputils-0.12 dev-libs/glib:2 dev-libs/popt sys-libs/readline:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/gpsim/gpsim-0.31.0.tar.gz
+_md5_=812dd0489a6749078bd46962f1551e83
diff --git a/metadata/md5-cache/dev-embedded/gputils-1.5.0 b/metadata/md5-cache/dev-embedded/gputils-1.5.0
index c9ca8f0546ab..3a4bf9914e6a 100644
--- a/metadata/md5-cache/dev-embedded/gputils-1.5.0
+++ b/metadata/md5-cache/dev-embedded/gputils-1.5.0
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Tools including assembler, linker and librarian for PIC microcontrollers
 EAPI=8
 HOMEPAGE=https://gputils.sourceforge.io
+INHERIT=autotools toolchain-funcs
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gputils/gputils-1.5.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c885e9cd225e46ba44eac62075b26850
diff --git a/metadata/md5-cache/dev-embedded/icdprog-0.5 b/metadata/md5-cache/dev-embedded/icdprog-0.5
index 019633ac8120..c2baae5a20cf 100644
--- a/metadata/md5-cache/dev-embedded/icdprog-0.5
+++ b/metadata/md5-cache/dev-embedded/icdprog-0.5
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install postinst
 DESCRIPTION=Microchip PIC Programmer using ICD hardware
 EAPI=7
 HOMEPAGE=http://icdprog.sf.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/icdprog/icdprog-0.5.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cf2df2f89abb0e66fa5cfdc847f00aa9
diff --git a/metadata/md5-cache/dev-embedded/libdisasm-0.23 b/metadata/md5-cache/dev-embedded/libdisasm-0.23
index e3d7aa830d62..63aa4b46c1de 100644
--- a/metadata/md5-cache/dev-embedded/libdisasm-0.23
+++ b/metadata/md5-cache/dev-embedded/libdisasm-0.23
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Provides basic disassembly of Intel x86 instructions from a binary stream
 EAPI=7
 HOMEPAGE=http://bastard.sourceforge.net/libdisasm.html
+INHERIT=toolchain-funcs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=Clarified-Artistic
 SLOT=0
 SRC_URI=mirror://sourceforge/project/bastard/libdisasm/0.23/libdisasm-0.23.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2dc4d73da6d8a6dffa8ce6e85ad19a04
diff --git a/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8 b/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
index 0f255c4bccd6..e59b551d82db 100644
--- a/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
+++ b/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=FTDI LGPL-2.1+
 SLOT=0
 SRC_URI=amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-x86_64-1.4.8.gz -> libftd2xx-x86_64-1.4.8.tar.gz ) arm? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-arm-v6-hf-1.4.8.gz -> libftd2xx-arm-v6-hf-1.4.8.tar.gz ) x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-i386-1.4.8.gz -> libftd2xx-i386-1.4.8.tar.gz )
-_md5_=12dad31eabd6808e666240c2a8d772cc
+_md5_=4eba483faa6990c1e006a35e6fab8108
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1 b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
index b90140ba40d6..6af8b9f1290d 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 DESCRIPTION=Userspace access to FTDI USB interface chips
@@ -12,5 +12,5 @@ RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fa47a35c9ee207b7b4406ff6c4f907d4
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.5-r3 b/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
index 53742edf749a..4fc29bc34fdc 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) test? ( dev-libs/boost )
 DESCRIPTION=Userspace access to FTDI USB interface chips
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0376f3faeccc61d63b0ee8fd8fd63731
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index 4b41d49f48b4..f1c5d70f9371 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) test? ( dev-libs/boost )
 DESCRIPTION=Userspace access to FTDI USB interface chips
@@ -12,5 +12,5 @@ RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=1
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e27b837876f95e5d37ee0966d0e20b23
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
index b2c21ec91696..9bafc656726c 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
@@ -4,11 +4,12 @@ DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 DESCRIPTION=Library to access J-Link devices
 EAPI=7
 HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
+INHERIT=autotools multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm ~riscv x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.2.0/libjaylink-0.2.0.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2694a1685deb608bf49dc95015b9aede
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-9999 b/metadata/md5-cache/dev-embedded/libjaylink-9999
index af22f27832a9..58dec93c0a2d 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-9999
+++ b/metadata/md5-cache/dev-embedded/libjaylink-9999
@@ -4,10 +4,11 @@ DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 DESCRIPTION=Library to access J-Link devices
 EAPI=7
 HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
+INHERIT=git-r3 autotools multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4f59185cb102204711e5ce1ede97daf8
diff --git a/metadata/md5-cache/dev-embedded/mavlink_c-20220518 b/metadata/md5-cache/dev-embedded/mavlink_c-20220518
new file mode 100644
index 000000000000..6707ab413149
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/mavlink_c-20220518
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Official reference C library for the v2 protocol
+EAPI=7
+HOMEPAGE=https://github.com/mavlink/c_library_v2
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mavlink/c_library_v2/archive/241907e288b43513b28f83595d0de3b2088bce0f.tar.gz -> mavlink_c-20220518.tar.gz
+_md5_=ade77e8ab5ecddabb383bc68a2c6c160
diff --git a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10-r1 b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10-r1
index 95bd0bd19412..9db21a536f80 100644
--- a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10-r1
+++ b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/gzip >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=app-doc/doxygen-1.7 >=app-text/hunspell-1.3 >=dev-embedded/sdcc-2.5[mcs51] >=dev-lang/tcl-8.5.9:* >=dev-lang/tk-8.5.9:* >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-tcltk/tcllib-1.11 >=dev-tcltk/tclx-8.4 >=dev-tcltk/tdom-0.8 >=dev-tcltk/tkimg-1.4 >=dev-util/indent-2.2
 DESCRIPTION=Graphical IDE for microcontrollers based on 8051
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-doc/doxygen-1.7 >=app-text/hunspell-1.3 >=dev-embedded/sdcc-2.5[mcs51] >=dev-lang/tcl-8.5.9:* >=dev-lang/tk-8.5.9:* >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-tcltk/tcllib-1.11 >=dev-tcltk/tclx-8.4 >=dev-tcltk/tdom-0.8 >=dev-tcltk/tkimg-1.4 >=dev-util/indent-2.2
 SLOT=0
 SRC_URI=mirror://gentoo/mcu8051ide-1.4.10.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=472631500f0317b75ab733eb638a8cf3
diff --git a/metadata/md5-cache/dev-embedded/mspdebug-0.25 b/metadata/md5-cache/dev-embedded/mspdebug-0.25
index d08341e6b868..74ad65b5d0db 100644
--- a/metadata/md5-cache/dev-embedded/mspdebug-0.25
+++ b/metadata/md5-cache/dev-embedded/mspdebug-0.25
@@ -3,11 +3,12 @@ DEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
 DESCRIPTION=A free debugger for use with MSP430 MCUs
 EAPI=6
 HOMEPAGE=https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug
+INHERIT=toolchain-funcs
 IUSE=readline
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
 SLOT=0
 SRC_URI=https://github.com/dlbeer/mspdebug/archive/v0.25.tar.gz -> mspdebug-0.25.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1d0a80edf5f7861d29014bedad0d8492
diff --git a/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0 b/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
index f064863ab0ff..bfb854c09b8c 100644
--- a/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
+++ b/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kmpm/nodemcu-uploader/archive/v1.0.0.tar.gz -> nodemcu-uploader-1.0.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=31356f33a9c2a6c13dd3e15af2316c64
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.11.0 b/metadata/md5-cache/dev-embedded/openocd-0.11.0
index 9dc998d96b31..2c2fa14d7457 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.11.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.11.0
@@ -4,6 +4,7 @@ DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:= <dev-lang/jimtcl-0.80:= capst
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=7
 HOMEPAGE=http://openocd.sourceforge.net
+INHERIT=autotools udev
 IUSE=capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:= <dev-lang/jimtcl-0.80:= caps
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.11.0/openocd-0.11.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=33883413a47a3edc520fba49b293224f
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index 87e87c9a1893..26e0b904343f 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -4,11 +4,12 @@ DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.80:= cmsis-dap? ( dev-libs/hidapi
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=7
 HOMEPAGE=http://openocd.sourceforge.net
+INHERIT=udev autotools git-r3
 IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.80:= cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=a86dc12aa6224288446502c9929c7084
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.5.0-r1 b/metadata/md5-cache/dev-embedded/parapin-1.5.0-r1
index 090b478b29c8..3e7d9532585f 100644
--- a/metadata/md5-cache/dev-embedded/parapin-1.5.0-r1
+++ b/metadata/md5-cache/dev-embedded/parapin-1.5.0-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A parallel port pin programming library
 EAPI=8
 HOMEPAGE=http://parapin.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/parapin/parapin-1.5.0.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dc694e6d024c97651a90fc1ae8a94925
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1-r1 b/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1-r1
index c1fad6ae37ff..c92bf69ced95 100644
--- a/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1-r1
+++ b/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A parallel port pin programming library
 EAPI=8
 HOMEPAGE=http://parapin.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/parapin/parapin-1.5.1-beta1.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=61b95ff038a4e4fa975b1dde82d69818
diff --git a/metadata/md5-cache/dev-embedded/picasm-1.14 b/metadata/md5-cache/dev-embedded/picasm-1.14
index 42fe4d8a0f96..99b48360ce18 100644
--- a/metadata/md5-cache/dev-embedded/picasm-1.14
+++ b/metadata/md5-cache/dev-embedded/picasm-1.14
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=An assembler and disassembler for 12 and 14-bit PIC chips
 EAPI=7
 HOMEPAGE=http://www.iki.fi/trossi/pic/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.iki.fi/trossi/pic/picasm114.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a81ce73e65f3a987164110c469999123
diff --git a/metadata/md5-cache/dev-embedded/picp-0.6.8 b/metadata/md5-cache/dev-embedded/picp-0.6.8
index be6b09e1190f..4d5fb64be165 100644
--- a/metadata/md5-cache/dev-embedded/picp-0.6.8
+++ b/metadata/md5-cache/dev-embedded/picp-0.6.8
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=A commandline interface to Microchip's PICSTART+ programmer
 EAPI=7
 HOMEPAGE=http://home.pacbell.net/theposts/picmicro/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://home.pacbell.net/theposts/picmicro/picp-0.6.8.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eff9ae0f15e2a494e2961570b197722b
diff --git a/metadata/md5-cache/dev-embedded/picprog-1.9.1 b/metadata/md5-cache/dev-embedded/picprog-1.9.1
index 7dbb30618bf9..7b83eafc1e7b 100644
--- a/metadata/md5-cache/dev-embedded/picprog-1.9.1
+++ b/metadata/md5-cache/dev-embedded/picprog-1.9.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port
 EAPI=7
 HOMEPAGE=http://www.iki.fi/hyvatti/pic/picprog.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.iki.fi/hyvatti/pic/picprog-1.9.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d2f45d94d10b75765e0b62d252740097
diff --git a/metadata/md5-cache/dev-embedded/pk2cmd-1.20-r1 b/metadata/md5-cache/dev-embedded/pk2cmd-1.20-r1
index 2a366e724065..0a5646fa161c 100644
--- a/metadata/md5-cache/dev-embedded/pk2cmd-1.20-r1
+++ b/metadata/md5-cache/dev-embedded/pk2cmd-1.20-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/libusb:0
 DESCRIPTION=An application for working with the Microchip PicKit2 PIC programmer
 EAPI=8
 HOMEPAGE=http://www.microchip.com/pickit2
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=MicroChip-PK2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=http://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dc88c69a968b446ff9e06c7a45e4530c
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.2.5-r1 b/metadata/md5-cache/dev-embedded/platformio-5.2.5-r2
index 387f0512b1c1..ca09c38d9004 100644
--- a/metadata/md5-cache/dev-embedded/platformio-5.2.5-r1
+++ b/metadata/md5-cache/dev-embedded/platformio-5.2.5-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformio/platformio-core/archive/refs/tags/v5.2.5.tar.gz -> platformio-5.2.5.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=6c60bf5934a9e05bb375269058cb6193
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=0f009fd283be4ded28068c3c57e1f45c
diff --git a/metadata/md5-cache/dev-embedded/platformio-6.0.2 b/metadata/md5-cache/dev-embedded/platformio-6.0.2
new file mode 100644
index 000000000000..ffcee92439fc
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/platformio-6.0.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/jsondiff[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsondiff[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsondiff[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( <dev-python/aiofiles-0.9[python_targets_python3_8(-)] dev-python/ajsonrpc[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-8[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.9[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] =dev-python/starlette-0.18*[python_targets_python3_8(-)] =dev-python/uvicorn-0.17*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] >=dev-python/zeroconf-0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/aiofiles-0.9[python_targets_python3_9(-)] dev-python/ajsonrpc[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-8[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.9[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] =dev-python/starlette-0.18*[python_targets_python3_9(-)] =dev-python/uvicorn-0.17*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] >=dev-python/zeroconf-0.37[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/aiofiles-0.9[python_targets_python3_10(-)] dev-python/ajsonrpc[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-8[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.9[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] =dev-python/starlette-0.18*[python_targets_python3_10(-)] =dev-python/uvicorn-0.17*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] >=dev-python/zeroconf-0.37[python_targets_python3_10(-)] ) virtual/udev python_single_target_python3_8? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.0.1[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/udev
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=8
+HOMEPAGE=https://platformio.org/
+INHERIT=distutils-r1 udev
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( <dev-python/aiofiles-0.9[python_targets_python3_8(-)] dev-python/ajsonrpc[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-8[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.9[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] =dev-python/starlette-0.18*[python_targets_python3_8(-)] =dev-python/uvicorn-0.17*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] >=dev-python/zeroconf-0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/aiofiles-0.9[python_targets_python3_9(-)] dev-python/ajsonrpc[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-8[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.9[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] =dev-python/starlette-0.18*[python_targets_python3_9(-)] =dev-python/uvicorn-0.17*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] >=dev-python/zeroconf-0.37[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/aiofiles-0.9[python_targets_python3_10(-)] dev-python/ajsonrpc[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-8[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.9[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] =dev-python/starlette-0.18*[python_targets_python3_10(-)] =dev-python/uvicorn-0.17*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] >=dev-python/zeroconf-0.37[python_targets_python3_10(-)] ) virtual/udev python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/platformio/platformio-core/archive/refs/tags/v6.0.2.tar.gz -> platformio-6.0.2.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=aef242b2e58d9362dc3000e7cd81dc26
diff --git a/metadata/md5-cache/dev-embedded/ponyprog-3.1.2 b/metadata/md5-cache/dev-embedded/ponyprog-3.1.2
index c66096934d4f..87065e9b2e6c 100644
--- a/metadata/md5-cache/dev-embedded/ponyprog-3.1.2
+++ b/metadata/md5-cache/dev-embedded/ponyprog-3.1.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=app-editors/qhexedit2-0.8.6_p20190316 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
 DESCRIPTION=EEPROM and microcontroller programmer/flasher
@@ -11,5 +11,5 @@ LICENSE=LGPL-2
 RDEPEND=>=app-editors/qhexedit2-0.8.6_p20190316 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 !=dev-embedded/libftdi-1.5-r2
 SLOT=0
 SRC_URI=https://github.com/lancos/ponyprog/archive/v3.1.2.tar.gz -> ponyprog-3.1.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2fa421f6976c86036db6814b40345ab9
diff --git a/metadata/md5-cache/dev-embedded/ponyprog-3.1.3 b/metadata/md5-cache/dev-embedded/ponyprog-3.1.3
index 9446a8a1577c..4a7eb0b68d8e 100644
--- a/metadata/md5-cache/dev-embedded/ponyprog-3.1.3
+++ b/metadata/md5-cache/dev-embedded/ponyprog-3.1.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
 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
 DESCRIPTION=EEPROM and microcontroller programmer/flasher
@@ -11,5 +11,5 @@ LICENSE=LGPL-2
 RDEPEND=>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 !=dev-embedded/libftdi-1.5-r2
 SLOT=0
 SRC_URI=https://github.com/lancos/ponyprog/archive/v3.1.3.tar.gz -> ponyprog-3.1.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3e3473502acef77997d258acd01cf194
diff --git a/metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1 b/metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
index b9dd61e24aec..ed1d83d5b40f 100644
--- a/metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
+++ b/metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Library which includes a table of VIDs and PIDs of Ever UPS devices
 EAPI=7
 HOMEPAGE=http://www.ever.com.pl
+INHERIT=autotools toolchain-funcs
 KEYWORDS=~x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.ever.com.pl/pl/pliki/powersoftplus-0.1.8-x86.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e56fe2b9da75cc2308c0923bf28eb873
diff --git a/metadata/md5-cache/dev-embedded/rpi-eeprom-13.3_p1-r1 b/metadata/md5-cache/dev-embedded/rpi-eeprom-13.3_p1-r1
index 52e0ac935027..dfef5139bd6e 100644
--- a/metadata/md5-cache/dev-embedded/rpi-eeprom-13.3_p1-r1
+++ b/metadata/md5-cache/dev-embedded/rpi-eeprom-13.3_p1-r1
@@ -12,5 +12,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_13.3-1.debian.tar.xz https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_13.3.orig.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c85587edcfb0f53b996bdb1ed8811196
diff --git a/metadata/md5-cache/dev-embedded/rpi-eeprom-13.8_p1 b/metadata/md5-cache/dev-embedded/rpi-eeprom-13.8_p1
index fb50d98bf4a3..9782c09cd8af 100644
--- a/metadata/md5-cache/dev-embedded/rpi-eeprom-13.8_p1
+++ b/metadata/md5-cache/dev-embedded/rpi-eeprom-13.8_p1
@@ -12,5 +12,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_13.8-1.debian.tar.xz https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_13.8.orig.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cbf6d790663a65b66bf3cc24f3aaaa7
diff --git a/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1 b/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1
index 58bee9e4a9ea..3b92c567d3e3 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1
+++ b/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/g
 DESCRIPTION=Small device C compiler (for various microprocessors)
 EAPI=7
 HOMEPAGE=http://sdcc.sourceforge.net/
+INHERIT=autotools toolchain-funcs
 IUSE=avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180 z80 +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
@@ -12,5 +13,5 @@ REQUIRED_USE=avr? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) gbz
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcc/sdcc-src-3.8.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-3.8.0.tar.bz2 )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ca5555d72568395bc18b36038803fcbd
diff --git a/metadata/md5-cache/dev-embedded/sdcc-4.0.0 b/metadata/md5-cache/dev-embedded/sdcc-4.0.0
index f7c26ef2e601..283c4773eac0 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-4.0.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-4.0.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/g
 DESCRIPTION=Small device C compiler (for various microprocessors)
 EAPI=7
 HOMEPAGE=http://sdcc.sourceforge.net/
+INHERIT=autotools toolchain-funcs
 IUSE=avr mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ez80-z80 ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
@@ -12,5 +13,5 @@ REQUIRED_USE=avr? ( sdbinutils ) mcs51? ( sdbinutils ) z80? ( sdbinutils ) z180?
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcc/sdcc-src-4.0.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-4.0.0.tar.bz2 )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=75fd3c0bdf5692322699edf8974f9a1b
diff --git a/metadata/md5-cache/dev-embedded/sdcc-4.1.0 b/metadata/md5-cache/dev-embedded/sdcc-4.1.0
index f3f2b7d29d8b..4161b60571e0 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-4.1.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-4.1.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= pic14? ( >=dev-e
 DESCRIPTION=Small device C compiler (for various microprocessors)
 EAPI=7
 HOMEPAGE=http://sdcc.sourceforge.net/
+INHERIT=autotools toolchain-funcs
 IUSE=avr mcs51 z80 z180 r2k r2ka r3ka gbz80 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
@@ -12,5 +13,5 @@ REQUIRED_USE=avr? ( sdbinutils ) mcs51? ( sdbinutils ) z80? ( sdbinutils ) z180?
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcc/sdcc-src-4.1.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-4.1.0.tar.bz2 )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56dee78ab2bba5c0fbfe9bf975e5944b
diff --git a/metadata/md5-cache/dev-embedded/sdcc-9999 b/metadata/md5-cache/dev-embedded/sdcc-9999
index c3d05ff37c06..74a8de17bc45 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-9999
+++ b/metadata/md5-cache/dev-embedded/sdcc-9999
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= pic14? ( >=dev-e
 DESCRIPTION=Small device C compiler (for various microprocessors)
 EAPI=7
 HOMEPAGE=http://sdcc.sourceforge.net/
+INHERIT=autotools toolchain-funcs subversion
 IUSE=avr mcs51 z80 z180 r2k r2ka r3ka gbz80 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
 LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= pic14? ( >=dev-
 REQUIRED_USE=avr? ( sdbinutils ) mcs51? ( sdbinutils ) z80? ( sdbinutils ) z180? ( sdbinutils ) r2k? ( sdbinutils ) r2ka? ( sdbinutils ) r3ka? ( sdbinutils ) gbz80? ( sdbinutils ) tlcs90? ( sdbinutils ) ez80-z80? ( sdbinutils ) z80n? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) pic14? ( sdbinutils ) pic16? ( sdbinutils ) hc08? ( sdbinutils ) s08? ( sdbinutils ) stm8? ( sdbinutils ) pdk13? ( sdbinutils ) pdk14? ( sdbinutils ) pdk15? ( sdbinutils ) pdk16? ( sdbinutils ) || ( avr mcs51 z80 z180 r2k r2ka r3ka gbz80 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56dee78ab2bba5c0fbfe9bf975e5944b
diff --git a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4 b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
index cb4686feeaef..1688ea2e8a05 100644
--- a/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
+++ b/metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
@@ -4,11 +4,12 @@ DEPEND=virtual/libusb:1
 DESCRIPTION=Tool to communicate with Samsung SMDK boards
 EAPI=7
 HOMEPAGE=http://www.fluff.org/ben/smdk/tools/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/libusb:1
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e91334ef78f885ea9dde3f5ac4ab35d
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.64 b/metadata/md5-cache/dev-embedded/srecord-1.64
deleted file mode 100644
index 41ddc449b3a5..000000000000
--- a/metadata/md5-cache/dev-embedded/srecord-1.64
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt:0 dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=A collection of powerful tools for manipulating EPROM load files
-EAPI=6
-HOMEPAGE=http://srecord.sourceforge.net/
-INHERIT=autotools
-IUSE=static-libs test
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/srecord/srecord-1.64.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3bbbf976ab375a90eb0783be85fccf61
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.64-r1 b/metadata/md5-cache/dev-embedded/srecord-1.64-r1
index 122562991b6d..ac8b07b674e7 100644
--- a/metadata/md5-cache/dev-embedded/srecord-1.64-r1
+++ b/metadata/md5-cache/dev-embedded/srecord-1.64-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libgcrypt:0 app-text/ghostscript-gpl dev-libs/boost sys-apps/gro
 DESCRIPTION=A collection of powerful tools for manipulating EPROM load files
 EAPI=7
 HOMEPAGE=http://srecord.sourceforge.net/
+INHERIT=autotools
 IUSE=static-libs test
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/libgcrypt:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/srecord/srecord-1.64.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=79d4cf1df5441fa470c1cc37bb1ff19a
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.7.0 b/metadata/md5-cache/dev-embedded/stlink-1.7.0
index f04865955602..dad8bdbf189b 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.7.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.7.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 DESCRIPTION=stm32 discovery line linux programmer
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/v1.7.0.tar.gz -> stlink-1.7.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef131998eefac5e16d0e1bf725d53903
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=17d33970438306cf44669740652c7fa1
diff --git a/metadata/md5-cache/dev-embedded/stlink-9999 b/metadata/md5-cache/dev-embedded/stlink-9999
index 3a3673408ea3..6d1d41c93848 100644
--- a/metadata/md5-cache/dev-embedded/stlink-9999
+++ b/metadata/md5-cache/dev-embedded/stlink-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 DESCRIPTION=stm32 discovery line linux programmer
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ef131998eefac5e16d0e1bf725d53903
diff --git a/metadata/md5-cache/dev-embedded/stm32flash-0.6 b/metadata/md5-cache/dev-embedded/stm32flash-0.6
index c7b76e1c8695..d9dff9903879 100644
--- a/metadata/md5-cache/dev-embedded/stm32flash-0.6
+++ b/metadata/md5-cache/dev-embedded/stm32flash-0.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Open source flash program for STM32 using the ST serial bootloader
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/stm32flash/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/project/stm32flash/stm32flash-0.6.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4b14fabcedfaabdfb3ac2d40ac4b75ab
diff --git a/metadata/md5-cache/dev-embedded/sunxi-tools-1.3-r1 b/metadata/md5-cache/dev-embedded/sunxi-tools-1.3-r1
index 17bc62978bdf..edcbedf6be7a 100644
--- a/metadata/md5-cache/dev-embedded/sunxi-tools-1.3-r1
+++ b/metadata/md5-cache/dev-embedded/sunxi-tools-1.3-r1
@@ -3,9 +3,10 @@ DEPEND=virtual/libusb
 DESCRIPTION=Tools for Allwinner A10 devices
 EAPI=7
 HOMEPAGE=http://linux-sunxi.org/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/linux-sunxi/sunxi-tools/archive/v1.3.tar.gz -> sunxi-tools-1.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7913685fead18695debd2b6886f98eb2
diff --git a/metadata/md5-cache/dev-embedded/sunxi-tools-1.4.1-r1 b/metadata/md5-cache/dev-embedded/sunxi-tools-1.4.1-r1
index 835f000a25cf..9cb2d597a637 100644
--- a/metadata/md5-cache/dev-embedded/sunxi-tools-1.4.1-r1
+++ b/metadata/md5-cache/dev-embedded/sunxi-tools-1.4.1-r1
@@ -3,10 +3,11 @@ DEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev virtual/pkgconfig
 DESCRIPTION=Tools for Allwinner A10 devices.
 EAPI=7
 HOMEPAGE=http://linux-sunxi.org/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/linux-sunxi/sunxi-tools/archive/v1.4.1.tar.gz -> sunxi-tools-1.4.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf63b83403250bd3f597013ac6a7e47e
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.01 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.01
deleted file mode 100644
index c5830f733ad8..000000000000
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.01
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=utilities for working with Das U-Boot
-EAPI=8
-HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
-IUSE=envtools
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.01.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d0f4a9b2b845a9dc3082db107fc56f03
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
index 6479150d88ea..d36fe3280659 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
@@ -4,11 +4,12 @@ DEPEND=dev-libs/openssl:=
 DESCRIPTION=utilities for working with Das U-Boot
 EAPI=8
 HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
+INHERIT=toolchain-funcs
 IUSE=envtools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.04.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=17f435bf63f4d90f7e7e5e5402231aa0
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d0f4a9b2b845a9dc3082db107fc56f03
diff --git a/metadata/md5-cache/dev-embedded/uisp-20050207-r1 b/metadata/md5-cache/dev-embedded/uisp-20050207-r1
index 4202f0ad2d09..0d3ae3a0a6ee 100644
--- a/metadata/md5-cache/dev-embedded/uisp-20050207-r1
+++ b/metadata/md5-cache/dev-embedded/uisp-20050207-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tool for programming AVR microcontroller through the parallel port
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/uisp
+INHERIT=autotools
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/uisp/uisp-20050207.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2211bb1f0dcc9dc95343187f38040228
diff --git a/metadata/md5-cache/dev-embedded/urjtag-9999 b/metadata/md5-cache/dev-embedded/urjtag-9999
index 9f41b1d35cbc..7d702c2ea172 100644
--- a/metadata/md5-cache/dev-embedded/urjtag-9999
+++ b/metadata/md5-cache/dev-embedded/urjtag-9999
@@ -4,10 +4,11 @@ DEPEND=ftdi? ( dev-embedded/libftdi:1 ) readline? ( sys-libs/readline:= ) usb? (
 DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many more
 EAPI=7
 HOMEPAGE=http://urjtag.sourceforge.net/
+INHERIT=git-r3 autotools
 IUSE=ftdi readline usb
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=ftdi? ( dev-embedded/libftdi:1 ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=05244e6898e0ec57bb4e557051bb8ccc
diff --git a/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1 b/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
index 0a6cb2809983..ca7b37338174 100644
--- a/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
+++ b/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=!minimal? ( gui? ( dev-qt/qtwidgets:5 ) dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 sys-libs/ncurses:= sys-libs/readline:= ) virtual/libusb:1
 DESCRIPTION=flashtool for the multi purpose programming adapter usbprog
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=!minimal? ( gui? ( dev-qt/qtwidgets:5 ) dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 sys-libs/ncurses:= sys-libs/readline:= ) virtual/libusb:1
 SLOT=0
 SRC_URI=https://bitbucket.org/bwalle/usbprog-tools/get/293d559bac55.tar.bz2 -> usbprog-0.3.0_p20140828.tar.bz2
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4741c9d98e5b642116479c5152fdb64f
diff --git a/metadata/md5-cache/dev-embedded/xa-2.3.10 b/metadata/md5-cache/dev-embedded/xa-2.3.10
deleted file mode 100644
index 1588c7fd3b9a..000000000000
--- a/metadata/md5-cache/dev-embedded/xa-2.3.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install test
-DESCRIPTION=High-speed, two-pass portable 6502 cross-assembler
-EAPI=7
-HOMEPAGE=https://www.floodgap.com/retrotech/xa/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.floodgap.com/retrotech/xa/dists/xa-2.3.10.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3c80da0699f3150fd87044bed1bbab80
diff --git a/metadata/md5-cache/dev-embedded/xa-2.3.13 b/metadata/md5-cache/dev-embedded/xa-2.3.13
index 6f90c350b447..5d7f746ad8f2 100644
--- a/metadata/md5-cache/dev-embedded/xa-2.3.13
+++ b/metadata/md5-cache/dev-embedded/xa-2.3.13
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install test
 DESCRIPTION=High-speed, two-pass portable 6502 cross-assembler
 EAPI=8
 HOMEPAGE=https://www.floodgap.com/retrotech/xa/
-KEYWORDS=~amd64 ~x86
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.floodgap.com/retrotech/xa/dists/xa-2.3.13.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d9e52902c94b5f1ce5966cb83b5f8421
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=38f905e51be30b6d049c423262ca99e3
diff --git a/metadata/md5-cache/dev-embedded/zmac-1.3-r1 b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
index 9f3fc537b03a..13556027b9a4 100644
--- a/metadata/md5-cache/dev-embedded/zmac-1.3-r1
+++ b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Z80 macro cross-assembler
 EAPI=7
 HOMEPAGE=https://www.tim-mann.org/trs80resources.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.tim-mann.org/trs80/zmac13.zip
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=14ef42bd4e387d7e7cb6dc6a5a0e69fc