Move things to /usr (#485034 by Kirill Elagin and fix by Enrico Tagliavini), this also causes to rhgb-compat-link to be dropped due it pointing to old location, use readme.gentoo.eclass, move to eapi5, move the openrc vs systemd blocker behind 'systemd' USE flag to prevent people enabling it globally from getting systemd blocked.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 108 insertions, 10 deletions

diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog
index 149568d23cb6..923be9ce90b5 100644
--- a/sys-boot/plymouth/ChangeLog
+++ b/sys-boot/plymouth/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-boot/plymouth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.37 2013/07/31 14:03:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.38 2013/10/11 19:00:50 pacho Exp $
+
+*plymouth-0.8.8-r2 (11 Oct 2013)
+
+  11 Oct 2013; Pacho Ramos <pacho@gentoo.org> +plymouth-0.8.8-r2.ebuild:
+  Move things to /usr (#485034 by Kirill Elagin and fix by Enrico Tagliavini),
+  this also causes to rhgb-compat-link to be dropped due it pointing to old
+  location, use readme.gentoo.eclass, move to eapi5, move the openrc vs systemd
+  blocker behind 'systemd' USE flag to prevent people enabling it globally from
+  getting systemd blocked.
 
   31 Jul 2013; Maxim Koltsov <maksbotan@gentoo.org> plymouth-0.8.8-r1.ebuild:
   Fix "!has_version: command not found", bug #478668.
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 058e34a0b52b..1bf9a7cbb45f 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -11,17 +11,14 @@ DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d98188
 EBUILD plymouth-0.8.3-r5.ebuild 2474 SHA256 07eb45e5f874a4207ab9aa8a3278862ea3f61e3c37c8de1589d2f633090f093b SHA512 acd31d9913f1306d63903b876361c45db528f7f363b2967b92d4daa279719a66426c14a4ba8e12b31ee803132bde09f2bb02810c2d2169ca6f7742f9667b252c WHIRLPOOL 76848f5ebf96245123994f23a175f8e0c1754862adf4b17c884c0768d55443da41ee3083cd0af6344e88de44048439dcd1ceb324b7e1b1fea37a15bf9ce489aa
 EBUILD plymouth-0.8.4.ebuild 2364 SHA256 380d7844071228d2bf21a7d25f6d6c55898f9734f776fe6580b8f0ab2e570d22 SHA512 ef6074f2ce7f92ea2050348243335b3723378d5ec82e18254ba57d72469b78d68de23fad8502ffb23a05c70dc1325927da4e2d9f754ebb3977190fd68e93c772 WHIRLPOOL 45d94c37b4c1a65b0c4ae08c19c1f133a77841e2804fe87ccb9eb84cd7d4c36590f729e65cdbd43d965e721a44eb51f5b53d05e577c51186afc7e5a738e67d64
 EBUILD plymouth-0.8.8-r1.ebuild 2621 SHA256 d8562af29e6fea19f718f2c788a8710ff8ff6b3e6e84be6bf8c638ba53b87007 SHA512 7b0fa749e549d9b2780b35e8f0ed8fda834c7ec87f8143bb5d403f41ca292e32d070a9e53bf5a6c0c490b9668a610dbe921aa1031dbde3013494d0703cf5152c WHIRLPOOL 4601eb60a82b732dfca14956d2df71ff6b49f9cdef225b732b1833916469d0ded008bc862bcb523bf1637ee7ef9ed01696098fb81b584f2738c1048f5eaffd6a
+EBUILD plymouth-0.8.8-r2.ebuild 2827 SHA256 a67ef8dec8f0d8593485958fc55792f36bac3099416ea84c09b7911f1cd8befc SHA512 2872e6d67d6e2b49a302cd1514d0e1994674668c4a07282caf9c956842503b5ace881c36b27f7980a10262e4d98b6fab326c8a2ae97a1d668041ea80998663ce WHIRLPOOL ea39d6ea320af2f24afc77774adfde7cc4d0c45bc2fa394e370a3da9266e55f87eeb0533ada15deddd815257f3d421f653df755889c79bde81f61bfe66b1370f
 EBUILD plymouth-0.8.8.ebuild 2497 SHA256 7daea20505dba6250598403cd7063fff39768b8ff4cf0269aa83a0ea38afec4b SHA512 bad8f3126a36f47662de04c619e46b778e851a1ac10b559b740e240abb990d208d08a072a57f099018f4fd74e19d0225624ee706be25e2ba0c8aa1725568fcd8 WHIRLPOOL e621ae1bb8cc9f394c68f2dfacac978ca75266800288fc776fe9281f5207b47211f269190823d8aa448597d3ff20b10d18cb6c26a00ca8830e76fc35a0158efb
-MISC ChangeLog 7720 SHA256 05680f0ec5a6e3be7ae25f68ba9f87d2e99e60a10411d720b0887235d0b2ba34 SHA512 25bf3a1840ba74e6e0b3ee1440c4549febb62ef68ccdedd0bf57e6d4401426c915c83322e9633366e6cc224ace848bb46135d90e4031d1e17c421bfa2d4d1b18 WHIRLPOOL 7577cb14293181ecf752fe06433759ea0720cfae9e4a8495b5a4a4f336f5c2fb250e95b031c47a69906f35fe6901dfaf8efa6a1f32c48db399bb46666ed4f20d
+MISC ChangeLog 8166 SHA256 29da7f669e1c58dff5c4871b088b4759b5b17c32253d18772cda8c9d6a91932f SHA512 34604805bb9376b43cd8e4ff4dd844a089cae6218d1fadfb6d73f5fc8756743608d4222d4535ff9054ee380854b679c25cc6c53aac9f8f20a902b5b96d14b545 WHIRLPOOL dc51d1852d259a0631292b0bb004d4e60405325419837bb4c64b8583553e06df79f63499a3d8dee6d7c52e6de2060aa258fcedda406221cf922d03f38a696079
 MISC metadata.xml 1117 SHA256 a688227fea0f168af093909bc5870d0a33e197b61ca68b186e8ed30caf819f0d SHA512 13a1b46f94fa664c0ebaca92aa4886169d5dfa1ba8634d218da8c545f7e75416fee742c3bd11f68b4eb466a9b70963f0d67c0dfab4b28b9aa9d6f14b2f341b56 WHIRLPOOL e38b974636059ef13bfcdc2c097a591e99c509021bf15d544ac171c6d0ca8def5de1bea582fe6004237a6852c71e1006d7e7e6ec6891073df2efd049e94ae8b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+Rk9AAoJEAmJmMX429reEbkH/idbA4rIZjUxbYluLCAXbuNd
-XL2t7dAu+P1B2s0CsJvUi1186jTuaXXjWmdXQbWDq+t97P1/oFNt1Rr8B0u1Wv29
-1w0LygdLuZ+xJRMGIk/P9sKfCaRNxgxnmyJoxiOPyZkhQTrSixS2EJjaTC//kX56
-my5S79IusSNnsT5LQEeqkzCKAs8Gdcvyu9bPyTuZX7UV761FERK+9D+ehMmwJS8k
-loeMKYGqBuPXDI12j8yKUnc6EQj6y4HPEPus7sInyyLw9Y1gyQvsIG8RA8fsTzVP
-jT5GOnlmy8swn0jgeF/D/JpFNH4pB5zBBzy3WQYXB2ztd5XVW83RtOTPzb1iZFo=
-=xpj5
+iEYEAREIAAYFAlJYSuMACgkQCaWpQKGI+9R8cwCfaJSoRr078yXbe/lbpzhGN9dY
+VZEAn0rlW3jUnk6kQ4JfG5DN0yILaEBF
+=ipyd
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild
new file mode 100644
index 000000000000..89967a4a41b6
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/10/11 19:00:50 pacho 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 systemd"
+
+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}
+	systemd? ( !sys-boot/plymouth-openrc-plugin sys-apps/systemd )
+	virtual/udev
+"
+
+DOC_CONTENTS="
+	Follow the following instructions to set up Plymouth:\n
+	http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
+"
+
+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
+		$(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
+
+	insinto /usr/share/plymouth
+	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
+
+	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
+}