From e021b8e547c88b537f3a1863e0c36264b38a7f1c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Nov 2016 10:25:24 +0000 Subject: drop unused plymouth ebuilds, adjust default theme --- sys-boot/plymouth/Manifest | 1 - .../files/plymouth-kogaion-defaults-2.patch | 9 -- .../plymouth/files/plymouth-kogaion-defaults.patch | 9 -- .../files/plymouth-redcore-defaults-2.patch | 9 ++ .../plymouth/files/plymouth-redcore-defaults.patch | 9 ++ sys-boot/plymouth/metadata.xml | 26 ------ sys-boot/plymouth/plymouth-0.8.8-r2.ebuild | 80 ----------------- sys-boot/plymouth/plymouth-0.8.8-r4.ebuild | 6 +- sys-boot/plymouth/plymouth-0.8.9_pre2-r2.ebuild | 89 ------------------ sys-boot/plymouth/plymouth-0.8.9_pre2.ebuild | 87 ------------------ sys-boot/plymouth/plymouth-0.9.0.ebuild | 100 --------------------- 11 files changed, 21 insertions(+), 404 deletions(-) delete mode 100644 sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch delete mode 100644 sys-boot/plymouth/files/plymouth-kogaion-defaults.patch create mode 100644 sys-boot/plymouth/files/plymouth-redcore-defaults-2.patch create mode 100644 sys-boot/plymouth/files/plymouth-redcore-defaults.patch delete mode 100644 sys-boot/plymouth/metadata.xml delete mode 100644 sys-boot/plymouth/plymouth-0.8.8-r2.ebuild delete mode 100644 sys-boot/plymouth/plymouth-0.8.9_pre2-r2.ebuild delete mode 100644 sys-boot/plymouth/plymouth-0.8.9_pre2.ebuild delete mode 100644 sys-boot/plymouth/plymouth-0.9.0.ebuild (limited to 'sys-boot') diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index ef42be36..e9eb462d 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -1,2 +1 @@ DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94 WHIRLPOOL badb44a6c1eb004772e67cfe3cda601d22590d813ebd4bce5f0fcb325c445246916ba30e083c6aa98b73b460ddf4f2caf9bf2727d22bbbc5414f11a5cf0e5ddf -DIST plymouth-0.9.0.tar.bz2 1159218 SHA256 d3e22e750a8a83de7377e9fa88975f146f875bbd030055411a2faf74c2e6cd4d SHA512 046e7fb20d3a65cc2b8b378026fae6619417557502426d944e4f06078eacfa37cb5fcf886d8bdb598921bbef87ce3ec92daa16a57075a180d5f427443100c232 WHIRLPOOL 3b2e327a02c18cd436f895aa38719acd07ed06f3cbd846181190144784325e8561c1ebd97516beaa396733e9981e76f3029dc29b27f3ae32f646c087529ada0d diff --git a/sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch b/sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch deleted file mode 100644 index 3642009e..00000000 --- a/sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/plymouthd.defaults -+++ b/src/plymouthd.defaults -@@ -1,5 +1,5 @@ - # Distribution defaults. Changes to this file will get overwritten during - # upgrades. - [Daemon] --Theme=spinner -+Theme=kogaion - ShowDelay=5 diff --git a/sys-boot/plymouth/files/plymouth-kogaion-defaults.patch b/sys-boot/plymouth/files/plymouth-kogaion-defaults.patch deleted file mode 100644 index b0c1b62f..00000000 --- a/sys-boot/plymouth/files/plymouth-kogaion-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=kogaion diff --git a/sys-boot/plymouth/files/plymouth-redcore-defaults-2.patch b/sys-boot/plymouth/files/plymouth-redcore-defaults-2.patch new file mode 100644 index 00000000..3642009e --- /dev/null +++ b/sys-boot/plymouth/files/plymouth-redcore-defaults-2.patch @@ -0,0 +1,9 @@ +--- a/src/plymouthd.defaults ++++ b/src/plymouthd.defaults +@@ -1,5 +1,5 @@ + # Distribution defaults. Changes to this file will get overwritten during + # upgrades. + [Daemon] +-Theme=spinner ++Theme=kogaion + ShowDelay=5 diff --git a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch b/sys-boot/plymouth/files/plymouth-redcore-defaults.patch new file mode 100644 index 00000000..b0c1b62f --- /dev/null +++ b/sys-boot/plymouth/files/plymouth-redcore-defaults.patch @@ -0,0 +1,9 @@ +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=kogaion diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml deleted file mode 100644 index 6a4d8685..00000000 --- a/sys-boot/plymouth/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - -proxy-maintainers - - enrico.tagliavini@gmail.com - Enrico Tagliavini - - - Enables smooth transition to GDM - Provides abstraction to the DRM drivers (intel, - nouveau and vmwgfx at this moment) - Installs plugin for OpenRC - Adds support for printing text on splash screen and - text prompts, e.g. for password - - - Plymouth is an application that runs very early in the boot process - (even before the root filesystem is mounted!) that provides a graphical - boot animation while the boot process happens in the background. - - It is designed to work on systems with DRM modesetting drivers. Ideally, - the goal is to get rid of all flicker during startup. For systems that - don't have DRM mode settings drivers, plymouth falls back to text mode. - - diff --git a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild deleted file mode 100644 index 398e0685..00000000 --- a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit autotools-utils 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 +openrc +pango static-libs systemd" - -CDEPEND=">=media-libs/libpng-1.2.16 - gtk? ( dev-libs/glib - >=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 - " -RDEPEND="${CDEPEND} - >=sys-kernel/dracut-008-r1[dracut_modules_plymouth] - openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd ) - >=x11-themes/kogaion-artwork-core-2 - " - -DOCS=(AUTHORS README TODO) - -src_prepare() { - 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 \ - 'sed bin failed' - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --with-system-root-install - --localstatedir=/var - $(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) - $(use_enable systemd systemd-integration) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - if use static-libs; then - mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \ - "${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed' - gen_usr_ldscript libply.so libply-splash-core.so - fi - - # Provided by kogaion-artwork-core - rm "${D}/usr/share/plymouth/bizcom.png" -} - -pkg_postinst() { - elog "Follow instructions on" - elog "" - elog " http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml" - elog "" - elog "to set up Plymouth." -} diff --git a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild index 4d37e0c2..c22e80ac 100644 --- a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild +++ b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild @@ -32,7 +32,7 @@ DEPEND="${CDEPEND} # Block due bug #383067 RDEPEND="${CDEPEND} virtual/udev - >=x11-themes/kogaion-artwork-core-1 + x11-themes/redcore-artwork-core " DOC_CONTENTS=" @@ -41,7 +41,7 @@ DOC_CONTENTS=" " src_prepare() { - epatch "${FILESDIR}/${PN}-kogaion-defaults.patch" + epatch "${FILESDIR}/${PN}-redcore-defaults.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 \ @@ -71,7 +71,7 @@ src_configure() { src_install() { autotools-utils_src_install - # Provided by kogaion-artwork-core + # Provided by redcore-artwork-core rm "${D}/usr/share/plymouth/bizcom.png" # Install compatibility symlinks as some rdeps hardcode the paths diff --git a/sys-boot/plymouth/plymouth-0.8.9_pre2-r2.ebuild b/sys-boot/plymouth/plymouth-0.8.9_pre2-r2.ebuild deleted file mode 100644 index 9b4441c3..00000000 --- a/sys-boot/plymouth/plymouth-0.8.9_pre2-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" -EGIT_COMMIT="37d2e400d25e6b4716d77d26fb7d40de8a8c1a8a" -AUTOTOOLS_AUTORECONF="true" - -inherit autotools-utils readme.gentoo systemd toolchain-funcs git-2 - -DESCRIPTION="Graphical boot animation (splash) and logger" -HOMEPAGE="http://cgit.freedesktop.org/plymouth/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="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 ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - virtual/udev - >=x11-themes/kogaion-artwork-core-1 -" - -DOC_CONTENTS=" - Follow the following instructions to set up Plymouth:\n - http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml -" - -src_prepare() { - # Kogaion: setup our default settings - epatch "${FILESDIR}/${PN}-kogaion-defaults.patch" - - epatch_user - - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --with-system-root-install=no - --localstatedir=/var - --without-rhgb-compat-link - --enable-systemd-integration - $(use_enable debug tracing) - $(use_enable gtk gtk) - $(use_enable libkms drm) - $(use_enable pango) - $(use_enable gdm gdm-transition) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - # Kogaion: provided by kogaion-artwork-core - rm "${D}/etc/plymouth/plymouthd.conf" - 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 - - systemd_newunit "${FILESDIR}"/lightdm-plymouth.service lightdm-plymouth.service - 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.9_pre2.ebuild b/sys-boot/plymouth/plymouth-0.8.9_pre2.ebuild deleted file mode 100644 index a3246270..00000000 --- a/sys-boot/plymouth/plymouth-0.8.9_pre2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" -EGIT_COMMIT="37d2e400d25e6b4716d77d26fb7d40de8a8c1a8a" -AUTOTOOLS_AUTORECONF="true" - -inherit autotools-utils readme.gentoo systemd toolchain-funcs git-2 - -DESCRIPTION="Graphical boot animation (splash) and logger" -HOMEPAGE="http://cgit.freedesktop.org/plymouth/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="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 ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - virtual/udev - >=x11-themes/kogaion-artwork-core-1 -" - -DOC_CONTENTS=" - Follow the following instructions to set up Plymouth:\n - http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml -" - -src_prepare() { - # Kogaion: setup our default settings - epatch "${FILESDIR}/${PN}-kogaion-defaults.patch" - - epatch_user - - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --with-system-root-install=no - --localstatedir=/var - --without-rhgb-compat-link - --enable-systemd-integration - $(use_enable debug tracing) - $(use_enable gtk gtk) - $(use_enable libkms drm) - $(use_enable pango) - $(use_enable gdm gdm-transition) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - # Kogaion: provided by kogaion-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.9.0.ebuild b/sys-boot/plymouth/plymouth-0.9.0.ebuild deleted file mode 100644 index ec792e37..00000000 --- a/sys-boot/plymouth/plymouth-0.9.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -SRC_URI="" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" - AUTOTOOLS_AUTORECONF="1" - inherit git-r3 -else - SRC_URI="${SRC_URI} http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2" -fi - -inherit autotools-utils readme.gentoo systemd toolchain-funcs - -DESCRIPTION="Graphical boot animation (splash) and logger" -HOMEPAGE="http://cgit.freedesktop.org/plymouth/" - -LICENSE="GPL-2" -SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="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 ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig -" -# Block due bug #383067 -RDEPEND="${CDEPEND} - virtual/udev - >=x11-themes/kogaion-artwork-core-1 - !