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

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

commit:     992cf2800205d9af6d7d24ce50a204b07ffa950a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 14:31:47 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 14:31:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=992cf280

sys-apps/systemd: Sync from gx86.

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

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

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b526fe6..ca05be4 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 3817 RMD160 df4083196c9576f568ec4a242774f527894ac1ef SHA1 ed9e397b10d981f05a42af4625f926e450ad1fae SHA256 b32246c0514d3a149c1dc4d4cf06c9b72f70163ec2fc1a2617f34b491bdd82ad
-MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SHA1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2ff29067cd6fced2dd838cc3bdec3638971e80c5870d
+EBUILD systemd-9999.ebuild 3905 RMD160 1034d0467132db85b986c5883247e86519171705 SHA1 185f287b3dede21e09f988505ef1d741918e10fb SHA256 2f1ad3fc325e559c74571239c570f230ba970ffce1cb6fefdcd01cc48c87433b
+MISC metadata.xml 532 RMD160 9f5a8f7563e27323c5827c45c929cde322283b45 SHA1 862697f70e43ce66b0cace76e791bb73d9389c00 SHA256 1e18687866714408f81dbdf4849ae598a4a6914fae2de83e1d2220af197a39cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk3skBwACgkQfXuS5UK5QB0VDgP9HaLLe7l1Fmz5YMw6SavjgH+S
-GMKTfJXmZ3uM09d8Rxh7pXw9U2HicO8GxazyaEyeGCiHhlqYxvHLUiFVlOtdh3fK
-cqS5c3lCwJ8yFnTqfr/Tpl8MK1qqpLLfZ8p5W5GLp0bqZXCxEk9ufg7vCAhUPMH/
-nrunlIyvaf1PvuBrJdY=
-=SwhX
+iJwEAQEIAAYFAk3uNlMACgkQfXuS5UK5QB3ECgP/RzlsiXy85ZJ/Kw7m3LdA9MyV
+s4eaAZMtzSzmbv8imSFhPzRtkQ+GlPWURLSA/Lnu5l0ApSO3IxUV5Z/q/SDbnAfp
+bMsrAwIL3xWFIiJKehp4nPa1QCbVzOvLjt6btu+981cIpRGu7bv23drTdGRzYu8i
+NyTg0IAXRSVQR36gDuo=
+=7i3B
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index e44b596..773834e 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -6,7 +6,13 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer>
+		<email>dagger@gentoo.org</email>
+		<name>Robert Piasek</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>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 34632d1..1404c0b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -15,15 +15,14 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="audit gtk pam selinux tcpd"
-
-# XXX: libcryptsetup
+IUSE="audit gtk cryptsetup pam selinux tcpd"
 
 COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
 	>=sys-apps/util-linux-2.19
 	>=sys-fs/udev-171
 	sys-libs/libcap
 	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( sys-fs/cryptsetup )
 	gtk? (
 		dev-libs/dbus-glib
 		>=dev-libs/glib-2.26
@@ -66,7 +65,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Force the rebuild of .vala sources
-	touch src/*.vala
+	touch src/*.vala || die
 	autotools-utils_src_prepare
 	eautoreconf
 }
@@ -77,6 +76,7 @@ src_configure() {
 		--with-rootdir=
 		--localstatedir=/var
 		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
 		$(use_enable gtk)
 		$(use_enable pam)
 		$(use_enable selinux)
@@ -94,7 +94,7 @@ src_install() {
 	autotools-utils_src_install
 
 	dodoc "${D}"/usr/share/doc/systemd/*
-	rm -rf "${D}"/usr/share/doc/systemd
+	rm -rf "${D}"/usr/share/doc/systemd || die
 
 	cd "${D}"/usr/share/man/man8/
 	for i in halt poweroff reboot runlevel shutdown telinit; do
@@ -103,13 +103,13 @@ src_install() {
 
 	# Drop the .pc file to avoid automagic depends.
 	# This a temporary workaround for gx86 packages.
-	rm -f "${D}"/usr/share/pkgconfig/systemd.pc
+	rm -f "${D}"/usr/share/pkgconfig/systemd.pc || die
 
 	keepdir /run
 }
 
 check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
+	if [[ ! -L "${ROOT}"etc/mtab ]]; then
 		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
 		ewarn "To correct that, execute"
 		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
@@ -121,7 +121,7 @@ systemd_machine_id_setup() {
 	if ! "${ROOT}"bin/systemd-machine-id-setup; then
 		ewarn "Setting up /etc/machine-id failed, to fix it please see"
 		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
+	elif [[ ! -L "${ROOT}"var/lib/dbus/machine-id ]]; then
 		# This should be fixed in the dbus ebuild, but we warn about it here.
 		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
 		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"