Fix DESCRIPTION. Rely on dbus-1.4.10 to set up /etc/machine-id for us. Add a warning about downsides of having /etc/mtab symlinked, reformat messages.

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

3 files changed, 25 insertions, 39 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index dc19f0e9a7b4..db0efa6312e7 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.3 2011/06/07 14:10:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.4 2011/06/08 11:08:41 mgorny Exp $
+
+  08 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild:
+  Fix DESCRIPTION. Rely on dbus-1.4.10 to set up /etc/machine-id for us. Add a
+  warning about downsides of having /etc/mtab symlinked, reformat messages.
 
   07 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
   metadata.xml:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 88bef48ca362..4e417c923729 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST systemd-28.tar.bz2 810357 RMD160 0d91101b158af98cbd7d9be35f5a9dae51d565fc SHA1 8c8e04f4577afcc7fa5f28205d581594fe69367b SHA256 dd11cc85b2f2afc8094cefb47af519d5a03a9ec1abce0fb82bc19d48fa471b33
-EBUILD systemd-28.ebuild 4111 RMD160 f6a92739290aece9f7983d69b681b728a9ca46f7 SHA1 5550cfeb8378a4c545a79a541f8299e344929d28 SHA256 71eccbf40bf08fab3251eae77a0844da34c9f849ef4b7ca068dbebe42761d289
-MISC ChangeLog 643 RMD160 e3f7c82ff7d0eb37208e203f09434ed478e97eb3 SHA1 eb47ecaefa434e1361cfd29222075c439843700a SHA256 8df501c0669913177a51540775bcf8618276b42794d2b781ba410cff8e5f04cb
+EBUILD systemd-28.ebuild 3530 RMD160 022339163190fb2e1009ce32b9eddd6986b2680a SHA1 d88630ddd9e941111b11b1e1cf70d416607de803 SHA256 a9a48998f47e374c745b727d37a1e3f0b7ebf1f887478208e78b45683a7dbe32
+MISC ChangeLog 868 RMD160 ead3d44c79c430b6a4c021672b3efd4ffde2833c SHA1 463d8b2f66d94da2bd6d58d25f89f712340e7ac6 SHA256 e0484175951adc0b9bd0c55284d5d0ad2a8c567d566bd5e820e6655d33467266
 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
+iJwEAQEIAAYFAk3vWFkACgkQfXuS5UK5QB0dEAP/ZumVKCoFBVW2yWHDBceRsCyJ
+ZF2o68ykvhrET2zFyY63/qbwp6lrEgmipdkRrfW65lk6CW8g8wDNWi3wMGb4p81j
+QmSEMw+nvQxdq+MOQUMb8RRj4tZHDB0HLgxG4+2ESxw3FYM8BnNzM/UvDn+ZGnwL
+tqTOtUmevTs6gg8cKTE=
+=0C7L
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-28.ebuild b/sys-apps/systemd/systemd-28.ebuild
index 9cd677719fcf..a655ebd80d35 100644
--- a/sys-apps/systemd/systemd-28.ebuild
+++ b/sys-apps/systemd/systemd-28.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2011/06/07 14:10:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.3 2011/06/08 11:08:41 mgorny Exp $
 
 EAPI=4
 
 inherit autotools-utils linux-info pam
 
-DESCRIPTION="systemd is a system and service manager for Linux"
+DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audit cryptsetup gtk pam selinux tcpd"
 
-COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-fs/udev-171
 	>=sys-apps/util-linux-2.19
 	sys-libs/libcap
@@ -102,37 +102,19 @@ src_install() {
 	keepdir /run
 }
 
-check_mtab_is_symlink() {
+pkg_postinst() {
 	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'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	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 [[ ! -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"
-		ewarn "content."
+		ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
+		ewarn "require that specific feature, please call:"
+		ewarn "	$ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+		ewarn
 	fi
-}
 
-pkg_postinst() {
-	check_mtab_is_symlink
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
+	elog "You may need to perform some additional configuration for some programs"
+	elog "to work, see the systemd manpages for loading modules and handling tmpfiles:"
+	elog "	$ man modules-load.d"
+	elog "	$ man tmpfiles.d"
 	elog
 
 	ewarn "Please note this is a work-in-progress and many packages in Gentoo"