Add patch from upstream git to fix installation paths in populate-initrd, bug #499388. Thanks to Enrico Tagliavini.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 145 insertions, 16 deletions

diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog
index 985cce548250..443321669a2d 100644
--- a/sys-boot/plymouth/ChangeLog
+++ b/sys-boot/plymouth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/plymouth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.50 2014/02/02 15:56:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.51 2014/03/01 19:21:50 maksbotan Exp $
+
+*plymouth-0.8.8-r5 (01 Mar 2014)
+
+  01 Mar 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/0.8.8-initrd-binaries-paths.patch, +plymouth-0.8.8-r5.ebuild:
+  Add patch from upstream git to fix installation paths in populate-initrd, bug
+  #499388. Thanks to Enrico Tagliavini.
 
   02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> plymouth-0.8.8-r4.ebuild:
   Stable for sparc, wrt bug #487674
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index ad3bad7f0ec3..902a24cc50b3 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0.8.3-drm-reduce-minimum-build-requirements.patch 16071 SHA256 4a953c22c211f5997b2bffc1df2a626874a13dcf48838c06d0f3e43c6cc5d8a3 SHA512 f191e10bc24d25cecaf0c015807bbaa1180dd6182cf9eeae6db2e8a50c448e65b7b047dd396802b8ee19ec3d64ffb80847fea864cf93a6dd5fb8558d59bf485a WHIRLPOOL be90ab387e99b038f9daa280075e1c4648cfab3a4df71de269b2c66f73e8ca82de12605720977f57f4f6671d870c01cb392b5e9f34f46514902850564dd4e16f
 AUX 0.8.3-gentoo-fb-path.patch 804 SHA256 5496471c4ace51561054aadce35b7772ac65b54ace04329386d2b2dfc1ef8c8f SHA512 c3a06a0420bd629a55575651dc84745202baa539e55f8723eef4d87f58861776d3c4bc566c5d9d14b267ac32c484a2281416c60a5e2bf9c4b77972d43e44a0c4 WHIRLPOOL c0961c703a38f20e6ba0acbc162712c0c11f1b813ff68c171988b8e5643f5e46e55847c668f82c789e4d898f51699e4ad4caae9824ebbae53f4b512bd9b8c7a2
 AUX 0.8.3-image-replace-deprecated-libpng-function.patch 962 SHA256 37df9d046cfba685c6447a1f9360c941bf7b9e8dc80970d06486054d34c6fd86 SHA512 dbf4418d1a9dddcfcdd35a51cabd181dc04424f0d4c74962a9e865a9856531d6bbb74bb4b8870ae7fe571f03f55c853319f8c5374ff3994b9da8a2738bd7520c WHIRLPOOL 262d338d7d7ab8ec44c85fcf62324455ad59ffbc7778757ff922369900dad9dd0f6c70f6d3658753eeca00ce50b9a7c18111ad6ddefb5c4d5307d2a1c8856964
+AUX 0.8.8-initrd-binaries-paths.patch 1371 SHA256 ee9f981240f0a6de5159ee6f6c8a1110aefce7ccec93944bbd209102346c80e2 SHA512 9400b7d9b62c15acd4c9af9ce695e43117719ba311c26af773bd6a878db81458d5e3f2f89b15f9f85e78d0540fd717985f7efafb0113150aa15f25d2af947a63 WHIRLPOOL cd14830ad0617a4b70937be98ef84a89deae39d3671b058ed172f948e4e3d740535b84d0169b35cb31cbce9a12f151f4d8d7e5e8bfbb9ce58b6464bb1774d215
 DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd967bb7da356a0881fa SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c WHIRLPOOL 65496223badb9a96cc72ba6a2432860af0756eea57f67946d2466ff1c3c1171c84568c502aa576613b77767c41cf251856728b509c72003567d4cebd1943375e
 DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94 WHIRLPOOL badb44a6c1eb004772e67cfe3cda601d22590d813ebd4bce5f0fcb325c445246916ba30e083c6aa98b73b460ddf4f2caf9bf2727d22bbbc5414f11a5cf0e5ddf
 EBUILD plymouth-0.8.8-r4.ebuild 2767 SHA256 16bf4b6f9e433fa95914e02b97da1e9e0d2a179ee03a43cb5f2b454f0f0f794f SHA512 18d7e6e6ea691eec0c96463d551ae6ba84576e2dcbcb84ef74854175cae420379b4cdaef1f456225399c77d4fc104cf342182ffa0a21eb6f9831b8e84d05c204 WHIRLPOOL c9ec9c5133ed01fd02bd80986a0d41e63f6732ca2d4dba4ddc35aa431b24ab2d6794637335c18f7d8b17ab21a2b07abd38a16b7a41bbcae03724f2df3295d27f
-MISC ChangeLog 9774 SHA256 383907b96d16e03efb2ad3cef26fbf7494ee74bf8ee4281ac8aa31ebf0134959 SHA512 c8ba7a0a69cb8cca5f63a55c34d738b6692f97e53e96ff0b03a432bab413834e9208ef58ed86d13b8aa9179cdaf25e08417945c599bd672a7b741aa2a7c2e58b WHIRLPOOL 3e25bd51e109db372b2829d857aa5a6c3fbbc04d9c20b14c4937774dfd3c97c2c8f0adf024b79ade202c732660d139303f238be2cf40634b1cde08a1769046eb
+EBUILD plymouth-0.8.8-r5.ebuild 2843 SHA256 b7435ec143131eb79c982eb1bb4e6de8f6cacbe7c0a47b2c4adef1858dcbf419 SHA512 8d4ca729ba17e9c4fc8fdea5f0f09cb3e76db1296bcf2a7a212b65110665ecf049851ed58a20cd98dbd62b04fd6500bc252fcfa8af54d2b3d5e0eae308267c69 WHIRLPOOL 054044da45ffda4a53745fe95223e4ecf20570cc68002a8e5034cd20bf53cff265dc4ad6c4fa99c691dbf590310894dfcf19b9db37a94d7cd6643bd0663283fd
+MISC ChangeLog 10058 SHA256 d13169c4175d3e5110659b1146cfdaa310009441be172f7843bedb6fecb8c9b6 SHA512 51d03ff058c8aaa20d891f0649d93c56a1a795e3c2850ac64cb2c6e3514c773a0cc5b59956972f94e39fb2f6cc49a688d41e92839bc09dad8113eb57f2680074 WHIRLPOOL ccf89f23d6fef9164ae787504cf5bd8d7e008bc93e031be8f141c9c0fa47b0b8b0f076594b3f4542af855eca8d821ac45938de1e1e263c0cb8b20f149a0fc781
 MISC metadata.xml 1061 SHA256 dcc87e1d3565267896b8ae74521002fcca80215b75a234852c1dbe1835412250 SHA512 ead1b3ff73ce874e9d31bc0b7ed0b60857b718bd52dbecba32c64a5666b6fc25945098d48be450be1025ebb8d4ae4d9120e308accc4b41b4f87366e2160c8e4f WHIRLPOOL eb302cf205855390ac171c3f35b635e6a610cc76b7b038a07e4726dd12400adce77ca456a7fd66bce8ea121fac5d42fd10cfae57fea1b22dedcf4781cd47cab1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS7mqvAAoJELp701BxlEWfAbYP/Rnoek6PlPb/AVcCyls8fh0n
-6XJn2JEBbU1UCghM7iGFqadmGKCOTo0pR8kObzaplWcIT8KVJfUjdJwtdoCAoppt
-sr8ZrvIUTINplvBY74PsuwE5C2P3H+dyEiLbQpQ7fHo2wvLpD4UM304o8a/GzBy9
-LFrf42wcjqAsykiGHVBA5WP1iT9yvW6r7sYeFZy4tRFIVmt3V7srnDyABCb5K01a
-m2UCcOkyB7x9ak7CDjxjILg7AQRJqm1V25GlhB2ab5H83+FB9DNQFFnIp74bmOGD
-Nu2gmpMKXC4nPsPu01pHBLEqGM7JTUxEqDubi6lSNsrg8vGPe7srmcHWdblvmAbE
-E8Io8U/kUVGD25O2KJkdu1BpSxOWOZCexg4NhqoUqspzzuOzKRx/2oAkw3bfSqv6
-y50uit3QMeqQ5oK/4kOxyG69X6+iGwXhrvxD1/4ES2ImHJC6UdYyjRm5AP9y3Eo4
-mVC8MMe2ABwRj58GybZMZLbq7/DbWaEIC60D2jeXplu8VtxUKNiQnLNC1DxQ03bo
-LzWLXjrMXKp+YF6ZG0KxzTjrZAx90skL1+n3rdnN/ZnP50iWYjHzhZKnyk4KWi1X
-hx6+S8WDk7hpzfVSQx8GywaUsVV2+P2z3sZfz/SqXGm8aOZb8LnYlTN+4OoVHF/1
-8CG2mSD6fyBE8hLBCg0M
-=MRkT
+iQEcBAEBCAAGBQJTEjNKAAoJEAmJmMX429retKoIAIwbw1D+w6kC8JgT8tMFDHzL
+A5Q+aNpYcDv/Msst6OpMI6m2SFIFL5FT9qEIn6FWVnlHVsBA+NVtuPQEWTPl2pZn
+bsbrwFDUi1mtRwfoXmzHlquztwEjpr0+z2PQbJ44fTXUgw2d9Fhg4N+I35BxfsNP
+11ckFXUJkWayaXedQpBNS31L9bE2b34S2EHlwASxrjZ9RPPN5OJY4rAZqFiMMWkv
+W9GSYidJONBzsEZUs1eS3rhYZr0Zjz81D21mtXNhvGy2nBM5aNQRByuwdbtKY6rZ
+F0DldXzoJEu6bUdMRb4HtfhTgrjv121HVwrK0cACO1biJB3zCOgSPnTTrOEl1yQ=
+=Txds
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch b/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch
new file mode 100644
index 000000000000..7416527b0f31
--- /dev/null
+++ b/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch
@@ -0,0 +1,32 @@
+From 2d85c8d0a3ad81268718344e0e72ebeeea851422 Mon Sep 17 00:00:00 2001
+From: Enrico Tagliavini <enrico.tagliavini@gmail.com>
+Date: Wed, 29 Jan 2014 14:18:22 +0000
+Subject: populate-initrd: install binaries to their configured location
+
+If plymouth is configured --with-system-root-install=no then the
+systemd unitd files will write the paths of plymouth and plymouthd
+relative to /usr .  The script currently hardcodes installing them
+to the initrd's /
+
+This commit makes sure they get placed on the same part of the of
+the initrd filesystem as systemd expects to find them.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=74174
+---
+diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
+index d25ab07..43c7f22 100755
+--- a/scripts/plymouth-populate-initrd.in
++++ b/scripts/plymouth-populate-initrd.in
+@@ -373,8 +373,8 @@ done
+ [ -z "$INITRDDIR" ] && usage error
+ 
+ mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
+-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
+-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
++inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
++inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
+ inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
+ inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
+ inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild
new file mode 100644
index 000000000000..5b79f70008e1
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild,v 1.1 2014/03/01 19:21:50 maksbotan Exp $
+
+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
+	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
+
+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
+"
+
+DOC_CONTENTS="
+	Follow the following instructions to set up Plymouth:\n
+	http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
+"
+
+PATCHES=(
+	"${FILESDIR}/0.8.8-initrd-binaries-paths.patch"
+)
+
+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 \
+		'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
+		--enable-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
+
+	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
+
+	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
+}