gentoo resync : 04.01.2022

3 files changed, 120 insertions, 4 deletions

diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 31887af40066..d6552a235a15 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1,6 +1,8 @@
 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-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c
 EBUILD plymouth-0.9.5-r1.ebuild 2842 BLAKE2B eb780d50b0a0387d7f1ed07fab92940c941ad8b6f39519e4a44be1a607d1f0ac9a06c39a1c13f95f6ba39b52e88f4c759604f58717e14527af37422497b2bdd2 SHA512 6502ae41b78a7707380653f16eaf95626345373d7371b50b8ce83658ca0eaf1be2fb83deb1403d31bd47daddf2b6f788d8fe320f0c9989bc30c046a54068618f
-EBUILD plymouth-9999.ebuild 2842 BLAKE2B 5532186751dcab43af99688bda02adeb52b830823aa5cfc4120f86f0e7af0cab0407a78533a6ead3cd4b10e5be623de8a8d03eebd6734028743f3262b3edcf6f SHA512 c64d05ed58031b10558feaed13c201e298ff48bf88c8e594dddd6c4f47dc89278631a55ab4976ec8dd4926f7ad10193cdf77d4868c173125251fedd536061f15
+EBUILD plymouth-0.9.6_pre20211225.ebuild 2971 BLAKE2B 3445fbb4b78f1309332ee149e526e3a037b533ce6874933fcd3afa8b5bb9347e10c8c1e2fd2667a04f46ebff3295765c435d53fbd7a9ba94c26fa1e7adbeb472 SHA512 8193f9091fbb95f4771e08acc9cf7626be3b537af0e6f1276f01def003d45ac3f1c63db627a741b965abfc5510841950aafac4bdfe88a994174def0d1b6627de
+EBUILD plymouth-9999.ebuild 2833 BLAKE2B 80536368b14223aef2a3bc29444dafe9e4a4f81067fecde31b5f703ba7f5de56304cf476613c75d942baf91dfcdfe44192d437f401acadd856083e9c8e079864 SHA512 2e86c5be326acd5d4fe974207a986f2822c6e2bac16dbd76a8e785277b3c854e6aa4f50ac51c6d5043e9e8a21d82acb849d0c73e3b4d2e5fc97fe48e288b62dd
 MISC metadata.xml 1077 BLAKE2B b8226140cc34ea498fb1792e89ed3976a54dbaf49989ec76900eb1619cf27a1a4568d88ff0d979d085286f197f6c125fb1dc6bcff294d94a979ba5816711f56e SHA512 6ed57ac55fa2011204c8bb1e2c41697c91bd89f30d272bf581d9c5cf8e387a4f26e958e46a0fa79bc802345c3053556d88da0b5999481b73f4ac0643a2c8f3c7
diff --git a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
new file mode 100644
index 000000000000..6f1b09a81b37
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
@@ -0,0 +1,114 @@
+# 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
+	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-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index 3c47d67a881e..3f303786005d 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,10 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-inherit autotools readme.gentoo-r1 systemd toolchain-funcs
+inherit autotools readme.gentoo-r1 systemd
 
 DESCRIPTION="Graphical boot animation (splash) and logger"
 HOMEPAGE="https://cgit.freedesktop.org/plymouth/"