From d3d7ec1a087bb904251d31e83120636ccc30e2fc Mon Sep 17 00:00:00 2001 From: Matija Skala Date: Wed, 7 Nov 2018 16:20:57 +0100 Subject: [PATCH] sys-boot/plymouth: add support for /usr merge Signed-off-by: Matija Skala Signed-off-by: Matthew Thode --- ...lymouth-0.9.4.ebuild => plymouth-0.9.4-r1.ebuild} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) rename sys-boot/plymouth/{plymouth-0.9.4.ebuild => plymouth-0.9.4-r1.ebuild} (88%) diff --git a/sys-boot/plymouth/plymouth-0.9.4.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild similarity index 88% rename from sys-boot/plymouth/plymouth-0.9.4.ebuild rename to sys-boot/plymouth/plymouth-0.9.4-r1.ebuild index f10bd9023672..cab004479b73 100644 --- a/sys-boot/plymouth/plymouth-0.9.4.ebuild +++ b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/" LICENSE="GPL-2" SLOT="0" -IUSE="debug gdm +gtk +libkms +pango static-libs" +IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs" CDEPEND=" >=media-libs/libpng-1.2.16:= @@ -85,10 +85,12 @@ src_install() { insinto /usr/share/plymouth newins "${DISTDIR}"/gentoo-logo.png 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 + 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 -- 2.26.2