[gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/

["Michał Górny" <mgorny@gentoo.org>]

commit:     e949bc1485e04d3333fa0e7708c80a57d6b6a3c8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 13:33:59 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 13:33:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e949bc14

sys-apps/systemd: Sync from gx86 (update maintainer, support plymouth).

(Portage version: 2.2.0_alpha40_p1/git/Linux x86_64, signed Manifest commit with key 42B9401D)

---
 sys-apps/systemd/Manifest            |   14 +++++++-------
 sys-apps/systemd/metadata.xml        |    9 +++------
 sys-apps/systemd/systemd-9999.ebuild |    7 ++++++-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 47d8135..5e0f783 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD systemd-9999.ebuild 3324 RMD160 16c593fe409b969330f9396dfa10984179d5e0cc SHA1 52ffdd7d3f1af63b038677c65e26897372835425 SHA256 4db7a3bf6b71b507d70723b3662673a699106bb7679f2472b86158819376fb98
-MISC metadata.xml 532 RMD160 9f5a8f7563e27323c5827c45c929cde322283b45 SHA1 862697f70e43ce66b0cace76e791bb73d9389c00 SHA256 1e18687866714408f81dbdf4849ae598a4a6914fae2de83e1d2220af197a39cd
+EBUILD systemd-9999.ebuild 3495 RMD160 db12dea0957abec906ff6f74b406bc3a342aa504 SHA1 f87586313bd0c8dd0ea64bf5c44b6effe28a4208 SHA256 dfcc8ed54bc6b41b99e9cbb0f4608652a38a6858e77e9b22926fcd30e64cc313
+MISC metadata.xml 524 RMD160 d51fb3f45aefd84a637f2f67cead553e12d389ab SHA1 4f86cab283737af9e58633d466e2588d80bec18c SHA256 0ee1c96fc4604189104897c95e2ded166e55be2e04af40523b2afb5564dbbe33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk3vWXsACgkQfXuS5UK5QB0S8wQAr0FJf2ofHFq/jdDZw7v5zfra
-DzLmlkaCv7l74JuGlfz9nXdO3SK0zDd32mZrPA+GGZOfSklcq6Z+8W9pn9fHB7a5
-luebHYIFntc7nghaITt//rubZ6vVQJmetvRQEf24OYnCrjPNcKvVU4NVu/VABRuA
-ZopINvl+tj/PK9kOCv8=
-=I2o6
+iJwEAQEIAAYFAk34tMcACgkQfXuS5UK5QB2dWwQAqrSftZT9UORt5bAwHV1qIPKV
+qA//Dy5VPbcFX7brBowxCzPN+4bxPqwbIguHvhmIPPZCr7RBkgY4r8i7Bdz9QK35
+8LZhcDjJGnDHtMrxXa+msiHPflK5tcWzPQvqZxoDF+SMo1R3qqYwThD66MMFMd7W
+GC/3YoaURfxrly56Qfk=
+=67c6
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 773834e..5af7c34 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -3,16 +3,13 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer>
-		<email>dagger@gentoo.org</email>
-		<name>Robert Piasek</name>
+		<email>systemd@gentoo.org</email>
+		<name>Gentoo systemd team</name>
 	</maintainer>
 	<use>
 		<!-- XXX: describe those two better -->
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
+		<flag name='plymouth'>Enable support for <pkg>sys-boot/plymouth</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 872dc72..53643fa 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -15,7 +15,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="audit gtk cryptsetup pam selinux tcpd"
+IUSE="audit cryptsetup gtk pam plymouth selinux tcpd"
 
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/util-linux-2.19
@@ -29,6 +29,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 		x11-libs/gtk+:2
 		>=x11-libs/libnotify-0.7 )
 	pam? ( virtual/pam )
+	plymouth? ( sys-boot/plymouth )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
@@ -81,6 +82,10 @@ src_configure() {
 		$(use_enable pam)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
+
+		# right now it is enabled on per-distro basis
+		# let's just hack into the check
+		$(use plymouth && echo have_plymouth=true)
 	)
 
 	if use gtk; then