[gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     d3d7ec1a087bb904251d31e83120636ccc30e2fc
Author:     Matija Skala <mskala <AT> gmx <DOT> com>
AuthorDate: Wed Nov  7 15:20:57 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 15:49:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d7ec1a

sys-boot/plymouth: add support for /usr merge

Signed-off-by: Matija Skala <mskala <AT> gmx.com>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 .../{plymouth-0.9.4.ebuild => plymouth-0.9.4-r1.ebuild}      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 f10bd902367..cab004479b7 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