From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 May 2022 16:42:50 +0300
Subject: gentoo resync : 12.05.2022

---
 sys-boot/plymouth/Manifest                         |  10 +-
 sys-boot/plymouth/metadata.xml                     |   2 +-
 sys-boot/plymouth/plymouth-0.9.5-r1.ebuild         | 112 --------------------
 sys-boot/plymouth/plymouth-0.9.5-r2.ebuild         | 112 ++++++++++++++++++++
 .../plymouth/plymouth-0.9.6_pre20211225-r1.ebuild  | 114 +++++++++++++++++++++
 .../plymouth/plymouth-0.9.6_pre20211225.ebuild     | 114 ---------------------
 sys-boot/plymouth/plymouth-22.02.122-r1.ebuild     | 112 ++++++++++++++++++++
 sys-boot/plymouth/plymouth-22.02.122.ebuild        | 112 --------------------
 sys-boot/plymouth/plymouth-9999.ebuild             |  10 +-
 9 files changed, 349 insertions(+), 349 deletions(-)
 delete mode 100644 sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
 create mode 100644 sys-boot/plymouth/plymouth-0.9.5-r2.ebuild
 create mode 100644 sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild
 delete mode 100644 sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
 create mode 100644 sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
 delete mode 100644 sys-boot/plymouth/plymouth-22.02.122.ebuild

(limited to 'sys-boot/plymouth')

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-r1.ebuild
deleted file mode 100644
index 62560bb5edb7..000000000000
--- a/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 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 toolchain-funcs
-
-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/plymouth/plymouth-0.9.5-r2.ebuild b/sys-boot/plymouth/plymouth-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..5dd00723beda
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.9.5-r2.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 toolchain-funcs
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+
+LICENSE="GPL-2"
+SLOT="0"
+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
+	)
+	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 drm)
+		$(use_enable gtk)
+		$(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/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild
new file mode 100644
index 000000000000..7ee910f6b422
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild
@@ -0,0 +1,114 @@
+# 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
+	PRE_RELEASE_SHA="5b91b9ed84cc91759c986634a4d64d474e6092cf"
+	SRC_URI="${SRC_URI} https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PRE_RELEASE_SHA}/${PN}-${PRE_RELEASE_SHA}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+	S="${WORKDIR}/${PN}-${PRE_RELEASE_SHA}"
+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 +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
+	)
+	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 drm)
+		$(use_enable gtk)
+		$(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/plymouth/plymouth-0.9.6_pre20211225.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
deleted file mode 100644
index 0c17e6c5bc8b..000000000000
--- a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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
-	PRE_RELEASE_SHA="5b91b9ed84cc91759c986634a4d64d474e6092cf"
-	SRC_URI="${SRC_URI} https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PRE_RELEASE_SHA}/${PN}-${PRE_RELEASE_SHA}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-	S="${WORKDIR}/${PN}-${PRE_RELEASE_SHA}"
-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/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
new file mode 100644
index 000000000000..e3ad01aa6372
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-22.02.122-r1.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 +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
+	)
+	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 drm)
+		$(use_enable gtk)
+		$(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/plymouth/plymouth-22.02.122.ebuild b/sys-boot/plymouth/plymouth-22.02.122.ebuild
deleted file mode 100644
index 98bb6eb92ea2..000000000000
--- a/sys-boot/plymouth/plymouth-22.02.122.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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/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)
 	)
-- 
cgit v1.2.3