gentoo resync : 12.05.2022

17 files changed, 94 insertions, 177 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 351c4e836037..c41dd51f40af 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 2ab24009aea3..c3383af809f6 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -5,5 +5,5 @@ AUX lilo-24.x-fix-gcc-10.patch 1020 BLAKE2B d434248d3f4ed4d591ada4d507e5ab804862
 AUX lilo.conf 1613 BLAKE2B 0d1f1a67f270e6d0cfac6d6dbdd7468bee3405b455ab20d9095c3f63ffd608323cddcae13550799bb7cc8eb086069c38df65c501b9a3083f01c6b50383d40776 SHA512 27f544fe382f8b126b4bc45a2c60474c0bfd8ddacd7997af67c7263b98ad2eef856b687e9f36232db4cd5625be301a284f208d833aefccd04a01268993007d57
 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54
-EBUILD lilo-24.2.ebuild 4436 BLAKE2B f0f5e13abb580b1ad60576fda1de62de89654ae86a34d9e53133eefb923cef0b08cb0a85fd53cfdc7da9abc5bdc299d201ca5470d98b10afaffb2be5158def8e SHA512 63cc9019d65926bd3da1b049b32de35e979e89b382b87249ca7a9e2489bacaa4af9f8b4b1cb77bab148b0381dd164c84da0d8cda99bcf7e95b424538821430b4
+EBUILD lilo-24.2-r1.ebuild 4435 BLAKE2B 3d99bccd1790d3c0713d738620ecd8ca728da6194c68b693e99362329e835a70fdbf98a4bd99a5df45589fff7b65f842ccdadc494d6df6c1f488fe1790822659 SHA512 a0af5d45cdc470cfa9275012567646a99da76df7319e94df0252fe3537cf487fa0cb628615d9d8fa1d5b219d9105de5b0cc7824ed9d7b3536b4d74e6f729615f
 MISC metadata.xml 475 BLAKE2B e197c079a1bc1a024d6a9a1b1195459bbaeafd92a901d71c1f13f21d9e50d56fa330d40af270c0b6f6242d09efa46e4a2e859731bae18c0f0d7d9babcf2ce94a SHA512 c5928a78231fd60410ee2ff2468bf775f9077cd45d2bd5939ae3e0d92d05fa2bdfabdba362f4ec9e004429243e843a4ae6289be1506c4412a0a29218f2992ea5
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2-r1.ebuild
index 9ae96a087bd0..66040236a6d6 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -162,7 +162,7 @@ pkg_postinst() {
 			ln -snf boot-menu.b "${ROOT}/boot/boot.b"
 	fi
 
-	if [ "${ROOT}" = "/" ] && use !minimal;
+	if [[ -z "${ROOT}" ]] && use !minimal;
 	then
 		if lilocheck
 		then
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 7274fdb9fb36..99e040fd9cfe 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -3,7 +3,9 @@ AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.14.tar.gz 125207 BLAKE2B fcbc7e59552d83828c07acb055429c1155b738dd12e22c9fc81759b9f84382e3ea793e957421d420c93fa5818d5ad8f12b5317cfe6d5d45d95fc15b272c6fe8c SHA512 9d22ea2826a69a9bb661a4c17aaa78d648f0684b96c2dc0f164d2086f48fc85207e40c69227dd76d153dd171574dd62f6e5e90dd415209de372b4d7d8ab40f57
 DIST palo-2.15.tar.gz 126696 BLAKE2B 38e9defd248fc3e1f9bd921097e0888695a6a815a4221f4b030f225712f206b722232d05f5070b7a76763c50f8a623bb1a3f41c5c84a3999318f3a098d665b14 SHA512 bb46308988399028808d801317421da5a072a504e1c932513a80ee993653f45bd6cbb862c1b85c369506bca3c5d213bf8344ba263fae7ef13d8f73d9d3a6d412
+DIST palo-2.16.tar.gz 126696 BLAKE2B 06da7401d555eb0a468241e2fd71174ebfbe0b3d80d8758e65dfb57831f211dfc77128c4f3babb08ff0f99eafaec58e086751311936ee1a78a569dec50b574e2 SHA512 82f8bfe23e4722e3ee12a51b2c8691720fdc6caab368c294b0069435ba5ed07ac3e582c815bfce58fe320dd18d850bc7b1891e532429427e3735c82e32659360
 EBUILD palo-2.14.ebuild 865 BLAKE2B 25e6b3400005ea1900125949c659edd81809e855ad99a9de3b9edc06b85510ab0708989ba0224bc87972f67a862cfd001c7cf36d95acc29e1ed1ef70c897a819 SHA512 6e11b170876df9714aefba51bac1560876ba0bcc571295d97f59ad27228ffc29323e4e6af0db66c16cd6e8325de63da2e855b4473947a9cb7b3d850bcdc975ac
-EBUILD palo-2.15.ebuild 978 BLAKE2B 223154ffc3378131900fe819663f94720c15e9064302601cbc2bfe278ff36c1a8073e60c272c978ed553ee6cb6b46e6b2820ea5f9de825501f6b15d5fa0328c1 SHA512 cc4378486d184710e52e88e59adcf14902f029089c10ce7f718293eebf6ca68638ea5e478e77d7b145f2bdd738848564c9933b1facd5b40436d19b27f3f68f6e
+EBUILD palo-2.15.ebuild 977 BLAKE2B cdaea40a9edc72e432d789c7222abdbb15185205a3b852f6a3de08f9476a1c2216a3bae7583bc0c92a58c261ee1b366cacaadd4b85d42e6e04350dc476854a2b SHA512 d1e6a468c7e67b7695bb7a8538d401ecdefa461b1fe1051e2c063e4c097942910c4d65de7d6fd6f9ccf2223e218f20cd5fe68612a4ad53de8c5f57a7a4077e2c
+EBUILD palo-2.16.ebuild 978 BLAKE2B 223154ffc3378131900fe819663f94720c15e9064302601cbc2bfe278ff36c1a8073e60c272c978ed553ee6cb6b46e6b2820ea5f9de825501f6b15d5fa0328c1 SHA512 cc4378486d184710e52e88e59adcf14902f029089c10ce7f718293eebf6ca68638ea5e478e77d7b145f2bdd738848564c9933b1facd5b40436d19b27f3f68f6e
 EBUILD palo-9999.ebuild 978 BLAKE2B 223154ffc3378131900fe819663f94720c15e9064302601cbc2bfe278ff36c1a8073e60c272c978ed553ee6cb6b46e6b2820ea5f9de825501f6b15d5fa0328c1 SHA512 cc4378486d184710e52e88e59adcf14902f029089c10ce7f718293eebf6ca68638ea5e478e77d7b145f2bdd738848564c9933b1facd5b40436d19b27f3f68f6e
 MISC metadata.xml 256 BLAKE2B 86720639750e95cde1d1b34e7f02625e2d2d4385d22da069148aef8fc91f845dafc168064aac300413fdf74f8ac0381ba0fc353af36aa2919cb93360ee20bb88 SHA512 ebd15404f5a5443197bc12bea96924ad05b7eeb808582193c9caf857c2908bf5abf2886d192dd113303e006305ee966a35297d79beec063e7d0bb23612cc598f
diff --git a/sys-boot/palo/palo-2.15.ebuild b/sys-boot/palo/palo-2.15.ebuild
index 2956c2939a97..c4c6eddfa190 100644
--- a/sys-boot/palo/palo-2.15.ebuild
+++ b/sys-boot/palo/palo-2.15.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="-* ~hppa"
+	KEYWORDS="-* hppa"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-boot/palo/palo-2.16.ebuild b/sys-boot/palo/palo-2.16.ebuild
new file mode 100644
index 000000000000..2956c2939a97
--- /dev/null
+++ b/sys-boot/palo/palo-2.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="PALO: PArisc Linux Loader"
+HOMEPAGE="https://parisc.wiki.kernel.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="-* ~hppa"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.00-toolchain.patch
+)
+
+src_compile() {
+	local target
+	for target in '-C palo' '-C ipl' 'iplboot'; do
+		emake AR="$(tc-getAR)" CC="$(tc-getCC)" LD="$(tc-getLD)" ${target}
+	done
+}
+
+src_install() {
+	into /
+	dosbin palo/palo
+
+	insinto /usr/share/palo
+	doins iplboot
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf
+
+	insinto /etc/kernel/postinst.d
+	insopts -m 0744
+	doins "${FILESDIR}"/99palo
+
+	doman palo.8
+
+	dodoc TODO debian/changelog README.html
+}
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 1a64fd3aba3c..8736870a5f93 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -3,8 +3,8 @@ DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da
 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
+EBUILD plymouth-0.9.5-r2.ebuild 2817 BLAKE2B 9a26e26b344bdede07eac1fcf51423e6f66dbf9d9dd1560f552c58e5595a8dc376e66e2b4818117f233261d364f1ec831bbebf5c88fda9b884de20052197371b SHA512 c5713d81148c8ef409c34035f95eec234fc2591da2115f47d52017766bd3bdc47ed6b95a8b08759b2bb7266d849b65e41c1c66e748b81019ca26ea67db23dc4a
+EBUILD plymouth-0.9.6_pre20211225-r1.ebuild 2939 BLAKE2B b9e69a220112dba150a28130b24b01f5ec15d9234b5371e5f0ac7d25eb52e364cde13b81ecb8592b30c0cea5b8c81ce02e355fb913fe6bce509c5cd81170389a SHA512 92584abfc76c6d3e52c2749373ae0725556bb7781240bdde1c042c10ae2c23c153f873f3a4be5d72bb6e6acce7d2d71cde833edbf1a7b27493ae3a9e466d5419
+EBUILD plymouth-22.02.122-r1.ebuild 2808 BLAKE2B acbe8b37182c47c8ad0c6dd0f4e0ca27da16774f6d86cd6678b29b0bf55225f12013e187ed2dd852d182329d3f754bac7ad7ae0d08d5834193cb45db3f901a31 SHA512 a211e23ce5e30bdffe366f0958363356521ae5cf78d0e19265b1544e5be60b48f22650f135841d4d941d9b42c9fe2773444a59d071d4c0dcc24c51bde3a43de1
+EBUILD plymouth-9999.ebuild 2808 BLAKE2B acbe8b37182c47c8ad0c6dd0f4e0ca27da16774f6d86cd6678b29b0bf55225f12013e187ed2dd852d182329d3f754bac7ad7ae0d08d5834193cb45db3f901a31 SHA512 a211e23ce5e30bdffe366f0958363356521ae5cf78d0e19265b1544e5be60b48f22650f135841d4d941d9b42c9fe2773444a59d071d4c0dcc24c51bde3a43de1
+MISC metadata.xml 1074 BLAKE2B 0fe5b59b55c5e542bbe094958aad76b60b4eeb25a0873ae751d56045a810b784c95f06d447e2bc28cc5229d6de349ca95c594550490ba41f801d05291c5d4e00 SHA512 fcd7509435d01018fc52666c8214ecf50d3130b3cf0089962aed2c3679571205cb0a173871baa12bc464ce01a5a6a65cb92a01439c3b0b6ed236de876fa541d3
diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml
index 3c5e3d8bbaf5..5900b9002bfe 100644
--- a/sys-boot/plymouth/metadata.xml
+++ b/sys-boot/plymouth/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="libkms">Provides abstraction to the DRM drivers (intel,
+		<flag name="drm">Provides abstraction to the DRM drivers (intel,
 			nouveau and vmwgfx at this moment)</flag>
 		<flag name="pango">Adds support for printing text on splash screen and
 			text prompts, e.g. for password</flag>
diff --git a/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.5-r2.ebuild
index 62560bb5edb7..5dd00723beda 100644
--- a/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,16 +21,16 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
+IUSE="debug +drm +gtk +pango +split-usr static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
+	drm? ( x11-libs/libdrm )
 	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}
@@ -71,8 +71,8 @@ src_configure() {
 		$(use_enable !static-libs shared)
 		$(use_enable static-libs static)
 		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms drm)
+		$(use_enable drm)
+		$(use_enable gtk)
 		$(use_enable pango)
 		$(use_with udev)
 	)
diff --git a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild
index 0c17e6c5bc8b..7ee910f6b422 100644
--- a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild
@@ -23,16 +23,16 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
+IUSE="debug +drm +gtk +pango +split-usr static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
+	drm? ( x11-libs/libdrm )
 	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}
@@ -73,8 +73,8 @@ src_configure() {
 		$(use_enable !static-libs shared)
 		$(use_enable static-libs static)
 		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms drm)
+		$(use_enable drm)
+		$(use_enable gtk)
 		$(use_enable pango)
 		$(use_with udev)
 	)
diff --git a/sys-boot/plymouth/plymouth-22.02.122.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
index 98bb6eb92ea2..e3ad01aa6372 100644
--- a/sys-boot/plymouth/plymouth-22.02.122.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
@@ -21,16 +21,16 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
+IUSE="debug +drm +gtk +pango +split-usr static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
+	drm? ( x11-libs/libdrm )
 	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}
@@ -71,8 +71,8 @@ src_configure() {
 		$(use_enable !static-libs shared)
 		$(use_enable static-libs static)
 		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms drm)
+		$(use_enable drm)
+		$(use_enable gtk)
 		$(use_enable pango)
 		$(use_with udev)
 	)
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index 3f303786005d..e3ad01aa6372 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,16 +21,16 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
+IUSE="debug +drm +gtk +pango +split-usr static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
+	drm? ( x11-libs/libdrm )
 	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}
@@ -71,8 +71,8 @@ src_configure() {
 		$(use_enable !static-libs shared)
 		$(use_enable static-libs static)
 		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms drm)
+		$(use_enable drm)
+		$(use_enable gtk)
 		$(use_enable pango)
 		$(use_with udev)
 	)
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 4c64779f2adc..d28cb4a18352 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,12 +1,8 @@
 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.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
 DIST raspberrypi-firmware-1.20220328.tar.gz 195699471 BLAKE2B e39ae746b46eb4f63aa2043df9fb60ce23b966d172e2c2c311942425e62896fb8ef171689c420bf2545065514a331e46c3bfb4d028eab8eea251357ee4c947f3 SHA512 b9e8676a94dce4621af25b8ba563a2dbd93f6fad61f5c5fb8b57b0ff5262151ff61598ce56a5f952f99f6e37f7c9ebf801a51849ee45ee328a168ca88e2522f3
-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 1889 BLAKE2B c381485a3cf3bf5812190158c90726a82a9b35edee84358b7feed0c1255b0ab61088a4255c734ea7fa0d56f8e21a45f8e74a37398b52b6ea0c97b7987dad99e9 SHA512 63fefccade1dcb9a109953b33c65b45b70b8d76caa673f35049480c3cfa32590466e851ea1e5653b8574d45f4293eacb2b7baa2bfeb0b6e63e020e11503d4dbe
 EBUILD raspberrypi-firmware-1.20220328.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
 EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210527.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210527.ebuild
deleted file mode 100644
index 43c2288dc321..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210527.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.20211029.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211029.ebuild
deleted file mode 100644
index 263276be82c7..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211029.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/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index eb43c44feebe..718605c8653d 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -4,4 +4,5 @@ DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6d
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 EBUILD systemd-boot-249.6.ebuild 2821 BLAKE2B aea61338aa4403de38db6527c74074519817f77df1dd2f1737767de7cb93e7084af9c8d11f7ae919e29f2aedd7ca00223561ce48b35d43a6544fe9cd009f06ad SHA512 efca3f4fbd43623e5d8033e32e6004576edca8d6b548c11568898d2eae7aabd05134bca8caf9732bb848dfa74cfe247d920a7b24672f4bd7a673af6b25b8dffd
 EBUILD systemd-boot-249.9.ebuild 2862 BLAKE2B 2ebe2d513f74ab4abc9b29e61ffcdb1a905469425a50c1304200baf2ce50690cba183614c879d2c759db040022680c86728d021cd1e138e6eb1287b5a2fcbd7e SHA512 4f54e310315e560d89ee10e35295139d95f52e84b217f269c3a9d9bddc7a67f44f87dc5670116903a8de10218a0e68bd5695894c554dce03397a0de5da205b32
+EBUILD systemd-boot-250-r1.ebuild 302 BLAKE2B 6d967192962d2235ae0a635eeee50babfdbb9d0a42f98d226904a1784d75fa67c6d13f0c401666e3d63c5d1fce035f8a557088cf2da39b21be81d0d5a85f0562 SHA512 44036cd593cceda8a87935747c4bfdc003bea875ec98817075546b311dcc431d69e1215e0f0c00becbe992cbf89509a31fac3cd2ce96abbfa17a63a9f49f3b7a
 MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8
diff --git a/sys-boot/systemd-boot/systemd-boot-250-r1.ebuild b/sys-boot/systemd-boot/systemd-boot-250-r1.ebuild
new file mode 100644
index 000000000000..ccebd831dc8f
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-250-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual package to depend on sys-apps/systemd-utils"
+HOMEPAGE="https://systemd.io/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="sys-apps/systemd-utils[boot]"