Support libcryptsetup, misc fixes.

Package-Manager: portage-2.2.0_alpha37_p23/cvs/Linux x86_64

4 files changed, 31 insertions, 13 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index bcf5d31fadb6..dc19f0e9a7b4 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.2 2011/06/06 11:25:01 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.3 2011/06/07 14:10:44 mgorny Exp $
+
+  07 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
+  metadata.xml:
+  Support libcryptsetup, misc fixes.
 
   06 Jun 2011; Robert Piasek <dagger@gentoo.org> metadata.xml:
   Add dagger to metadata as maintainer
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 392dd1b644ff..88bef48ca362 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST systemd-28.tar.bz2 810357 RMD160 0d91101b158af98cbd7d9be35f5a9dae51d565fc SHA1 8c8e04f4577afcc7fa5f28205d581594fe69367b SHA256 dd11cc85b2f2afc8094cefb47af519d5a03a9ec1abce0fb82bc19d48fa471b33
-EBUILD systemd-28.ebuild 4023 RMD160 19e39ba646c6a2ff7ca511212a9956b7a1fb14d8 SHA1 d1d08256d9c8023ef69167fd016a647da3145cf8 SHA256 4ef35c159fde7c19bb5ed6d6e9c57e9c635c7b33b74d78081876de7a4413d409
-MISC ChangeLog 520 RMD160 27a7457a2efb5938a1b88601ba28838c753f693c SHA1 f00cbbe07babd5ad1669dd4ced336bddece88468 SHA256 d8d60d531a04780bbd1b29f4465f88beea9d1bb0a704984fba9974bccb6edf51
-MISC metadata.xml 439 RMD160 7c13b2925060571c1e3d989a3918846f3148330a SHA1 c348e0005d451ad00f3ee0c81748a37da9d0a96c SHA256 ef145c604109f12816032d28f7a3c4ab3d47a20304d76ebda197aed930efb793
+EBUILD systemd-28.ebuild 4111 RMD160 f6a92739290aece9f7983d69b681b728a9ca46f7 SHA1 5550cfeb8378a4c545a79a541f8299e344929d28 SHA256 71eccbf40bf08fab3251eae77a0844da34c9f849ef4b7ca068dbebe42761d289
+MISC ChangeLog 643 RMD160 e3f7c82ff7d0eb37208e203f09434ed478e97eb3 SHA1 eb47ecaefa434e1361cfd29222075c439843700a SHA256 8df501c0669913177a51540775bcf8618276b42794d2b781ba410cff8e5f04cb
+MISC metadata.xml 532 RMD160 9f5a8f7563e27323c5827c45c929cde322283b45 SHA1 862697f70e43ce66b0cace76e791bb73d9389c00 SHA256 1e18687866714408f81dbdf4849ae598a4a6914fae2de83e1d2220af197a39cd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQEIAAYFAk3uMYkACgkQfXuS5UK5QB3VjQQAiPZUZ4SqmUG52ouEb+LVFpJn
+LhXgneQUrKRUAGE3snUpdbOPWU+dksSANFMYUx2Z6gUeW4UW3zBLNynwULcdRuSG
+4Q7yjlqstKxUHOOEYJEuE6dEBpxCXyy0XnjsiNpEL6nNL+CxH5tsyWXnTvq0q96M
+wb3IBqnyUjjB3LDV7UM=
+=kvLx
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index d0b75465045f..773834efc66b 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,6 +11,8 @@
 		<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-28.ebuild b/sys-apps/systemd/systemd-28.ebuild
index 2b3526323807..9cd677719fcf 100644
--- a/sys-apps/systemd/systemd-28.ebuild
+++ b/sys-apps/systemd/systemd-28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.1 2011/06/06 08:31:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.2 2011/06/07 14:10:44 mgorny Exp $
 
 EAPI=4
 
@@ -13,15 +13,14 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam selinux tcpd"
-
-# XXX: libcryptsetup
+IUSE="audit cryptsetup gtk pam selinux tcpd"
 
 COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
 	>=sys-fs/udev-171
 	>=sys-apps/util-linux-2.19
 	sys-libs/libcap
 	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( sys-fs/cryptsetup )
 	gtk? (
 		dev-libs/dbus-glib
 		>=dev-libs/glib-2.26
@@ -61,7 +60,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Force the rebuild of .vala sources
-	touch src/*.vala
+	touch src/*.vala || die
 	autotools-utils_src_prepare
 }
 
@@ -71,6 +70,7 @@ src_configure() {
 		--with-rootdir=
 		--localstatedir=/var
 		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
 		$(use_enable gtk)
 		$(use_enable pam)
 		$(use_enable selinux)
@@ -88,7 +88,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
@@ -97,13 +97,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'"
@@ -115,7 +115,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"