sys-boot/plymouth : version bump (v0.9.4) -> this one works

9 files changed, 159 insertions, 148 deletions

diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 3885affa..8c959d02 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1 +1 @@
-DIST plymouth-0.8.8.tar.bz2 1143549 BLAKE2B 39839b2c230f97ec91ea3ba39dc16e89c1cfeed1f92d164af72d0c1705f7838cfd640d423313ffedafc091b3ff30fa493e8d5a9ad87f54ea6d99eb039aa7e9d8 SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94
+DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
diff --git a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
new file mode 100644
index 00000000..8969161b
--- /dev/null
+++ b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
@@ -0,0 +1,45 @@
+From f8d7813b32dfe129d1e5718719ee3eff131f4fac Mon Sep 17 00:00:00 2001
+From: Kjell Claesson <kjell.claesson@epost.tidanet.se>
+Date: Fri, 18 Aug 2017 00:25:56 +0200
+Subject: [PATCH] Fix build with newer glibc
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac                          | 1 +
+ src/libply-splash-core/ply-terminal.c | 8 ++++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c32697f..8376789 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ AC_CONFIG_AUX_DIR(build-tools)
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
++AC_HEADER_MAJOR
+ AC_PROG_AWK
+ AC_PROG_CC_STDC
+ AM_PROG_CC_C_O
+diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
+index a0954f2..ef62bf8 100644
+--- a/src/libply-splash-core/ply-terminal.c
++++ b/src/libply-splash-core/ply-terminal.c
+@@ -36,6 +36,14 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ 
++/* major()/minor() */
++#ifdef MAJOR_IN_MKDEV
++#    include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++#    include <sys/sysmacros.h>
++#endif
++
+ #include <linux/kd.h>
+ #include <linux/major.h>
+ #include <linux/vt.h>
+-- 
+2.14.1
+
diff --git a/sys-boot/plymouth/files/plymouth-default-theme.patch b/sys-boot/plymouth/files/plymouth-default-theme.patch
new file mode 100644
index 00000000..55df932b
--- /dev/null
+++ b/sys-boot/plymouth/files/plymouth-default-theme.patch
@@ -0,0 +1,11 @@
+diff -Nur a/src/plymouthd.defaults b/src/plymouthd.defaults
+--- a/src/plymouthd.defaults	2018-09-20 18:53:38.000000000 +0100
++++ b/src/plymouthd.defaults	2020-04-25 02:14:12.014468210 +0100
+@@ -1,6 +1,4 @@
+ # Distribution defaults. Changes to this file will get overwritten during
+ # upgrades.
+ [Daemon]
+-Theme=spinner
+-ShowDelay=5
+-DeviceTimeout=5
++Theme=redcore
diff --git a/sys-boot/plymouth/files/plymouth-fix-window-size-with-multiple-heads.patch b/sys-boot/plymouth/files/plymouth-fix-window-size-with-multiple-heads.patch
deleted file mode 100644
index 53172d1a..00000000
--- a/sys-boot/plymouth/files/plymouth-fix-window-size-with-multiple-heads.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c
---- a/src/plugins/splash/script/script-lib-sprite.c	2012-09-26 17:50:53.000000000 +0100
-+++ b/src/plugins/splash/script/script-lib-sprite.c	2018-04-12 01:20:25.782074829 +0100
-@@ -233,7 +233,7 @@
-       if (width == 0)
-         width = ply_pixel_display_get_width (display->pixel_display);
-       else
--        width = MIN (width, ply_pixel_display_get_width (display->pixel_display));
-+        width = MAX (width, ply_pixel_display_get_width (display->pixel_display));
-     }
-   return script_return_obj (script_obj_new_number (width));
- }
-@@ -273,7 +273,7 @@
-       if (height == 0)
-         height = ply_pixel_display_get_height (display->pixel_display);
-       else
--        height = MIN (height, ply_pixel_display_get_height (display->pixel_display));
-+        height = MAX (height, ply_pixel_display_get_height (display->pixel_display));
-     }
-   return script_return_obj (script_obj_new_number (height));
- }
diff --git a/sys-boot/plymouth/files/plymouth-include-sysmacros.patch b/sys-boot/plymouth/files/plymouth-include-sysmacros.patch
deleted file mode 100644
index 7f39fa1a..00000000
--- a/sys-boot/plymouth/files/plymouth-include-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
---- a/src/libply-splash-core/ply-terminal.c	2012-09-26 17:50:53.000000000 +0100
-+++ b/src/libply-splash-core/ply-terminal.c	2018-02-21 11:04:49.318694569 +0000
-@@ -32,6 +32,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <termios.h>
- #include <unistd.h>
- #include <wchar.h>
diff --git a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch b/sys-boot/plymouth/files/plymouth-redcore-defaults.patch
deleted file mode 100644
index 3da72cb3..00000000
--- a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nurp plymouth-0.8.8.orig/src/plymouthd.defaults plymouth-0.8.8/src/plymouthd.defaults
---- plymouth-0.8.8.orig/src/plymouthd.defaults	2012-09-26 18:50:53.000000000 +0200
-+++ plymouth-0.8.8/src/plymouthd.defaults	2013-11-15 14:10:58.638895827 +0100
-@@ -1,4 +1,4 @@
- # Distribution defaults. Changes to this file will get overwritten during
- # upgrades.
- [Daemon]
--Theme=spinner
-+Theme=text
diff --git a/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch b/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch
deleted file mode 100644
index fe0f8f6a..00000000
--- a/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nurp plymouth-0.8.8.orig/src/plugins/splash/text/plugin.c plymouth-0.8.8/src/plugins/splash/text/plugin.c
---- plymouth-0.8.8.orig/src/plugins/splash/text/plugin.c	2019-01-26 16:06:17.245381656 +0200
-+++ plymouth-0.8.8/src/plugins/splash/text/plugin.c	2019-01-26 15:34:11.185772000 +0200
-@@ -177,13 +177,13 @@ view_start_animation (view_t *view)
-                                     0x000000);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_WHITE,
--                                    0xffffff);
-+                                    0xDDDDDD);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BLUE,
--                                    0x0073B3);
-+                                    0x8f0A0A);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BROWN,
--                                    0x00457E);
-+                                    0x520A0A);
- 
-   ply_text_display_set_background_color (view->display,
-                                          PLY_TERMINAL_COLOR_BLACK);
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild
deleted file mode 100644
index d46fbf53..00000000
--- a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit autotools-utils readme.gentoo systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +pango static-libs"
-
-CDEPEND="
-	>=media-libs/libpng-1.2.16
-	gtk? (
-		dev-libs/glib:2
-		>=x11-libs/gtk+-2.12:2 )
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-# Block due bug #383067
-RDEPEND="${CDEPEND}
-	virtual/udev
-	x11-themes/redcore-artwork-core
-"
-
-DOC_CONTENTS="
-	Follow the following instructions to set up Plymouth:\n
-	http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-redcore-defaults.patch"
-	epatch "${FILESDIR}/${PN}-text-redcore-colors.patch"
-	epatch "${FILESDIR}/${PN}-include-sysmacros.patch"
-	epatch "${FILESDIR}/${PN}-fix-window-size-with-multiple-heads.patch"
-
-	sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
-		systemd-units/systemd-ask-password-plymouth.service.in || die \
-		'ask-password sed failed'
-	sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \
-		systemd-units/plymouth-start.service.in || die 'udevadm sed failed'
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install=no
-		--localstatedir=/var
-		--without-rhgb-compat-link
-		--disable-systemd-integration
-		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# Provided by redcore-artwork-core
-	rm "${D}/usr/share/plymouth/bizcom.png"
-
-	# 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
-
-	readme.gentoo_create_doc
-}
diff --git a/sys-boot/plymouth/plymouth-0.9.4-r10.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r10.ebuild
new file mode 100644
index 00000000..f803374c
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.9.4-r10.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
+else
+	SRC_URI="https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+fi
+
+inherit autotools readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gdm +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 )
+	x11-themes/redcore-artwork-core
+	!<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
+	"${FILESDIR}"/"${PN}"-default-theme.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
+		--disable-systemd-integration
+		$(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_enable gdm gdm-transition)
+		$(use_with udev)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Provided by redcore-artwork-core
+	rm "${D}/usr/share/plymouth/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
+}