Version bump. Move nss_myhostname to rootfs and install zsh completion (both bug #460640). Update the live version patch.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

7 files changed, 416 insertions, 46 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index ef232acaaba6..f1270d609033 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.80 2013/03/06 14:52:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.81 2013/03/09 13:47:44 mgorny Exp $
+
+*systemd-198 (09 Mar 2013)
+
+  09 Mar 2013; Michał Górny <mgorny@gentoo.org>
+  +files/199-0001-Disable-udev-targets.patch, +systemd-198.ebuild,
+  files/198-0001-Disable-udev-targets.patch, metadata.xml, systemd-9999.ebuild:
+  Version bump. Move nss_myhostname to rootfs and install zsh completion (both
+  bug #460640). Update the live version patch.
 
   06 Mar 2013; Michał Górny <mgorny@gentoo.org>
   files/198-0001-Disable-udev-targets.patch:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c63048a653ac..c13205c22571 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,31 +5,34 @@ AUX 191-0001-Disable-udev-targets-for-udev-190.patch 9066 SHA256 b884eb4a803ae22
 AUX 196-0001-Disable-udev-targets.patch 9359 SHA256 5b021ec900b5dfffc0c04e6ef351416b3d42fe621dec05d721bf027d5ed90d91 SHA512 fffc8437cc79acf037601fa83394b19cc8bb495ab0c390617f711f1c65e574185b1ea5bb42803c88c4459020b60158fc423a9a1020d2f3c2200f761781868aec WHIRLPOOL be2b22b713d7bb935cf9aba6877b82416bf58e18ef82c22f2204195e9c3bf63a7d9c5b8c2d73d89ab99f1ca949c454a188de52c68c5d15c2dfbe0b30daaf4536
 AUX 196-0002-Don-t-fail-with-missing-gcrypt-macros.patch 909 SHA256 c32953ffe27a20e941074a47c21d195083a9a8034bde2628fe41ba96a5898df1 SHA512 b4896e6572c14420cb22917b850f77ed3fe158891d341e92e5f6e1895c5244523d79158705e74a2b02921c0a1a386ea1c9fe2400b711da3c9cf15c0bd06f14f0 WHIRLPOOL cd6b8a49b58d014d2de2359a38d51a2fc4c6a8001e3c850b1b34e083b0a349bac10eda0db1dfbc873dc684b53623f11f281a38c01351006dff1465726cbb4100
 AUX 197-0001-Disable-udev-targets.patch 1774 SHA256 a805ec4051dfcd0271cefe99f8cfcbedd3f314281be0f9977e90ff351ec3cb8b SHA512 58cf690d258a01930282cddfa67a56f1e7aae56e269f0ee7794497efdb8a12d133f8df768249ce04a0347b94f8a96a0323ae2a510660e90a3748e8a99d729f0c WHIRLPOOL e1fb186834f1a016e2f40df39f1d01437a59f4f8492deb1b77c17cea214120a2441d8af2c24fb245b7360503fe3de5b7d18b2188c11b9f38b8defab08399ff9b
-AUX 198-0001-Disable-udev-targets.patch 3200 SHA256 b616df0678867c6d9896a7bda05a231ba683460b76985612e6136b845c26095c SHA512 b6f95c089ca8c966706cd9aa9ad86482a57a84f69c7c32b810ad516e66454c3264f5f288b1742ebb8f34b06d60e39e6ac4df78e2899eecf249920918c1303569 WHIRLPOOL 6da12e07935b44589c310bacb4f09986f7927588d6b1cec77dd09633dc5b2fac7d873539c1b86f1ba3a77e6b3d2d83f6536330c0f2db96504536bbfc95957164
+AUX 198-0001-Disable-udev-targets.patch 3474 SHA256 8b9131ae92ff71bbc447b6756d3bdb8de6586793553bd98a010d2d66840b601a SHA512 8c9cfdca5a4a8884421f270daf2b7b4177fff95b499e562a85028d7f621afb38bc5f8f7f14dba2a73da5f03749a23eaab58c035fded3a4a88d641b96ec307f8f WHIRLPOOL 3c4b929c877813a3b22d4aa9b806af919f7774edc2b56b9704a57fb076ca5dc09be4500b10cdb00a2d33dcebc0d754a1143d5a348896952f2b99a2ceb3c13dff
+AUX 199-0001-Disable-udev-targets.patch 3486 SHA256 b4bc79f47d6a4abfa76150c689f740adb90c24e2a3d26b6b2430c16a0bb09a8f SHA512 53b5d7ca7ae681c80772f6f7da572dcea9bbb96bf5404f59f2f434b5c081eda2343d7d6bf686612e2df1bbf298308f9ac21075ecbd4e86898e5563dda3509428 WHIRLPOOL e864a4d4ec50aada78858d1932e9d19ed9fce6f4cc25ae7332f190166fb234249b001666c099466dce07cf26da03c9dab55001320b5c21b301744b64ee3ee7c0
 AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed
 AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa8ec2aafc22868a SHA512 8a4d72c63794676a01db2792b44fa39ec4ea80db97f2b54904f5b118a776c08721d360f8bb2ed15da12e922dbac3f2a431d6a6f98831bef3520d781d97d665db WHIRLPOOL e83955a1d86400ee16d35d61eaa35fb3050af2b2805a2049c37a602be1bd60233caaa1cadbbd4a3b3e425a44629c9cac921a5c4b2fca9003a45e49b89298ca50
 AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01
 DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 SHA512 df158f85dee4c38dc2ff305bc03eee3b71d77eb683ab2739549282f7d552af4d2a247f52241f68e1b7c88c668bce93531986a39937a99cac401791ec95916769 WHIRLPOOL 027fc6aa5972988173721b120b8c1f371bc02d3066e04ea0923d6cc70778a3381f600a865aa136b5789755fbd5358e97304da265f8937d789a28b33cc778df46
+DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf SHA512 29b07d934dbcda876feddf2b93c1f35f4bdceb0ba76dd18563e79da65a794b2450b283b6ec93b09828cc8fe918e007511f3bb2218fb0bcb3cb2fdbf940d3cf71 WHIRLPOOL 9e124534121086b666e285adff44778d03f42d52c13ef78281728882d79fa32fdd58e27c41d7f8402a62b20bff65fdf1a4a3ee4680c1327cf7895169c66c07c7
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
-EBUILD systemd-9999.ebuild 6820 SHA256 ac7374263d03bb759e21db48a04e2e49780e5ffd9f7c6cf97ff904ffb9befbeb SHA512 7f323c3307828037778a3876a26526798675f3f209d843b8ee8dafcdea546941787d304f95b26d46ae442698d76a0a48a42806fa0ccb1969b7257d4f75c9c97c WHIRLPOOL 5b5a37c5e00adec2fd0a34d5a976bccebb1910d9c77aa09f30c58e1647ef56de7c970364656ec780d7acb2ec1331d7b56c0a09f2d18942a3ad3764dbe87f7ac3
-MISC ChangeLog 15738 SHA256 3cb6da3f82fcecc8e54ca3a1fd3ee9cbde09b8deb4ef1f0d7780cf72dbb53bbb SHA512 11147871dbc2fffb964ff95a1b8329f83e040e7be208eacd260350a9a9021952ff5f0f46a09143974000b01b5b726fb075b9168e9c8b62a91cddfef2c88cf768 WHIRLPOOL ac3368ab63037fc5a91d1b157b47dfceb63e175835c00f13d901ed2d11cc8f6dc97989fc8dab7b8108887fd2b48ab26509140dc26ce61e6987b1ef0e53ae7356
-MISC metadata.xml 806 SHA256 f66a9c3e81790ff9486773029cf2c40cdfc5a475f067cb3466b12eb8b5cfeade SHA512 954feb6fc20f83a22e0cee07e66ff41d7720b05ab078f72e95670b8196ec2d0b301a4c01fb67a056133a945c63725033986e7124c856646fe48388d33f2164f9 WHIRLPOOL dbea1c81a9be27437ec37da9b42593b8d894b7f68bf349d5de335ed851a647588a87045f4aaece8ae41d0ff458b6a87f0bb6ab96f605950e9b914751a21053aa
+EBUILD systemd-198.ebuild 6355 SHA256 f2c3d69bcb3a46b27b585f49dab4b21e7acd65a1a8983e7eaf14fb545c84cc40 SHA512 13a43dbaaa42e6a6ee4fae28d568a034e47e4f44de8515791746084197290e8d69d01d45d66757a153016b1a0b12f9851830294811a9c563cc15f3be0eb669fd WHIRLPOOL 260934dba0dc132fa40896304b7d675eb12bce4b6d2a72800b3eb6c98a38ab1392e34fa43257653ed14fc448a0b202b2ab7b7306c71bcfed150516d275a039e6
+EBUILD systemd-9999.ebuild 6919 SHA256 ac81ae2155f3f5d3704adcb25f69254a2f2c5bc714eee36b9bfac23c30af5fc3 SHA512 559814c708f7ed0c7cda048732ebc281dce17ef6229035fa0922fa429b8ac08f198bc7ac3a1198bb892ed429ef4db9f7434583217f1cadabcbd8438d57f1c173 WHIRLPOOL 57604b376a599ad78fdc1d61d329290ae0f1ed1db27e278342172cb477c4189a1d12270b2fec8a0bb417be18b051dd64f95885d0cb4ad332f11e7bf1e7f91029
+MISC ChangeLog 16090 SHA256 0ed797d3331c841220b9983df34141cd6198c571a93bfa53fed76a6de3ed4811 SHA512 0310558ba122c0a7e7c62947d55efb99e1c67919e336e685b2deb73c40467c6e046c92c26e8cfe4aca34c31f89391cca6f9ca199cfcbde4e04f19b60ff503d37 WHIRLPOOL 24cc75c5a1f1a9a9e98f062eee642bdd3fed8f9350683124a074801bd341df31e823769f34e4e8616ca2d32d90cda3b78a06919d23ceb6f3a4e65a2fa04d79bb
+MISC metadata.xml 870 SHA256 d10bf3958e17ce55fc757cebfb5be5b4a8f74d3948f572ae6997cdec040d4a65 SHA512 7e7740688960cb004f6bdcc200d13ff7f6a920bb0a2573499b730cb2ec7fd3493c3c839c0383e465cba9c22d7fe722b6f41205ce1b75436cf923a41d3cbdb94f WHIRLPOOL 8990c497b916df66e92deda13376eb057abc3137807bc126b80b4b217d8a65cafb1bf21de4f8030bb4cdcde69fc8632ef36f7868a93911b813a1b7de9b38a283
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRN1hCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJROz2nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD7gAP/iA+HbQqHJdF8i/F6IBU5Qfk
-0Qp4rramBfsdRR9nrfaiClpoJ5hkJlFBwpByVplSuLFtmw2FI3BD2gb0xG9gFWR6
-onnEccdFr3H1PkrsKquybFWJFfba6L+9QDlp41EjVCrU8dSY7SIW727Mi4ZSDq5y
-hPMWuQzjxmuUizGnGld/CwIzsAJP4uVcySi/rW1IrSFdrC9z+LXJ6q+sp0s+ZZUC
-Kn1zUMOnpfET9kHeG9KuJQLC6jn/Ojvpj8cdaL5rq2lPklKL5LEiqA4qrHrldtlv
-K0JsGxZgRixyPUzuS5uMVm04zLUSa7vnPFnDVekcMf6Z6s+3HeNBCObzX/Tktswv
-dQDGOTw0PJrC06rcxFpF3gFEcC7Rd7ynjz/WdNfVctSgVBn0gXanHmzFK7Uu1O2R
-2Vsjk86/8RR6cMacdtDP/5mgBKz1m99iKp7hE47Duz1FFOIOmKG989AqiiYHq2jX
-7B4Wggn2GDNvDuqChiVIDjXM+aF5mpFfNlwhaM0SBWpyH3d58TOKPnld0jBcnBvI
-BTNy2wSstIrFXUmXKZzzO7rr/H8X10hgoYBOfOoIDeLUnTSYsRXpIXcyKkz08mRK
-wEsbaoWTia1A8yeSVQEK+qT1cx2Nje2SpB6i3Tz/VrtjOmQVAph65SuOcw2rcn1H
-KJxhMk9HCXXRRYgmPXrJ
-=VVg+
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDCdkP/i2zqn9YD75BVUDpewYrUyFC
+Df3fZux2mlVaQBIKVSJQMWdhWfWLexyhwWPJQjRifWT1OvuuqfG8GhGezUQHOTUf
+RrdfHxotg1KYrpUd2PCWop/N/FtMtrJo2DCsob3jDcXfPjhbjyyRC/lYk9fkfZZf
+nqTGFDFJvmFxtEtVW2UgHOn1kirZV2uVm8SgQO8HlF4iZpt897Y/5ggVIPMAf190
+nFDulv9/bbjxU4GlgqRl0PSMHvIXgl+WwXf/5+7lK7Tm8Sor1ONCz+4xORF0HV2i
+bIJYM794n61GwNm6Q0PSh6BrSZ+JGfuWN0gK4px7EyiIVwSs2kSIyQpswTrinEDv
+I2E7gHPNVRhJgWgSUZK1jW1rYdqilFreoCmWT8dRatxGfc7uiVv0PQpJIEbfhjCl
+WMp9UtfNx0jJ09LPwM88FLd7CBUZ1yopWDYk9NQtqlzLxu2o9+udqdK7tBlTxqJv
+KIpls0LIysY723Q6SgtwYH/YqFFIgxtKUnCGey+6rC3KexoBGa9iGgqWI0/CvQiU
+HSFCMHEhSB3K2/3bavpdLWJ2sx1EgsYcKhWs7GNUuCSSKKD/u++xg8OYj3lcHTnh
+wKc4LgZuPS9kOCqVFg4cOBUXAycU16E64/MYB13KEaWqn2bYly1OFBcygrLKEXZt
+6seZFtR5C9XjZ/j4c6+r
+=Usww
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch
index a415969c58f6..2f8f08aca5f1 100644
--- a/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch
+++ b/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch
@@ -1,12 +1,12 @@
-From a354cd7838ef9c42b2f0b0b35eae78bfff9837ad Mon Sep 17 00:00:00 2001
+From 3d8c9ce43939b5b10bb29d459c6ea6cb35455765 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Fri, 8 Feb 2013 18:16:52 +0100
 Subject: [PATCH] Disable udev targets.
 
 ---
  Makefile-man.am |  6 +-----
- Makefile.am     | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 14 deletions(-)
+ Makefile.am     | 32 +++++++++++++++++++++-----------
+ 2 files changed, 22 insertions(+), 16 deletions(-)
 
 diff --git a/Makefile-man.am b/Makefile-man.am
 index 8d48ee0..8dc145b 100644
@@ -40,10 +40,20 @@ index 8d48ee0..8dc145b 100644
  	man/systemd-update-utmp.8 \
  	man/systemd-user.conf.5
 diff --git a/Makefile.am b/Makefile.am
-index 35ce1fb..5399659 100644
+index 0243fa7..0f2ea1c 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -379,8 +379,6 @@ dist_systemunit_DATA = \
+@@ -317,8 +317,7 @@ systemd_analyze_LDADD = \
+ 
+ dist_bashcompletion_DATA = \
+ 	shell-completion/bash/journalctl \
+-	shell-completion/bash/systemctl \
+-	shell-completion/bash/udevadm
++	shell-completion/bash/systemctl
+ 
+ dist_tmpfiles_DATA = \
+ 	tmpfiles.d/systemd.conf \
+@@ -379,8 +378,6 @@ dist_systemunit_DATA = \
  	units/quotaon.service \
  	units/systemd-ask-password-wall.path \
  	units/systemd-ask-password-console.path \
@@ -52,7 +62,7 @@ index 35ce1fb..5399659 100644
  	units/system-update.target \
  	units/initrd-parse-etc.service \
  	units/initrd-cleanup.service \
-@@ -415,9 +413,6 @@ nodist_systemunit_DATA = \
+@@ -415,9 +412,6 @@ nodist_systemunit_DATA = \
  	units/systemd-kexec.service \
  	units/systemd-fsck@.service \
  	units/systemd-fsck-root.service \
@@ -62,7 +72,7 @@ index 35ce1fb..5399659 100644
  	units/debug-shell.service
  
  dist_userunit_DATA = \
-@@ -1319,9 +1314,6 @@ nodist_systemunit_DATA += \
+@@ -1321,9 +1315,6 @@ nodist_systemunit_DATA += \
  SYSINIT_TARGET_WANTS += \
  	systemd-modules-load.service
  
@@ -72,7 +82,7 @@ index 35ce1fb..5399659 100644
  endif
  
  EXTRA_DIST += \
-@@ -1604,6 +1596,22 @@ EXTRA_DIST += \
+@@ -1606,6 +1597,22 @@ EXTRA_DIST += \
  	src/libsystemd-daemon/libsystemd-daemon.pc.in \
  	src/libsystemd-daemon/libsystemd-daemon.sym
  
@@ -95,7 +105,7 @@ index 35ce1fb..5399659 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GTK_DOC
  SUBDIRS += \
-@@ -1614,7 +1622,7 @@ include_HEADERS += \
+@@ -1616,7 +1623,7 @@ include_HEADERS += \
  	src/libudev/libudev.h
  
  lib_LTLIBRARIES += \
@@ -104,7 +114,7 @@ index 35ce1fb..5399659 100644
  
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
-@@ -2266,6 +2274,9 @@ udevlibexec_PROGRAMS += \
+@@ -2268,6 +2275,9 @@ udevlibexec_PROGRAMS += \
  	mtd_probe
  
  # ------------------------------------------------------------------------------
diff --git a/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch
new file mode 100644
index 000000000000..6102c11f16e2
--- /dev/null
+++ b/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch
@@ -0,0 +1,129 @@
+From 487e2edd3d05f990f98c112deb96033b4ce3cd06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 8 Feb 2013 18:16:52 +0100
+Subject: [PATCH] Disable udev targets.
+
+---
+ Makefile-man.am |  6 +-----
+ Makefile.am     | 32 +++++++++++++++++++++-----------
+ 2 files changed, 22 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile-man.am b/Makefile-man.am
+index 8d48ee0..8dc145b 100644
+--- a/Makefile-man.am
++++ b/Makefile-man.am
+@@ -70,7 +70,6 @@ MANPAGES += \
+ 	man/systemd-system.conf.5 \
+ 	man/systemd-tmpfiles.8 \
+ 	man/systemd-tty-ask-password-agent.1 \
+-	man/systemd-udevd.service.8 \
+ 	man/systemd-update-utmp-runlevel.service.8 \
+ 	man/systemd.1 \
+ 	man/systemd.automount.5 \
+@@ -91,9 +90,7 @@ MANPAGES += \
+ 	man/systemd.timer.5 \
+ 	man/systemd.unit.5 \
+ 	man/telinit.8 \
+-	man/tmpfiles.d.5 \
+-	man/udev.7 \
+-	man/udevadm.8
++	man/tmpfiles.d.5
+ MANPAGES_ALIAS += \
+ 	man/SD_ALERT.3 \
+ 	man/SD_CRIT.3 \
+@@ -185,7 +182,6 @@ MANPAGES_ALIAS += \
+ 	man/systemd-tmpfiles-setup.service.8 \
+ 	man/systemd-udevd-control.socket.8 \
+ 	man/systemd-udevd-kernel.socket.8 \
+-	man/systemd-udevd.8 \
+ 	man/systemd-update-utmp-shutdown.service.8 \
+ 	man/systemd-update-utmp.8 \
+ 	man/systemd-user.conf.5
+diff --git a/Makefile.am b/Makefile.am
+index 6af451b..2cb89ea 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -317,8 +317,7 @@ systemd_analyze_LDADD = \
+ 
+ dist_bashcompletion_DATA = \
+ 	shell-completion/bash/journalctl \
+-	shell-completion/bash/systemctl \
+-	shell-completion/bash/udevadm
++	shell-completion/bash/systemctl
+ 
+ dist_tmpfiles_DATA = \
+ 	tmpfiles.d/systemd.conf \
+@@ -379,8 +378,6 @@ dist_systemunit_DATA = \
+ 	units/quotaon.service \
+ 	units/systemd-ask-password-wall.path \
+ 	units/systemd-ask-password-console.path \
+-	units/systemd-udevd-control.socket \
+-	units/systemd-udevd-kernel.socket \
+ 	units/system-update.target \
+ 	units/initrd-switch-root.target
+ 
+@@ -411,9 +408,6 @@ nodist_systemunit_DATA = \
+ 	units/systemd-kexec.service \
+ 	units/systemd-fsck@.service \
+ 	units/systemd-fsck-root.service \
+-	units/systemd-udevd.service \
+-	units/systemd-udev-trigger.service \
+-	units/systemd-udev-settle.service \
+ 	units/debug-shell.service \
+ 	units/initrd-parse-etc.service \
+ 	units/initrd-cleanup.service \
+@@ -1325,9 +1319,6 @@ nodist_systemunit_DATA += \
+ SYSINIT_TARGET_WANTS += \
+ 	systemd-modules-load.service
+ 
+-dist_udevrules_DATA += \
+-	rules/80-drivers.rules
+-
+ endif
+ 
+ EXTRA_DIST += \
+@@ -1610,6 +1601,22 @@ EXTRA_DIST += \
+ 	src/libsystemd-daemon/libsystemd-daemon.pc.in \
+ 	src/libsystemd-daemon/libsystemd-daemon.sym
+ 
++# needed parts of udev
++
++dist_udevrules_DATA += \
++	rules/99-systemd.rules
++
++SOCKETS_TARGET_WANTS += \
++	systemd-udevd-control.socket \
++	systemd-udevd-kernel.socket
++SYSINIT_TARGET_WANTS += \
++	systemd-udevd.service \
++	systemd-udev-trigger.service
++
++# we won't set this in systemd ebuild, so it is an easy way
++# of stripping the whole udev.
++if ENABLE_GUDEV
++
+ # ------------------------------------------------------------------------------
+ if ENABLE_GTK_DOC
+ SUBDIRS += \
+@@ -1620,7 +1627,7 @@ include_HEADERS += \
+ 	src/libudev/libudev.h
+ 
+ lib_LTLIBRARIES += \
+-	-ludev
++	libudev.la
+ 
+ libudev_la_SOURCES =\
+ 	src/libudev/libudev-private.h \
+@@ -2272,6 +2279,9 @@ udevlibexec_PROGRAMS += \
+ 	mtd_probe
+ 
+ # ------------------------------------------------------------------------------
++
++endif
++
+ libsystemd_id128_la_SOURCES = \
+ 	src/libsystemd-id128/sd-id128.c
+ 
+-- 
+1.8.1.5
+
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index f735344abdc0..42269a34f9dc 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,6 +9,7 @@
 		<!-- 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='efi'>Enable EFI support (installs bootctl)</flag>
 		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
 		<flag name='http'>Enable embedded HTTP server in journald</flag>
 		<flag name='kmod'>Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
diff --git a/sys-apps/systemd/systemd-198.ebuild b/sys-apps/systemd/systemd-198.ebuild
new file mode 100644
index 000000000000..8ad8ee630eec
--- /dev/null
+++ b/sys-apps/systemd/systemd-198.ebuild
@@ -0,0 +1,216 @@
+# 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-198.ebuild,v 1.1 2013/03/09 13:47:44 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils linux-info pam python-single-r1 systemd user
+
+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.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="acl audit cryptsetup efi gcrypt http +kmod lzma pam python
+	qrcode selinux tcpd vanilla xattr"
+
+MINKV="2.6.39"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
+	>=sys-apps/util-linux-2.20
+	~sys-fs/udev-${PV}[acl?]
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
+	http? ( net-libs/libmicrohttpd )
+	kmod? ( >=sys-apps/kmod-12 )
+	lzma? ( app-arch/xz-utils )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xattr? ( sys-apps/attr )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwids
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!sys-auth/nss-myhostname
+	!<sys-libs/glibc-2.10
+	!<sys-fs/udev-197-r3"
+
+# sys-fs/quota is necessary to store correct paths in unit files
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	dev-util/intltool
+	sys-fs/quota
+	>=sys-kernel/linux-headers-${MINKV}"
+
+src_prepare() {
+	# link against external udev.
+	sed -i -e 's:lib\(udev\)\.la:-l\1:' Makefile.am
+
+	local PATCHES=(
+		"${FILESDIR}"/198-0001-Disable-udev-targets.patch
+	)
+
+	autotools-utils_src_prepare
+
+	# XXX: support it within eclass
+	eautomake
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		# install everything to /usr
+		--with-rootprefix=/usr
+		--with-rootlibdir=/usr/$(get_libdir)
+		# but pam modules have to lie in /lib*
+		--with-pamlibdir=/$(get_libdir)/security
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# udev parts
+		--disable-introspection
+		--disable-gtk-doc
+		--disable-gudev
+		# just text files
+		--enable-polkit
+		# optional components/dependencies
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable efi)
+		$(use_enable gcrypt)
+		$(use_enable http microhttpd)
+		$(use_enable kmod)
+		$(use_enable lzma xz)
+		$(use_enable pam)
+		$(use_with python)
+		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable xattr)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install \
+		udevlibexecdir=/lib/udev
+
+	# zsh completion
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/systemd-zsh-completion.zsh
+
+	# remove pam.d plugin .la-file
+	prune_libtool_files --modules
+
+	# move nss_myhostname to rootfs (bug #460640)
+	mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \
+		|| die "Unable to move nss_myhostname to rootfs"
+
+	# compat for init= use
+	dosym ../usr/lib/systemd/systemd /bin/systemd
+	dosym ../lib/systemd/systemd /usr/bin/systemd
+	# rsyslog.service depends on it...
+	dosym ../usr/bin/systemctl /bin/systemctl
+
+	# we just keep sysvinit tools, so no need for the mans
+	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		|| die
+	rm "${D}"/usr/share/man/man1/init.1 || die
+
+	if ! use vanilla; then
+		# Create /run/lock as required by new baselay/OpenRC compat.
+		systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
+
+		# Add mount-rules for /var/lock and /var/run, bug #433607
+		systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
+		systemd_enable_service sysinit.target var-lock.mount
+		systemd_enable_service sysinit.target var-run.mount
+	fi
+
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/coredump.conf \
+		"${D}"/etc/sysctl.d/coredump.conf.disabled || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
+
+	# Check whether we won't break user's system.
+	[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.'
+	[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.'
+}
+
+pkg_preinst() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
+		~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
+		~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+	kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
+	check_extra_config
+}
+
+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() {
+	enewgroup systemd-journal
+	systemd_update_catalog
+
+	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
+	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
+	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'
+	elog
+
+	ewarn "Please note this is a work-in-progress and many packages in Gentoo"
+	ewarn "do not supply systemd unit files yet. You are testing it on your own"
+	ewarn "responsibility. Please remember than you can pass:"
+	ewarn "	init=/sbin/init"
+	ewarn "to your kernel to boot using sysvinit / OpenRC."
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 433147788a77..f636fe1504f4 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.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.ebuild,v 1.14 2013/02/08 18:38:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.15 2013/03/09 13:47:44 mgorny Exp $
 
 EAPI=5
 
@@ -13,8 +13,7 @@ inherit git-2
 #endif
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils bash-completion-r1 linux-info pam \
-	python-single-r1 systemd
+inherit autotools-utils linux-info pam python-single-r1 systemd user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -22,15 +21,15 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl audit cryptsetup gcrypt http +kmod lzma pam python qrcode
-	selinux tcpd vanilla xattr"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="acl audit cryptsetup efi gcrypt http +kmod lzma pam python
+	qrcode selinux tcpd vanilla xattr"
 
 MINKV="2.6.39"
 
 COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 	>=sys-apps/util-linux-2.20
-	~sys-fs/udev-${PV}
+	~sys-fs/udev-${PV}[acl?]
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
@@ -85,7 +84,7 @@ src_prepare() {
 	sed -i -e 's:lib\(udev\)\.la:-l\1:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/198-0001-Disable-udev-targets.patch
+		"${FILESDIR}"/199-0001-Disable-udev-targets.patch
 	)
 
 #if LIVE
@@ -115,9 +114,13 @@ src_configure() {
 		--disable-introspection
 		--disable-gtk-doc
 		--disable-gudev
+		# just text files
+		--enable-polkit
+		# optional components/dependencies
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable efi)
 		$(use_enable gcrypt)
 		$(use_enable http microhttpd)
 		$(use_enable kmod)
@@ -136,22 +139,25 @@ src_configure() {
 
 src_install() {
 	autotools-utils_src_install \
-		bashcompletiondir=/tmp \
 		udevlibexecdir=/lib/udev
 
+	# zsh completion
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/systemd-zsh-completion.zsh
+
 	# remove pam.d plugin .la-file
 	prune_libtool_files --modules
 
+	# move nss_myhostname to rootfs (bug #460640)
+	mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \
+		|| die "Unable to move nss_myhostname to rootfs"
+
 	# compat for init= use
 	dosym ../usr/lib/systemd/systemd /bin/systemd
 	dosym ../lib/systemd/systemd /usr/bin/systemd
 	# rsyslog.service depends on it...
 	dosym ../usr/bin/systemctl /bin/systemctl
 
-	# move files as necessary
-	newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN}
-	rm -r "${D}"/tmp || die
-
 	# we just keep sysvinit tools, so no need for the mans
 	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
 		|| die
@@ -203,6 +209,7 @@ optfeature() {
 }
 
 pkg_postinst() {
+	enewgroup systemd-journal
 	systemd_update_catalog
 
 	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
@@ -216,10 +223,6 @@ pkg_postinst() {
 
 	elog "To get additional features, a number of optional runtime dependencies may"
 	elog "be installed:"
-	optfeature 'for systemd-analyze' \
-		'dev-lang/python:2.7' 'dev-python/dbus-python'
-	optfeature 'for systemd-analyze plotting ability' \
-		'dev-python/pycairo[svg]'
 	optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
 		'sys-apps/systemd-ui'
 	elog