From c2e3d4969635dc07a91f0f0bd71d661f20ea6b6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 26 Jan 2019 22:19:07 +0000 Subject: sys-boot/plymouth : revision bump --- sys-boot/plymouth/files/lightdm-plymouth.service | 13 --- .../plymouth/files/plymouth-redcore-defaults.patch | 2 +- .../files/plymouth-text-redcore-colors.patch | 20 +++++ sys-boot/plymouth/plymouth-0.8.8-r3.ebuild | 93 ---------------------- sys-boot/plymouth/plymouth-0.8.8-r4.ebuild | 86 ++++++++++++++++++++ 5 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 sys-boot/plymouth/files/lightdm-plymouth.service create mode 100644 sys-boot/plymouth/files/plymouth-text-redcore-colors.patch delete mode 100644 sys-boot/plymouth/plymouth-0.8.8-r3.ebuild create mode 100644 sys-boot/plymouth/plymouth-0.8.8-r4.ebuild (limited to 'sys-boot') diff --git a/sys-boot/plymouth/files/lightdm-plymouth.service b/sys-boot/plymouth/files/lightdm-plymouth.service deleted file mode 100644 index 0ce7ddc6..00000000 --- a/sys-boot/plymouth/files/lightdm-plymouth.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Light Display Manager -Conflicts=getty@tty1.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/usr/sbin/lightdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service diff --git a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch b/sys-boot/plymouth/files/plymouth-redcore-defaults.patch index 6119c6ce..3da72cb3 100644 --- a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch +++ b/sys-boot/plymouth/files/plymouth-redcore-defaults.patch @@ -6,4 +6,4 @@ diff -Nurp plymouth-0.8.8.orig/src/plymouthd.defaults plymouth-0.8.8/src/plymout # upgrades. [Daemon] -Theme=spinner -+Theme=redcore ++Theme=text diff --git a/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch b/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch new file mode 100644 index 00000000..fe0f8f6a --- /dev/null +++ b/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch @@ -0,0 +1,20 @@ +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-r3.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild deleted file mode 100644 index ba650ee1..00000000 --- a/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild +++ /dev/null @@ -1,93 +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}-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 -} - -pkg_postinst() { - readme.gentoo_print_elog - if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then - ewarn "If you want initramfs builder with plymouth support, please emerge" - ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]." - fi -} diff --git a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild new file mode 100644 index 00000000..d46fbf53 --- /dev/null +++ b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild @@ -0,0 +1,86 @@ +# 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 +} -- cgit v1.2.3