gentoo auto-resync : 06:10:2024 - 04:27:04

6 files changed, 196 insertions, 54 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 39a7ce190f33..cd3b88fdd794 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 20b1725ed439..9d0b5ac9e42c 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -2,6 +2,8 @@ AUX 0.9.3-glibc-sysmacros.patch 1170 BLAKE2B cf3b927b3a53c419bcee9fc652346fc8e58
 AUX plymouth-22.02.122-glibc-2.36.patch 720 BLAKE2B 2e187c60b6a4f2f730a8220be3a2b26b0d65e2f11eb53829c3f5520e2a100bb5f3a9468ec75e19799050cda4c133fb177f2a37b8e183d515c14b0074950ee4c0 SHA512 e260d61313ea95d2aa7b288ce8375ab602fb7478bd38c524b3277c9328b8b36888caaf60c85bb4eba1c0af5faa4d8ecacb924b0afcbb065b6b632549b52f0599
 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
 DIST plymouth-22.02.122.tar.xz 1183608 BLAKE2B 8bb1362fcaa7d4c0fb1b69729a8a681d992a5d2abc07644d3be5cc0b19df2cac83df031165a65fa06f95042f619b9f4b7a7e1f3816528f6623473a2b1303e1be SHA512 9f2f5a7121b431f16561d6b5f31177ff06cf1e6bdffaa68c1fe08aa3c765a96dee745824aae8eaac9a0b4a08f0a17a9ae79a82bd0826fcc3fe14d8553635f817
-EBUILD plymouth-22.02.122-r1.ebuild 2806 BLAKE2B b27d69e4480e8c4ca58faf64ce443a97223ef26ba2c065a3d3408581d4f66e7c3befded307598b5ed19b42a1e31193e8a908d9974f3036c246cc52d229246c36 SHA512 605c7d2f9ddf3838d19342a22b5c11cb4822fd972fa9760a63f48e3e6ff825be0ab9f8fe655d6f28629680f7edc818d3411abae4e966125d00a7a59503076225
-EBUILD plymouth-9999.ebuild 2769 BLAKE2B c4f2b76a3b1c27de348e6883fc0a36c9efc691622f6af9258506a31214ff7c5a372b2ec1f44aba6b221d4ca97ce3e8ae90794c1960b63cec10481c965c53e5fe SHA512 183d1e3f1d5df62e176360a9eee5cf9bbb5b517b23033452a36d218bcf8ba20d5480254ac2a7bcaefaf3ca6f5cbd53e9e1dd516960bc52213bee8c4c11191b9d
-MISC metadata.xml 1074 BLAKE2B 0fe5b59b55c5e542bbe094958aad76b60b4eeb25a0873ae751d56045a810b784c95f06d447e2bc28cc5229d6de349ca95c594550490ba41f801d05291c5d4e00 SHA512 fcd7509435d01018fc52666c8214ecf50d3130b3cf0089962aed2c3679571205cb0a173871baa12bc464ce01a5a6a65cb92a01439c3b0b6ed236de876fa541d3
+DIST plymouth-24.004.60.tar.xz 1059904 BLAKE2B 092abeafb7a31d33be8c73160e87a681bcc8bdf72e79c07cca4152fc1a262dc857af5e8f31f32c850332ff6804fa5a87e05fd35b6490fa26153451f38d994434 SHA512 6c66ae81498afea75a9cc1c19ec82b26210a3bd463f14b8ea7c1cd1e327069ef32f752f4ee5236070825ee42599cf05f14271000523bdbae656a200d2e60d341
+EBUILD plymouth-22.02.122-r2.ebuild 2809 BLAKE2B e425e21d64a5789bbc61bdf9a2535be65477cd548aa8c58d7eb03d8d6670ce3b1a3ad7d474b22b0caabb057d19be1815e1f5c68e1b5d41ebe974407f15070096 SHA512 e2202a04e023a285c31880245e837c3336458c60ad74dcc70bf4b378db422eca3ec0f316ee79d5e551459cb65f661347bd3ddc4cc3a090b09ced087e11269d07
+EBUILD plymouth-24.004.60.ebuild 3323 BLAKE2B 86837b8241d5c34b9d808b2fd1b4a2b8e67d416b36ed5f1cbb8aa1e748f2c850ab6c7e56c97d84f02228cb0c5a4f4e49d1adb08c6a29bd01e2fc0aaa95218bc0 SHA512 d90345d96fc235d45913caa1f6868d1137b4441129b63c261b15cb3b9cc130baa0aa2fde966ebeb3b2effe16a48f240c3c114f85fde5f21e307c8c1224d46695
+EBUILD plymouth-9999.ebuild 3339 BLAKE2B 84b1e450bbbb975eee8a3a92503057c6dd941494b69354288e05acf0fe4830bb1d14f53846150e9547e7f947c40e62483acade0baf7982f74f9977672030b37f SHA512 dff1f78550098be06c88a60c36a411d93668a3a233c3427428b002ef3ea23077bb694b446489e117ab2c1cea820f8bf220141ed9c3288ed995971cf3bb713571
+MISC metadata.xml 1272 BLAKE2B 0024fd923ae1c290e84a27a5f44d33428a9a64e7109a862f0e41e82f9425cff0b3d3592b8da618aa45dc87ad3e1737c322faafc5974ee9c26230c79483deb454 SHA512 5e95428990e299c5ee749515b21aa0f12bac70ff565618d749fc7bc47b38d263d96719fc05e72210efdec89d68ab2a0ff66e676a61201a488c8179ae391d5d1a
diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml
index 5900b9002bfe..c35f788c4d8b 100644
--- a/sys-boot/plymouth/metadata.xml
+++ b/sys-boot/plymouth/metadata.xml
@@ -12,7 +12,12 @@
 			text prompts, e.g. for password</flag>
 		<flag name="split-usr">Enable this if /bin and /usr/bin are separate
 			directories</flag>
+		<flag name="freetype">Build with freetype support (if enabled, used for
+			encryption prompts)</flag>
 	</use>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">plymouth/plymouth</remote-id>
+	</upstream>
 	<longdescription lang="en">
 		Plymouth is an application that runs very early in the boot process
 		(even before the root filesystem is mounted!) that provides a graphical
diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r2.ebuild
index 69c07f646c9c..17cfe3a4ca4c 100644
--- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r2.ebuild
@@ -28,7 +28,7 @@ CDEPEND="
 	drm? ( x11-libs/libdrm )
 	gtk? (
 		dev-libs/glib:2
-		>=x11-libs/gtk+-3.14:3
+		>=x11-libs/gtk+-3.14:3[X]
 		x11-libs/cairo
 	)
 	pango? ( >=x11-libs/pango-1.21 )
diff --git a/sys-boot/plymouth/plymouth-24.004.60.ebuild b/sys-boot/plymouth/plymouth-24.004.60.ebuild
new file mode 100644
index 000000000000..2f4af0114ed3
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-24.004.60.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson readme.gentoo-r1 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug +drm +gtk +pango selinux freetype +split-usr +udev doc systemd"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/libevdev
+	>=media-libs/libpng-1.2.16:=
+	x11-libs/libxkbcommon
+	x11-misc/xkeyboard-config
+	drm? ( x11-libs/libdrm )
+	freetype? ( media-libs/freetype:2 )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		>=x11-libs/gtk+-3.14:3[X]
+	)
+	pango? (
+		x11-libs/cairo
+		>=x11-libs/pango-1.21
+	)
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/libudev )
+"
+
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/rpmatch-standalone )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-plymouthd )
+	udev? ( virtual/udev )
+"
+
+DOC_CONTENTS="
+	Follow the following instructions to set up Plymouth:\n
+	https://wiki.gentoo.org/wiki/Plymouth#Configuration
+"
+
+src_prepare() {
+	use elibc_musl && append-ldflags -lrpmatch
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		$(meson_feature gtk)
+		$(meson_feature freetype)
+		$(meson_feature pango)
+		$(meson_feature udev)
+		$(meson_use drm)
+		$(meson_use systemd systemd-integration)
+		$(meson_use doc docs)
+		$(meson_use debug tracing)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	insinto /usr/share/plymouth
+
+	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
+	# fix broken symlink
+	dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.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
+
+	# the file /var/spool/plymouth/boot.log is linked to the boot log after
+	# booting when there are errors, there is no runtime check to create this
+	# directory (the file is directly linked using unistd `link`) meaning there
+	# may be missing logs or unexpected behaviour if it is not kept.
+	keepdir /var/spool/plymouth
+	# /var/lib/plymouth is created at runtime, and is used to store boot/shutdown
+	# durations, it doesn't need to be created at build.
+	rm -r "${ED}"/var/lib || die
+	# /run/plymouth is also created at runtime
+	rm -r "${ED}"/run || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if ! has_version "sys-kernel/dracut"; then
+		ewarn "dracut is not installed, if you wish to have an initramfs with"
+		ewarn "plymouth support, you can emerge 'sys-kernel/dracut' otherwise"
+		ewarn "you can look at the plymouth wiki for other methods:"
+		ewarn "https://wiki.gentoo.org/wiki/Plymouth#Building_Initramfs"
+	fi
+}
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index 80e29469a5bb..7e288731c8cb 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit meson readme.gentoo-r1 flag-o-matic
 
-inherit flag-o-matic
 SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
 
 if [[ ${PV} == 9999 ]]; then
@@ -11,39 +12,51 @@ 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-inherit autotools readme.gentoo-r1 systemd
-
 DESCRIPTION="Graphical boot animation (splash) and logger"
 HOMEPAGE="https://gitlab.freedesktop.org/plymouth/plymouth"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="debug +drm +gtk +pango selinux +split-usr static-libs +udev"
+IUSE="debug +drm +gtk +pango selinux freetype +split-usr +udev doc systemd"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
 
-CDEPEND="
+COMMON_DEPEND="
+	dev-libs/libevdev
 	>=media-libs/libpng-1.2.16:=
+	x11-libs/libxkbcommon
+	x11-misc/xkeyboard-config
 	drm? ( x11-libs/libdrm )
+	freetype? ( media-libs/freetype:2 )
 	gtk? (
 		dev-libs/glib:2
-		>=x11-libs/gtk+-3.14:3
 		x11-libs/cairo
+		>=x11-libs/gtk+-3.14:3[X]
 	)
-	pango? ( >=x11-libs/pango-1.21 )
+	pango? (
+		x11-libs/cairo
+		>=x11-libs/pango-1.21
+	)
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/libudev )
 "
-DEPEND="${CDEPEND}
+
+DEPEND="${COMMON_DEPEND}
 	elibc_musl? ( sys-libs/rpmatch-standalone )
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
 "
-# Block due bug #383067
-RDEPEND="${CDEPEND}
+
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-plymouthd )
 	udev? ( virtual/udev )
-	!<sys-kernel/dracut-0.37-r3
 "
 
 DOC_CONTENTS="
@@ -51,63 +64,61 @@ DOC_CONTENTS="
 	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)
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		$(meson_feature gtk)
+		$(meson_feature freetype)
+		$(meson_feature pango)
+		$(meson_feature udev)
+		$(meson_use drm)
+		$(meson_use systemd systemd-integration)
+		$(meson_use doc docs)
+		$(meson_use debug tracing)
 	)
-	econf "${myconf[@]}"
+	meson_src_configure
 }
 
 src_install() {
-	default
-
+	meson_src_install
 	insinto /usr/share/plymouth
+
 	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
+	# fix broken symlink
+	dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png
 
-	if use split-usr ; then
+	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
+	# the file /var/spool/plymouth/boot.log is linked to the boot log after
+	# booting when there are errors, there is no runtime check to create this
+	# directory (the file is directly linked using unistd `link`) meaning there
+	# may be missing logs or unexpected behaviour if it is not kept.
+	keepdir /var/spool/plymouth
+	# /var/lib/plymouth is created at runtime, and is used to store boot/shutdown
+	# durations, it doesn't need to be created at build.
+	rm -r "${ED}"/var/lib || die
+	# /run/plymouth is also created at runtime
+	rm -r "${ED}"/run || die
 
-	# fix broken symlink
-	dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
 	if ! has_version "sys-kernel/dracut"; then
-		ewarn "If you want initramfs builder with plymouth support, please emerge"
-		ewarn "sys-kernel/dracut."
+		ewarn "dracut is not installed, if you wish to have an initramfs with"
+		ewarn "plymouth support, you can emerge 'sys-kernel/dracut' otherwise"
+		ewarn "you can look at the plymouth wiki for other methods:"
+		ewarn "https://wiki.gentoo.org/wiki/Plymouth#Building_Initramfs"
 	fi
 }