Sync the live ebuild with latest changes.

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 31 insertions, 40 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 2827961ce09f..4d7ba9a901cb 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.170 2013/09/11 11:52:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.171 2013/09/13 11:27:49 mgorny Exp $
+
+  13 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
+  Sync the live ebuild with latest changes.
 
 *systemd-206-r4 (11 Sep 2013)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 73b72f3c41d7..68203d6b7322 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -16,25 +16,25 @@ EBUILD systemd-201.ebuild 8320 SHA256 a7e696450c4ec2875c38678b26b6445e5b53672edf
 EBUILD systemd-204.ebuild 8302 SHA256 8ab8f6d06d4f3e31cb3cb0f8411fa612b69068cf7b1f80436507b959af287481 SHA512 268f27595cc2d55ec81b32eda1d42afe76907e351db21adae019cba96dbbcefa56f2a1ff22d9330af23d7b9328b11bc225c098f36bea3990ef1988bb71528d92 WHIRLPOOL a113c4a70b38ce1cb3ebbc13a63d5d98d3cb247c4e55c348f3090f3dffefb5e0ee64d4246d975f076a0de2079d423ccd43d59a3d39ed6f1c51eeadba6126383e
 EBUILD systemd-206-r3.ebuild 10806 SHA256 b65de528f90a4c37d8a8b2f4a0040e84b531a3c9fd2de8faeb874e03b5ea845c SHA512 87e8649f7e6671f5740d0b0ff5dbd4af0ab9e224bed205177650c403b83be0c52931e04c8bdc1003241b8a6de6afce989096e6592dd4099441bc4083fff00236 WHIRLPOOL f87ba65374d7d824cfd9db05ef89805fd627c5ebf2b7b9b1081319b70289f136cd904dbdf8c53fd33f8b7ea1809ec3736644cba383a49300d2201cec62fbb2fb
 EBUILD systemd-206-r4.ebuild 10454 SHA256 1593e4d21ed5e3b1ba19da643236135ba2873b0bab0b874fe2a52c849c033f7c SHA512 38d63ac62876e22f760f68422d566c4a2d4f0e8f0cb357173d1aceddea21f24f17f7f3ebec11c9676cd18e5d2a8db236001711df2ac050ff3941baf8a0068775 WHIRLPOOL acf31ed9e0df0db1e266d8733a7cb5ce0bf4c52b64cff121c84ea0c65d82eddc1de46848e57e52b97a8e8b56a8d3b6ad6db8c2d2fe75d69a9f84c7cb4563c4f8
-EBUILD systemd-9999-r1.ebuild 8813 SHA256 7d0ee1b75b60c89c447bd8d7fcf46b637db19e670ecaf5ea18442bc520d4f4ef SHA512 3c96708beed3022386cc17414f876b5fd2d0e5759bbaed2cbe8d66935703fd646850b7dae991f79fb07d6ed4d53d5c1227fc4a80717cf223f74a12a3e19ea815 WHIRLPOOL 7c2c63345bffa91d9c29974fb3ddca0afdd6d4cdb0ccab4c3485282d8b560f4aa4c7ab51f171a6d58a234e0c414ffeecac056ef350d0d2bfa72fe344ba664b78
-MISC ChangeLog 32094 SHA256 81183a447181977a447f9fe36877978771cb015302cd57d5bb901ccdad776a7d SHA512 f877835ac8ec7123942205b0dbed3002b5e4111dec11b5716dd481df77d1b6ac19ca4ec36fc1c75f7cf0989cc387c22ee2281347322c524e717bb75a2b3ce4ed WHIRLPOOL b4819bb4a5eda6705825e4f08a89ba4293a0c9abc40185b958e8f58a685df32f19d28eacd6d8bc123c8eae5e18fc56b198332efe66df1c7c38ab107944cc1cbd
+EBUILD systemd-9999-r1.ebuild 8637 SHA256 982a74a46da993916b0e8a67344a5f6a6d63a0d29fc2063d01e6ecc920222424 SHA512 edeb7aef4d5d219af57f7f4bdbdeabdd66ded2f281741c7a40bd619c1ed2cf9103a1013b3d1c2413321fbef3b16b77a6fd283951f10ba8709da0ca415bb4a757 WHIRLPOOL da00028a59e31e48724ae37b5e5e5e34e9ca2669b3087a4b5607f60b2c38e1b6f269323b40f5e4e37b03f178f232c9099c4cdc6fd0e3ddfdad99891fed6e943f
+MISC ChangeLog 32213 SHA256 95c6660862a326c8590e33a9465a606d0aa216a8f1db1a1a055429add64a208c SHA512 b10220351e9d8acf070ece51764200fc88d5c240d481f9e46cdd295005663ee9f4be038d3030523295a134d6e246a18fff88c6040cf664b734b2f8fb0e60562c WHIRLPOOL 978d7af5f45ae65b8cf96ea47d219eb88718130f130c9b9e868df452f637da44d3006f2c8c3d4b3dbbadf2a5f4fbb77ba50e4dc4e75a21354bb2042ddcb5b7d9
 MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSMFmQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSMvbaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKlsQAMHR/kUhn/bzRhr+4MV093yi
-P/uroA0Zik1RalOJj/ajSHvtvqi4YICqKwM1NIbgOVvNsJrJE8UV5gtI7/RiJds1
-UlnB9COjZkYyo8DuD5bW5sUNLy/4z2OivsfMy5y8xJfWDm+t5MkcR5IrE+u9TlLv
-hSWgw5QfdkyaPniIoE+OJgbmc4rtIxc9NsV1v86YJuRrT4qtGTAAEu9sqpZBHtr2
-dtLao1/C1buQBKid8+qRbnTTDq1c7+tZ49Mh5ohGo4e/JAyXAE8P69MlKHCudtDc
-vTMzeaa+uROYXYdZ7Ix/9qG8nrPRqfICdppErAkN4ihGkyYjQ1z6XCqTqXOSBoeg
-pFuLcBBcdEA4wJzIBCb1Upidq0rWQ+xW1Q2X+K7/ZOmd1c4hmP195jQ9qPqph/n0
-M3JP1VQz6oo0R0sbF5IZ/otxjEA5q68D3i/OgAt4qw6Xe0FBC9s1q4vmBZgAaZWL
-61jazYtxIlCGACnWv2Hv/XChlujvx2h9tAV+4qnZBIO0sZ5bYQFk+vG921sth//U
-/+P7ng3Gm1ZJoilYllLHRvIDtWeiNMPd1sX7pY4osp/r+dicYW2WUE8vAM6GeIV0
-CsYcHD7uhWujsI3VGKUuUP+EbF67EPhzgbeypZGsD9H4wQn+NoIuLi1IcSc2SOUe
-HlqxH1vyXzg3T9fbeghO
-=1wHA
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJ2QQAMSw+vshM1PHBRuHL7Kf1YUN
+XBxSHghKatL5eOG9tdmbeGPP6o7Q8LtU38hF/eIf5WoLZlbP6i1/HwEPyqXFWtwA
+Lki5r7EGP7pUjxFTyVSNO3XLS3gd43gtHMOITmOw0GuHmehbpvzBavoSn5VV4ygc
+YjlKR+PgHYslbU+yHojDTpBd3WFnGths9frgfFn6mHCkItX6YNvrYGOPXjL9Ep16
+huCxnehh26yoWAQ0eYYdjpOJLM63Jp2y4n5/K16kgckrDREHoCGVbqZNUuc11fNL
+cyD3M9vdPXP69qvR1wAdVTjEOcb9aOdKTTKf9V1hq831jLpyrb4Eg7Vv3jsuAQsK
+5Hu1ieCCrgUiXuSetcMJOB8v5BpXemUSdHjtcvPbFdHHkF7RqLgs41g9l0HRiph2
+eksMJJb82hL6piw9JETo3CC3vDuW+zxAxFWkEbCoqrJuGNJu2FqWMe1KncsZJJ/K
+OwqY+4WhPv4PbD0MMHHHTc7Wte9O7mLuqCM4rbUXCmhVzlQmDpvumz9b3DYtWsWS
+qGB4jH2GiM0ELGQOUFLmI57s9278N5U2O7iRkawoUfR3kl9HOAu1/8RT6VoAyEbK
+pMJ2t43fR31OLLG9Y+4qYWY1ddLAjatjqrED/1QYQx5HKnwY72da7XErYeb4+r/d
+vvEqyZIE4QOtJnr3WWBe
+=hfsf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-9999-r1.ebuild b/sys-apps/systemd/systemd-9999-r1.ebuild
index 8f5ec6b9d8f2..1e98b6a6006c 100644
--- a/sys-apps/systemd/systemd-9999-r1.ebuild
+++ b/sys-apps/systemd/systemd-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.13 2013/08/11 21:34:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.14 2013/09/13 11:27:49 mgorny Exp $
 
 EAPI=5
 
@@ -103,6 +103,7 @@ pkg_pretend() {
 		~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
 #		~!FW_LOADER_USER_HELPER"
 
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
 	use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
 
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -278,20 +279,6 @@ multilib_src_install_all() {
 		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
 }
 
-optfeature() {
-	local i desc=${1} text
-	shift
-
-	text="  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
-	shift
-
-	for i; do
-		elog "${text}"
-		text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
-	done
-	elog "${text} (${desc})"
-}
-
 pkg_postinst() {
 	# for udev rules
 	enewgroup dialout
@@ -317,17 +304,18 @@ pkg_postinst() {
 	fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
 
 	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
-		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 "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
+		ewarn "and 'mount' to not work properly. Please run:"
+		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
 		ewarn
 	fi
 
-	elog "To get additional features, a number of optional runtime dependencies may"
-	elog "be installed:"
-	optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
-		'sys-apps/systemd-ui'
+	if ! has_version sys-apps/systemd-ui; then
+		elog "To get additional features, a number of optional runtime dependencies may"
+		elog "be installed:"
+		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
+	fi
 }
 
 pkg_prerm() {