sys-boot/plymouth: revbump to 0.8.3-r5; fixes bug #372699; del 'branding' flag

Split plymouth-openrc-plugin from sys-boot/plymouth. 'branding' flag was
abandoned and Gentoo logo is installed unconditionally now.  New 'openrc' flag
pulls sys-boot/plymouth-openrc-plugin.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 105 insertions, 11 deletions

diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog
index 0a1d02569bb8..9ca5ce0bef24 100644
--- a/sys-boot/plymouth/ChangeLog
+++ b/sys-boot/plymouth/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/plymouth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.13 2011/06/28 21:51:11 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.14 2011/07/03 10:06:14 aidecoe Exp $
+
+*plymouth-0.8.3-r5 (03 Jul 2011)
+
+  03 Jul 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +plymouth-0.8.3-r5.ebuild, metadata.xml:
+  Split plymouth-openrc-plugin from sys-boot/plymouth. 'branding' flag was
+  abandoned and Gentoo logo is installed unconditionally now.  New 'openrc'
+  flag pulls sys-boot/plymouth-openrc-plugin.  Fixes bug #372699.
 
   28 Jun 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
   plymouth-0.8.3-r2.ebuild, plymouth-0.8.3-r4.ebuild:
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 040fefed2433..27629f82c9de 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -10,16 +10,17 @@ DIST plymouth-0.8.3.tar.bz2 763575 RMD160 bb5c13e4eb48d8b881a4d2cc15190c377430f6
 DIST plymouth-openrc-plugin-0.1.1.tar.bz2 8581 RMD160 64c300ea9a34b84ac13bdd3b55758fa0094493c1 SHA1 c6b103e13503b705a1314fb07c6bc45851a598e5 SHA256 5c176703b61bd4406955ee104c478359dc8849ed7f8fca59da138232e3e1e24c
 EBUILD plymouth-0.8.3-r2.ebuild 2750 RMD160 72f0698f4a74f4cd25947e11b6077046c5ed546d SHA1 fba1e9b2f1c4675b920d3e7db21ef2ff7f55ea37 SHA256 da01c6dc5817f65ef5b779d9bb3e82c45b4aab2219b9cc6802fb94ab42c93ecb
 EBUILD plymouth-0.8.3-r4.ebuild 3284 RMD160 8e63f196e3b3c8272ae44a23048f4ee7df44f40d SHA1 2379e92fd712c3117f88033dd3fed5ce28e75de0 SHA256 e95c8d10652fe449752a65570d420fa84e27ae84b0d90ee3e612a216dddbbb20
-MISC ChangeLog 3722 RMD160 d2be16dc840901b2e5b0c2c370127a7a4dd16a09 SHA1 f1049409f15f991a75c9795773c74146609e9978 SHA256 0100e37f982a8b63a1893c5aaa1ebf49737ac2fec172d0aad3acdf8eb49ff8ad
-MISC metadata.xml 934 RMD160 c4e613323d2fdcb37da960a70e8007f621175f9f SHA1 215e19611a27faac61e967abff864450f1a9ed85 SHA256 d05a2ceb21ed3d6c9854dbd15446555cdf1bba95622e86bae8c6550f314f8ce6
+EBUILD plymouth-0.8.3-r5.ebuild 2407 RMD160 24345de401f8839fe0c7f38becaf0d7d4869466b SHA1 296819df941528b7bc5dc1aa007e1d5f2ac3dfdf SHA256 74e0590d9491cacd5300f6d7c080defd8295b2b99d0f7cad1be562dfa85209ed
+MISC ChangeLog 4074 RMD160 bfa71b8b1b857dbe7a95af31f95dddd1769fa3fa SHA1 99bd27aee88d104d9d6f30dbf01b6d0d73dd6752 SHA256 63c81ae902a6f8636503a8dd8c0a1008a44ea59c4c4845252068b57e93fcc5f8
+MISC metadata.xml 991 RMD160 95c6c74c0a5d820a285afaf860471a59a1a920a7 SHA1 f4435f07d3de3ce39439651f34597f67a9a5ab1d SHA256 c3a37d5a27c547a1e24b61f81c56dbffe29932ad0395bfbea927128043d6f21d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOCkzWAAoJEPATRTHh2/q1bJ8H/2Ty96AX+6TPFfqcQoPpbVcA
-kcVr5Wrp/QL5QI4/H6hc0LZGB4QAUFh5wcMgE0mYODst1z1ZLiOkbGxe6XGFJEEl
-8RRFeJTT2c7bJUXkitpJraGQsCEaNDcNoeOj7YjfzRtupF/TYoB/Vsr1/fqGGbvY
-H655lD+XAsioPcJwTUAHYJNPx/ajkZCG5n14mZIbuF5Za0L+CFtC5aZb7Ga3U+jL
-cZbeU8lOyvNC+pwoVKuYS5MrnVTTFTfchl7w1s+hdn3bJnvrSLUN57dZcDigESpz
-crrsakNe5YWgYTdiRtFxYMNUV3v0WmR0i1nQkudRrNSVwGd1waktBkRHFJ8qeEI=
-=hgSa
+iQEcBAEBAgAGBQJOED8cAAoJEPATRTHh2/q1NU8IAIBhsutNmZyBv6KCe+zFkyZZ
+eAdgQsQcvPL3glfotYJGRGAWzjq5YKww6V+6qQvtJuXg4h9saP6eJ9tq25SmqcsG
+2BTWJII/AgzsqU4lFMHqVOeAqFXCoaEIs+tz+ffEZd/FAkA0qDvdRUTCCA/bRz/2
+HZ0TAQ3JcPxBJrNZ6kllkN8dkueCFxGtvBoIOnVtX2lIk3PZu8mVX7Vr9QZMIv7b
+0+qNehI/wA7afoi3jNmj0SRKHVxgN32YOg0QlTSiaa6vk6SSU2LVnMFmG/ZWXVgG
+SfjhVikgKOUqdiNMKSG6svsxEb9zsyj8YmrC5BJxy/KBMQBZHITJPG/PRNXWD+Q=
+=8exf
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml
index fd47d75317f4..fcda37f7deac 100644
--- a/sys-boot/plymouth/metadata.xml
+++ b/sys-boot/plymouth/metadata.xml
@@ -7,7 +7,8 @@
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
 	<use>
-		<flag name="gdm">Enable smooth transition to GDM</flag>
+		<flag name="gdm">Enables smooth transition to GDM</flag>
+		<flag name="openrc">Installs plugin for OpenRC</flag>
 		<flag name="pango">Adds support for printing text on splash screen and
 			text prompts, e.g. for password</flag>
 	</use>
diff --git a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
new file mode 100644
index 000000000000..7bf3c4af0b74
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild,v 1.1 2011/07/03 10:06:14 aidecoe Exp $
+
+EAPI="3"
+
+inherit autotools-utils
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
+SRC_URI="http://cgit.freedesktop.org/${PN}/snapshot/${P}.tar.bz2
+	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png
+	"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
+IUSE="${IUSE_VIDEO_CARDS} gdm +openrc +pango static-libs"
+
+COMMON_DEPEND=">=media-libs/libpng-1.2.16
+	>=x11-libs/gtk+-2.12:2
+	pango? ( >=x11-libs/pango-1.21 )
+	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
+	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
+	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
+	openrc? ( sys-boot/plymouth-openrc-plugin )
+	"
+
+DOCS=(AUTHORS ChangeLog NEWS README TODO)
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-drm-reduce-minimum-build-requirements.patch
+	"${FILESDIR}"/${PV}-image-replace-deprecated-libpng-function.patch
+	"${FILESDIR}"/${PV}-gentoo-fb-path.patch
+	)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		$(use_enable pango)
+		$(use_enable gdm gdm-transition)
+		$(use_enable video_cards_intel libdrm_intel)
+		$(use_enable video_cards_nouveau libdrm_nouveau)
+		$(use_enable video_cards_radeon libdrm_radeon)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use static-libs; then
+		mv "${D}/$(get_libdir)"/libply{,-splash-core}.{a,la} \
+			"${D}/usr/$(get_libdir)"/ || die 'mv *.{a,la} files failed'
+		gen_usr_ldscript libply.so libply-splash-core.so
+	else
+		einfo "Removing /usr/$(get_libdir)/plymouth/*.la"
+		rm "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la} \
+			|| die 'rm *.la'
+	fi
+
+	insinto /usr/share/plymouth
+	newins "${DISTDIR}"/gentoo-logo.png bizcom.png || die 'branding failed'
+}
+
+pkg_postinst() {
+	elog "Follow instructions on"
+	elog ""
+	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
+	elog ""
+	elog "to set up Plymouth."
+}