gentoo resync : 20.03.2022

15 files changed, 240 insertions, 231 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 470ca29235c3..e8ce11087954 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 908c2747dac2..36468ab0128a 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -2,5 +2,5 @@ AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af
 DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368
 DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c
 EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
-EBUILD gnu-efi-3.0.14.ebuild 1760 BLAKE2B 1da8222022f4318e610f3bc6bcf2d1fac842582a3326ee04847f83c0437a9cfb03f1d50e4811d18888a3f0d0c34f9f6000e9f3ac05b44ab956b0a04de963cd19 SHA512 fbba3876ee845f3eba64efdfc97650f11a9ce2aaca73fa7970b0339d8a06f5af8b21188e33298cdb8a344cfd222629a9fb1c6b720b28bd49155aca4e9108e877
+EBUILD gnu-efi-3.0.14.ebuild 1794 BLAKE2B 43990bcd83b91d9872b469189ce929d46cd126d364a9fd1db773fbea4813acb0fa3284bfc28c5afc43b44c3be532eca76292670b401f5039e1755966de0135c2 SHA512 687a2206ece8adbaa40f38c64ab8819a55f575d91e5068e3420eeed5a7c30f4b2805013a5906a56507af265eccc8b0d6b748cb5843ee883121c05104a8b2ae1f
 MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
index 44b683ddf6bf..76d4ef4d4221 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 
 # These objects get run early boot (i.e. not inside of Linux),
@@ -38,6 +38,7 @@ efimake() {
 		aarch64*) arch=aarch64 ;;
 		ia64*) arch=ia64 ;;
 		i?86*) arch=ia32 ;;
+		riscv64*) arch=riscv64;;
 		x86_64*) arch=x86_64 ;;
 		*) die "Unknown CHOST" ;;
 	esac
diff --git a/sys-boot/netboot/Manifest b/sys-boot/netboot/Manifest
index 532145f87959..fd9939ead61c 100644
--- a/sys-boot/netboot/Manifest
+++ b/sys-boot/netboot/Manifest
@@ -1,5 +1,5 @@
 AUX netboot-0.10.2-ldflags.patch 1208 BLAKE2B e9b6bbfafbb05341d807bde22c0b54a99e17b8f8370065bd8ba8bb20ebfb3cf3495205fd70397303c8e1abdb485b336710f1d1d7ab8aeef4feb6befba91bfcfe SHA512 ab96af0ddd9956c293cf1088597b543e312bb10f535b26e379692dd94b14a34f56d9ee71c1c82e6946702d69f1665a92acff42afe4d0036d56f28c533f8f1bd3
 AUX netboot-0.10.2-slibtool.patch 224 BLAKE2B 46193988b7ab72273aa596ef8d90f5cd403d961e6b8bef3bd1b53f5c11e785f080095e562032d96717117c8fb4e8b634483377c9c16c227017c05371fad5ad54 SHA512 d6dfa3c4c33e4b516b72344dc4e3f15b262c589648ab3a5134536f57467868042839a7ce5f3327ea92c609a1159b23d51ad55ff82a739f6003064eafafca697e
 DIST netboot-0.10.2.tar.gz 1457791 BLAKE2B bd7fbaa1c87990ebac3dfb22f947146b19c199ceb579d32ded9a58bed6bcae34b02a1bf9cf5c079ba389ba24ca6f89fb6b4faf0b3ed028f9fe56b8dc083d8507 SHA512 422e78833c36e9975a77226523e14ebf8b5af5c02e98628ee030459ebf9f26d020551265899e84ea27bf6ab43c4d9bf8edc6722f942f49103bac897c7cc4fa3e
-EBUILD netboot-0.10.2-r2.ebuild 1743 BLAKE2B 10edcd307ef761ab0369783bab6543cbd3ad0e152c6962c62b6fdf42fbd4bec511677978ce8956ec8e6bf0165718fe5e212d493f55fd20c572dd5224acc7755d SHA512 764b94f9dc14235d607b583d7aaf9418538319ed89c014cc4c9dbbdf220680f712f85dc1875b259bc45ec4e2c64fea65063d1f896da582dbf0fc771c96175edc
+EBUILD netboot-0.10.2-r3.ebuild 1743 BLAKE2B 690892a3dc7db8af9e10987ef9efdfa064661c7f04ee1fd54dbcba9f2ca0efa51a170ac57d1c48d578e2477379fedb79cf9c4ddb2a8705f0dd0c7956e5a55662 SHA512 3372fc623d4d763567dcdef2cf11e5701123137388ec25481197fd466ce6b5b1663fe2bf79d98e91a03fd2f65bc150f758222b7125fc0699d78dc187f7e89459
 MISC metadata.xml 842 BLAKE2B 382eb0aa401517a1784d0142bad0ff2efd7f8228f399acfacf346036f94a992bbf59030b93e80772badffba559d76a32b3cb04b57c7599ddd34f91117ab4b8ce SHA512 fd24e2d84fcfa165537a50a10d21560e3ae3534140b1c1531eab2dbcda422f118a8fde42d07711ceb9fd8834c6d913df6fb1fff1cf7e107789789dd0dd4960e3
diff --git a/sys-boot/netboot/netboot-0.10.2-r2.ebuild b/sys-boot/netboot/netboot-0.10.2-r3.ebuild
index 13f09cb9284e..bdaaf75e7d25 100644
--- a/sys-boot/netboot/netboot-0.10.2-r2.ebuild
+++ b/sys-boot/netboot/netboot-0.10.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 2fb6e7a4d787..1a64fd3aba3c 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1,8 +1,10 @@
 AUX 0.9.3-glibc-sysmacros.patch 1170 BLAKE2B cf3b927b3a53c419bcee9fc652346fc8e5858911134a654c7ce0c6f7d1928c91edb9c829b35b10a3107f3427712f697184dd1b66d8395bdb98712a854adb4276 SHA512 82f40cd6ee78904e3ca2ed594c923a11c1a6015e56bfafebf035c25287e2c1708b87901c5b68c04aecf4d1891124d58ab6b3c84ba0e12c5bd5d69dea24bc49d5
 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
 DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9
+DIST plymouth-22.02.122.tar.xz 1183608 BLAKE2B 8bb1362fcaa7d4c0fb1b69729a8a681d992a5d2abc07644d3be5cc0b19df2cac83df031165a65fa06f95042f619b9f4b7a7e1f3816528f6623473a2b1303e1be SHA512 9f2f5a7121b431f16561d6b5f31177ff06cf1e6bdffaa68c1fe08aa3c765a96dee745824aae8eaac9a0b4a08f0a17a9ae79a82bd0826fcc3fe14d8553635f817
 DIST plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c
 EBUILD plymouth-0.9.5-r1.ebuild 2842 BLAKE2B eb780d50b0a0387d7f1ed07fab92940c941ad8b6f39519e4a44be1a607d1f0ac9a06c39a1c13f95f6ba39b52e88f4c759604f58717e14527af37422497b2bdd2 SHA512 6502ae41b78a7707380653f16eaf95626345373d7371b50b8ce83658ca0eaf1be2fb83deb1403d31bd47daddf2b6f788d8fe320f0c9989bc30c046a54068618f
 EBUILD plymouth-0.9.6_pre20211225.ebuild 2964 BLAKE2B 457a6def0224f2d532aeee8b0c3e5d74358783bc09258e82995ac40d5ad1a7887967eea325f9f76a83c23c1be673dac72fe6a395a1c5ca9aadaf964fc9dc69b9 SHA512 ea2e1cb875310fd2c6cba736517700a42a47d0eb10f5c901e02e8819904c5d8fed0ab4516c0e31790e20eb95ac85086c0ef599d562a913115f3e382c07e1520e
+EBUILD plymouth-22.02.122.ebuild 2833 BLAKE2B 13f8ccc5cdf8cf0157f329d0dcaa4e0c5da52b3911d30b927251d2529f6b554e365924582500a85fba8f8cb99d188c90b0f9c719281f09b991ae44d871b8da1b SHA512 adce0c31f2de98993bee39d2eafaf0b9c89c26d90e774d72475105400c4ddbd64fd4eb3d3c7044fa7f7e84055a40ccdfbe4af0dd200a23e0c9e82267a8ba3f35
 EBUILD plymouth-9999.ebuild 2833 BLAKE2B 80536368b14223aef2a3bc29444dafe9e4a4f81067fecde31b5f703ba7f5de56304cf476613c75d942baf91dfcdfe44192d437f401acadd856083e9c8e079864 SHA512 2e86c5be326acd5d4fe974207a986f2822c6e2bac16dbd76a8e785277b3c854e6aa4f50ac51c6d5043e9e8a21d82acb849d0c73e3b4d2e5fc97fe48e288b62dd
 MISC metadata.xml 1077 BLAKE2B b8226140cc34ea498fb1792e89ed3976a54dbaf49989ec76900eb1619cf27a1a4568d88ff0d979d085286f197f6c125fb1dc6bcff294d94a979ba5816711f56e SHA512 6ed57ac55fa2011204c8bb1e2c41697c91bd89f30d272bf581d9c5cf8e387a4f26e958e46a0fa79bc802345c3053556d88da0b5999481b73f4ac0643a2c8f3c7
diff --git a/sys-boot/plymouth/plymouth-22.02.122.ebuild b/sys-boot/plymouth/plymouth-22.02.122.ebuild
new file mode 100644
index 000000000000..98bb6eb92ea2
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-22.02.122.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth"
+else
+	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
+
+CDEPEND="
+	>=media-libs/libpng-1.2.16:=
+	gtk? (
+		dev-libs/glib:2
+		>=x11-libs/gtk+-3.14:3
+		x11-libs/cairo
+	)
+	libkms? ( x11-libs/libdrm[libkms] )
+	pango? ( >=x11-libs/pango-1.21 )
+"
+DEPEND="${CDEPEND}
+	elibc_musl? ( sys-libs/rpmatch-standalone )
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+# Block due bug #383067
+RDEPEND="${CDEPEND}
+	udev? ( virtual/udev )
+	!<sys-kernel/dracut-0.37-r3
+"
+
+DOC_CONTENTS="
+	Follow the following instructions to set up Plymouth:\n
+	https://wiki.gentoo.org/wiki/Plymouth#Configuration
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.9.3-glibc-sysmacros.patch
+)
+
+src_prepare() {
+	use elibc_musl && append-ldflags -lrpmatch
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-root-install=no
+		--localstatedir=/var
+		--without-rhgb-compat-link
+		--enable-documentation
+		--enable-systemd-integration
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable !static-libs shared)
+		$(use_enable static-libs static)
+		$(use_enable debug tracing)
+		$(use_enable gtk gtk)
+		$(use_enable libkms drm)
+		$(use_enable pango)
+		$(use_with udev)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/plymouth
+	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
+
+	if use split-usr ; then
+		# Install compatibility symlinks as some rdeps hardcode the paths
+		dosym ../usr/bin/plymouth /bin/plymouth
+		dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+		dosym ../usr/sbin/plymouthd /sbin/plymouthd
+	fi
+
+	readme.gentoo_create_doc
+
+	# looks like make install create /var/run/plymouth
+	# this is not needed for systemd, same should hold for openrc
+	# so remove
+	rm -rf "${D}"/var/run
+
+	# fix broken symlink
+	dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
+		ewarn "If you want initramfs builder with plymouth support, please emerge"
+		ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
+	fi
+}
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 91b8fdd7e87e..4999fd880b85 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,15 +1,9 @@
 AUX raspberrypi-firmware-0_p20130711-envd 53 BLAKE2B 52aa8814f82f9c8a5e2f4c3b2be80e6e62b2e969d03a96f3162a998a9aa4621ab79df48d573389d92cc963979c8dd7c0e012cd8d996e5e23252eb66f869f0e74 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7
 AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a27db79dcb30a73194d7c1cf9b0f05529303f1fe2aea5ee26c71d563e029760a06d78f77d0213a6cda0819c08f7014782997f159f716e SHA512 6dbf694f4df9d5d5dfdd62a33be90aa95d655b113760cbbee9575a59e6250b831e73530cb392e8e89056806f298283626c50665b9d4573663e6686bbcc577d6b
 AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
-DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
-DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
-DIST raspberrypi-firmware-1.20210108.tar.gz 189334002 BLAKE2B 254e8bf644b2b3773ff5ec9ffb47eeb84e0a149e9a74a18a9c6c39db03610fdd3a42f455a9e8935aa4afa4ee21ed098237d4a4e431c401a919c833372e729fa5 SHA512 3c8759e7d6cce597fcbab80e0cd9fd6d528ed2c956452e902f08509169181d703895298a71b8be76d6734f128f85e36d54a149ff9cd735ca44cf8416917ed172
 DIST raspberrypi-firmware-1.20210527.tar.gz 192247084 BLAKE2B 329707dfb2905b36926a3f0ecf1a8e3bc2b52e1a376f98ca7cfe9ec7b69d0fb370d8e23907f5bbd9ea75cf7fed5babd6fe54934919995dec6914e888d95e5fbe SHA512 5a48d1fae768c30528359a14371f59564447d2fb8a145cafa89d7d29352095c5b7ac33bfcbc8da494284c9d41e7dbafe4e863e8efd963a17ea6b6b9699b814a7
 DIST raspberrypi-firmware-1.20211029.tar.gz 193543221 BLAKE2B 308206d6bdfbe15bfe5f39cd230e6d4857f460744aafcbcc9eee6a74f05a3a9dc861e7c3e36baea46fdb1d1d1dc28b5edebf70bce3a3c085228b2ea321ef7a85 SHA512 7a1fe3b1645006c35fa49e842b9ece53b386ece42b8db99649de8d4bc0c19e34b0807767290e26422528606c5847843533aaa0edd0716e9f9f9dcae340a4dce0
 DIST raspberrypi-firmware-1.20211118.tar.gz 193544570 BLAKE2B db6c7c2e247f668b02210fb181305c3244f3d8a30f923656bf15cf418cb26822844df5b39af62b483e9e49405e13a60e57d6826aa0f3c3698920e8fc568656e2 SHA512 54881fc31ca0c9de8d8ca41ad6418e9d149975fbadbc0409f4136d4a31e70d743d55a16d4c0942305077d463c952edaa48be56d22d015983ab672dcaf5f134e2
-EBUILD raspberrypi-firmware-1.20201022.ebuild 1890 BLAKE2B 9753b9646bbc6fde102e179c085a640d655a9c1032fb92a5637fe54327e89d8f898071038c99cf7f013926f06f73795b2b5cab652838665b4a1c368459121cb3 SHA512 2bb448d45c08f68d284eb54ad2bf15e6f5b77dda2b75dbe45ae1a75476177f723336774fbe6e0956419b2822661a33db80692dcd8656b2efbb3c64e535065043
-EBUILD raspberrypi-firmware-1.20201201.ebuild 1889 BLAKE2B 9c3cc2d75c0f119a18ac174ed0bf5ca0228917e66a61bbd4a03a340693f31965c513b4de54b6d2dfba12372b387de79034943b96037dc2ecbe987f0f59fc48ae SHA512 cb9b623cece6312cfe8a22af7398ac7f1e5ce187581f7dbb4b7a878c1b9234194d7129faeb59bf34e3456b7a6e6e949bac3dcdf8d22560d262765f46b3a9a39f
-EBUILD raspberrypi-firmware-1.20210108.ebuild 1889 BLAKE2B 9c3cc2d75c0f119a18ac174ed0bf5ca0228917e66a61bbd4a03a340693f31965c513b4de54b6d2dfba12372b387de79034943b96037dc2ecbe987f0f59fc48ae SHA512 cb9b623cece6312cfe8a22af7398ac7f1e5ce187581f7dbb4b7a878c1b9234194d7129faeb59bf34e3456b7a6e6e949bac3dcdf8d22560d262765f46b3a9a39f
 EBUILD raspberrypi-firmware-1.20210527.ebuild 1889 BLAKE2B 9c3cc2d75c0f119a18ac174ed0bf5ca0228917e66a61bbd4a03a340693f31965c513b4de54b6d2dfba12372b387de79034943b96037dc2ecbe987f0f59fc48ae SHA512 cb9b623cece6312cfe8a22af7398ac7f1e5ce187581f7dbb4b7a878c1b9234194d7129faeb59bf34e3456b7a6e6e949bac3dcdf8d22560d262765f46b3a9a39f
 EBUILD raspberrypi-firmware-1.20211029.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
 EBUILD raspberrypi-firmware-1.20211118.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
deleted file mode 100644
index 9ed770d2e9df..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot readme.gentoo-r1
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-	EGIT_CLONE_TYPE="shallow"
-else
-	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* arm arm64"
-	S="${WORKDIR}/firmware-${PV}"
-fi
-
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-RESTRICT="binchecks strip"
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
-
-	if use arm64; then
-		# Force selection of the 64-bit kernel8.img to match our userland
-		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
-	fi
-}
-
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		local msg=""
-
-		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-
-		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
-			msg+="/boot/config.txt "
-		fi
-
-		if [[ -n "${msg}" ]] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove (backup) your copies durning install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
deleted file mode 100644
index 43c2288dc321..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot readme.gentoo-r1
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-	EGIT_CLONE_TYPE="shallow"
-else
-	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* arm arm64"
-	S="${WORKDIR}/firmware-${PV}"
-fi
-
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-RESTRICT="binchecks strip"
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
-
-	if use arm64; then
-		# Force selection of the 64-bit kernel8.img to match our userland
-		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
-	fi
-}
-
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		local msg=""
-
-		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-
-		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
-			msg+="/boot/config.txt "
-		fi
-
-		if [[ -n "${msg}" ]] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove (backup) your copies during install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210108.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210108.ebuild
deleted file mode 100644
index 43c2288dc321..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210108.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot readme.gentoo-r1
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-	EGIT_CLONE_TYPE="shallow"
-else
-	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* arm arm64"
-	S="${WORKDIR}/firmware-${PV}"
-fi
-
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-RESTRICT="binchecks strip"
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
-
-	if use arm64; then
-		# Force selection of the 64-bit kernel8.img to match our userland
-		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
-	fi
-}
-
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		local msg=""
-
-		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-
-		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
-			msg+="/boot/config.txt "
-		fi
-
-		if [[ -n "${msg}" ]] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove (backup) your copies during install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index e1341fc5a6f4..48a96ef77363 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,6 +1,6 @@
 AUX tboot-1.10.3-disable-Werror.patch 522 BLAKE2B e25832b544ffc81d83d963061c35432f454590b02f3c9d10ceff60f977b9b022e39193a41ded7f96c71681f7219204809dd4156bcf7ad37ea8738155b6c0469e SHA512 a219e4f1dd637fb93cd05e827ab7d1a9bbcc99b87a3f6e9e8b902d0ab08f150ad87d8804f0d506c5ac721be4d1a85a14466e036c09643601a705be0fb07e4ed4
 AUX tboot-1.10.3-disable-strip.patch 343 BLAKE2B 65d5e7f4e97504ace2d42123701de8f6e27e3ffc196b69a0afc8057ed8fe75c8274c427d858cb316d5712505381a5a109ddc5301eedc0f93c34d3ed0551deaff SHA512 f86f595d8883d433327eb906ee5fbe0c277180c7a993ae47e26c23ea8b406e59cbad28509ca399286ba306949b0d5de5dc9420242706c7affcba12d86e3f183b
 AUX tboot-1.10.3-dont-call-toolchain-directly.patch 1884 BLAKE2B 80a029eb34f3088ccb772b5e9b092b60f35516659c74d149c0ff6bc6afb7578d35e3063beadaf0dd61407f84f78f20d782c3b64c33ab566751a2317fee14aeb9 SHA512 02dd09eb4b4a65802206c066f32959ab8150933dbc37458e888dcec4cf40b25681e3f0463cd8df62149f7764956d04259c05be36aeed8d9a243d758d3a2225a2
-DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77
-EBUILD tboot-1.10.3.ebuild 1567 BLAKE2B a39d03c73be6792b6a1eae8d7bf08d21f56ba3f2a0e34371ea79ae023ceb450a064099a130941a880fb33cf4fba83ed292cd8b706f62233a8911ec1dc507c0aa SHA512 c0277eeb997b35fdd16363f63f21fb1090c434a33ae918b7646060a244c5743ce218687c75a8e45512e1a790a09d0ad2b1c3507f9e87c06f2f4c90d03504731e
+DIST tboot-1.10.4.tar.gz 908050 BLAKE2B 8c793e2ec29cc3c3aa8199ac5058e9b3521eb0a72609c8b5ae21e0843571ae765be74bb48184178e2641ff8eec05680f81e45b12b80fd7d2727c82f9c8702411 SHA512 6fe93cabd5fc10cba7797048cad2cce4c490e0112c5c877f3367d78873cb55ba3d84eb703f2fcdba807eb21f1bef6a838d315b32d6418fb88b2589ff66e99491
+EBUILD tboot-1.10.4.ebuild 1892 BLAKE2B 5de7709ef3ff7f21ecfd75cf45fc2e971493e0b2e49f3684cf451afcef5ec1e7fc317bd124e72dfc894f12f862c2ae69b689018b5e58d438c745be1d7dfc72cb SHA512 dd0024300995105f901b7132176bb23125dbf78c6ac3f03464a5abcc69677096f3fe5bcf9eb5794d89a0dfa8f0f2de3a3ddb1e14ab9246132da4e009bf954289
 MISC metadata.xml 508 BLAKE2B c28a3b0e46c57c91011bbee5ff6769ace24ab4e7b3355536b8e8c3bdb33b0be4ee1fedd60f00e2bfe8957570f763e8e85f3a1786f7a470bc5b4c855e57f7b8a2 SHA512 e45960df2560d82cb914db1f661d739b5d6747b7fb433152fef849d36d6bb4cc812def3cbafa4b362056c4d96e37980e65f8bc163b2021d5827ffd6ee9afca4d
diff --git a/sys-boot/tboot/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.4.ebuild
index cdb682a949ff..4cedba3fabfc 100644
--- a/sys-boot/tboot/tboot-1.10.3.ebuild
+++ b/sys-boot/tboot/tboot-1.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,16 @@ PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch"
 	  "${FILESDIR}/${PN}-1.10.3-disable-strip.patch"
 	  "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" )
 
+pkg_setup() {
+	if tc-is-clang; then
+		eerror "tboot is a freestanding application that uses gcc"
+		eerror "extensions in fundemental ways, include VLAIS"
+		eerror "(Variable Length Arrays in Structs) and will not"
+		eerror "compile with clang witout upstream action"
+		die "Cannot compile with clang. See bug #832020"
+	fi
+}
+
 src_configure() {
 	tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP
 
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 67f0b8187360..c331dacba913 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,4 +1,6 @@
 AUX unetbootin-675-desktop.patch 737 BLAKE2B c449895c150513ca0df22d1648d8d4a01a1c27a0afe9875631b9b19ae6680b39edbfc50a0344adaf434db28bb02bcd34b5756faf07fe1438d471d24902209e61 SHA512 fef904d63a93fc4ddbee82e097645cb090563d2448872462bba9a6a971da47b595bd63fa4fafd0f3c7630b794f2e12591435d1a413f7b8c0bfdd0664963e6335
 DIST unetbootin-700.tar.gz 16694955 BLAKE2B d8c00b56c5ae2daac696b62ef207c62dc91f67699c8823e2a751eff536d03fd0a50a931e9a4598b05d99be968b7e895ab521f605b4e0080d591a34c9e67f685e SHA512 0d1b23dddf0e0e3eca81f8ef07fe375f0867ee3fa631c3a3cfe33a846b8d704b36e0efe4c947d7c68e5c1bff370ba87c34aa52c5bf8fc414cd89777f9f1858b7
+DIST unetbootin-702.tar.gz 16694922 BLAKE2B 4205b8e5a64ecbd95e3b5f3492a01333691768547e6dbe5f954982dfa35d0794bbf8b4bc7002ff62b13675e9beaa25caf83d999489c9fabd36acc8df171e5d05 SHA512 4794a1c5481a082ab589c213156501697a9c2262102e1d0ca882a6c757d388d0ca768ed9acff29aac89f17a4842a93ab25ecbfceaafa27ea91d578e16fabe153
 EBUILD unetbootin-700.ebuild 2125 BLAKE2B 30803cbc7b7283a6ef70a7586ee20a68a18235207a034919ed59bec6437037f0d67be2de954e828453bbab12fea31a9896751598df7ad004bfe67d27ccefd64b SHA512 f7ad94b5ea04fb75d7973e0dccf40bfdf9bcb557cac6c39e4a1a5bccbe1999edc52f53f1c46c0034fb2d2d6a490c86e48db79abf9cf535cdd6788b83e3a85435
+EBUILD unetbootin-702.ebuild 2127 BLAKE2B aecb663caeafb58db6f2634b15e019ea8ba71c7e022624974044ba3f651efcd0d29502d7e5572a89ed03f0cbdf35fda589157e0419f67afac6fe65ae37aad34f SHA512 6285b600e20843f8904808243a2815a724ff37827a1d58efa42fd2a21fff2c6edfa79986037a865254560fd858e9c1521d16a87278615b3590d86d0b0cec759c
 MISC metadata.xml 309 BLAKE2B d1fcabbcd01d4cd4bfc01331588584843341e98a4dbd1bf3ebcb419d75063f3ae5dbf3fb13f7cc10be39507f338b10238c9185370bb90afe37fe8e145ac92b33 SHA512 855572f6bd3782b646d8b0ea2d908c0e7294284844fc05d343542577e9757358a9cb475fd2d79ba61e7ceb43ec810458e2ec47701580d2b9c154cd84efaa4cc1
diff --git a/sys-boot/unetbootin/unetbootin-702.ebuild b/sys-boot/unetbootin/unetbootin-702.ebuild
new file mode 100644
index 000000000000..d42e3c699212
--- /dev/null
+++ b/sys-boot/unetbootin/unetbootin-702.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic qmake-utils xdg-utils toolchain-funcs
+
+DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
+HOMEPAGE="https://github.com/unetbootin/unetbootin"
+SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+UNBI_LINGUAS="
+	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
+	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
+	zh_CN zh_TW
+"
+
+for lingua in ${UNBI_LINGUAS}; do
+	IUSE="${IUSE} l10n_${lingua/_/-}"
+done
+
+S=${WORKDIR}/${P}/src/${PN}
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	app-arch/p7zip
+	sys-boot/syslinux
+	sys-fs/mtools
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-675-desktop.patch )
+
+src_prepare() {
+	default
+
+	# QA check in case linguas are added or removed
+	enum() {
+		echo ${#}
+	}
+	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
+		|| die "Numbers of recorded and actual linguas do not match"
+	unset enum
+
+	# Remove localisations
+	local lingua
+	for lingua in ${UNBI_LINGUAS}; do
+		if ! use l10n_${lingua/_/-}; then
+			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
+			rm ${PN}_${lingua}.ts || die
+		fi
+	done
+
+	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
+
+	append-cflags -DNOSTATIC
+	append-cxxflags -DNOSTATIC
+}
+
+src_configure() {
+	export QMAKE_CXX="$(tc-getCXX)"
+
+	"$(qt5_get_bindir)/"lrelease ${PN}.pro || die
+
+	eqmake5
+}
+
+src_install() {
+	dobin ${PN}
+
+	domenu ${PN}.desktop
+
+	for file in ${PN}*.png; do
+		size="${file/${PN}_}"
+		size="${size/.png}x${size/.png}"
+		insinto /usr/share/icons/hicolor/${size}/apps
+		newins ${file} ${PN}.png
+	done
+
+	local lingua
+	for lingua in ${UNBI_LINGUAS}; do
+		if use l10n_${lingua/_/-}; then
+			insinto /usr/share/${PN}
+			doins ${PN}_${lingua}.qm
+		fi
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}