Install udev along with systemd again. Using a separate provider has proven to be unmaintainable.

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

6 files changed, 271 insertions, 174 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 7749b6454c22..091703a6ef5e 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.90 2013/03/24 10:30:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.91 2013/03/24 17:03:21 mgorny Exp $
+
+*systemd-198-r3 (24 Mar 2013)
+
+  24 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-198-r3.ebuild,
+  -files/199-0001-Disable-udev-targets.patch, metadata.xml, systemd-9999.ebuild:
+  Install udev along with systemd again. Using a separate provider has proven to
+  be unmaintainable.
 
   24 Mar 2013; Michał Górny <mgorny@gentoo.org> -systemd-198-r2.ebuild,
   systemd-198-r1.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 42a8b85728b5..95fb889280a1 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,7 +8,6 @@ AUX 197-0001-Disable-udev-targets.patch 1774 SHA256 a805ec4051dfcd0271cefe99f8cf
 AUX 198-0001-Disable-udev-targets.patch 3474 SHA256 8b9131ae92ff71bbc447b6756d3bdb8de6586793553bd98a010d2d66840b601a SHA512 8c9cfdca5a4a8884421f270daf2b7b4177fff95b499e562a85028d7f621afb38bc5f8f7f14dba2a73da5f03749a23eaab58c035fded3a4a88d641b96ec307f8f WHIRLPOOL 3c4b929c877813a3b22d4aa9b806af919f7774edc2b56b9704a57fb076ca5dc09be4500b10cdb00a2d33dcebc0d754a1143d5a348896952f2b99a2ceb3c13dff
 AUX 198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch 1349 SHA256 2ea10b9319d1da6b7007553df1b6f09970a373f52a5cff4e4eb77e63144d949b SHA512 1c14e0d48e8514afd3b48ef83dbb6bd75138c858115ab1594cbb210056f39bfdf80f893550612c9d7814b0e0c2ac33d3f6f1e889acaf4b353b93e625fbaa96bb WHIRLPOOL e2026b203635e64ebdc076a59794bafce62852970afdd32fc4e23217d1590dc787b8f3110988d41286130e5b5a0d0e21bef27ec9a29686f9a3449cf830c59b04
 AUX 198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch 1348 SHA256 4e2af402378285300175a969d265a8653cfea21cc4c5c2bf1a67f53aafaf6185 SHA512 deb3fdc316a130663a1d4edba713715d6f907ddc42709f2605c8f086261c54583175873e08a30d0d8741a6f79fcb21b1d4bf5b75cce0880d246a306664b24db4 WHIRLPOOL b3fc0a02ccf2ce48072f07238cc45161822fa8a1d6ca32e92ae0578068870a729e78f11aad7b5bd17f52335f589310bd8040eb717a1237e3828212fe39a1dd56
-AUX 199-0001-Disable-udev-targets.patch 3431 SHA256 e9e576426d33089fe40b6a4e2594f92aa573755d2350e71aa2eb5a30cf41d2b1 SHA512 958d71a655455f64e99f1aa84ea9543896e9aa1b0522e816fe4c4c38c18dc2936bf814c9cd68bc8df1afa0894764d28be0a7c32540efeb49f7a4ec1b17b0ae0f WHIRLPOOL 9b4cdda03409880a26323eaecdcbd3047b9002eff4c1b61cc50f1d5165b99131d884633e59e1bdde6290a0969534b53a3ecf5836a1771389b9176862e40afde3
 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
@@ -16,25 +15,26 @@ DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf5702
 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-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
-EBUILD systemd-9999.ebuild 7133 SHA256 6109aae146699032f9a5c809bde7e279224d5e260d9a9ae8d4f0943e7712f6de SHA512 7a46015cc35d9c680b681c34776a76ef1e6db9750ed0f4bcd81898cd5136a01088c71cc19c8d3ca0fc755887b0d9b37aff240138e8560b677d91c69ffd1887b2 WHIRLPOOL 2a1040c048360dad2f19620d39ba0eacdf84a2dcba3e8e285b636e4c7d7102d4181e37253c7f137e22f17b0ee8f9f0cded367c86091de0f7e1aa61c9fb3e1b55
-MISC ChangeLog 17850 SHA256 d388f0dfe4f7880f6914de1f2cf78cef4eb432a07c31ce81094f91ce19f8d5e2 SHA512 cc95868d9e12cfac94803865336438a9269f6aec8436b57fbbaee6d2b241f0fa922efdb498f2bfd6b7bd09edff27fa3f2d720d02e33029b7dbb87821f5429f6e WHIRLPOOL cb2bdb8e43467792e8578c27c2165459c29d50da0c1cb01bbc580648bf60189856d4eca906b4d17604547aeb40edfa4799c2408a7c47cf3463d8c0f6488e226c
-MISC metadata.xml 870 SHA256 d10bf3958e17ce55fc757cebfb5be5b4a8f74d3948f572ae6997cdec040d4a65 SHA512 7e7740688960cb004f6bdcc200d13ff7f6a920bb0a2573499b730cb2ec7fd3493c3c839c0383e465cba9c22d7fe722b6f41205ce1b75436cf923a41d3cbdb94f WHIRLPOOL 8990c497b916df66e92deda13376eb057abc3137807bc126b80b4b217d8a65cafb1bf21de4f8030bb4cdcde69fc8632ef36f7868a93911b813a1b7de9b38a283
+EBUILD systemd-198-r3.ebuild 6510 SHA256 77b8a9b9828b58824d4db345d999c5f2b1c5242fff6dc2ead678ad23c1ab71f9 SHA512 e1d9870b049be07467a0fcc27c8eee1eee2ee89eae99f534e058a81125b409fa92c3e658ca9bc9142433cfb048dc01729db7c0a9dec4eca7cfbf31712e72215e WHIRLPOOL 87f7396cffd93e88489b67ec82c2de18ae1b5e79a1dfa08d2bff7c5f93b0f320dc45bf51f4d5a635a68df3be94dd9dca54181d1a04a07d3196066ca96b6fb1eb
+EBUILD systemd-9999.ebuild 7105 SHA256 6db1a63b3a693443af0e19e168d89eb3c42604140233bc9c7d294974af535bda SHA512 0b1add23b7ba67d89a9c342354eaa71de2b18e134f41deb50b3ac007a5ce3b0a18bedd07fde39382c5ac4a68e18415174d948db0dcc673ab7de636ef44d33d63 WHIRLPOOL 63a2c4d729a092ba38323bf59cb542b17c3a8c5e3b0515718515857f014e6ca145009e9cf8920a38369631ec5073a5d895eb47ee79a8d17b20d4f87982c43cb8
+MISC ChangeLog 18139 SHA256 cf70a2bd5ec13ae17f48ace1baa709d43281361204e1c93e3f2082414751563d SHA512 1a0e97a09759da3ef66ee311e6a5b0245eb52a91a18eb959a923410de1c4810dfc5a705a6e8183a2dd220fdbf277e9570d2631a002b26f0b02161c05232fd61e WHIRLPOOL dd3326bbcf27dc4536cf2aaadf86d2010a0d5899cbc60ceafc9d9895d18c2fd8991696b47d3276d3b03cfa4254d06fa075ff0fb37d3d225b117faf5c9fd0cebb
+MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRTtXtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRTzIWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD6XoP/2Z7N8N2p5Hb2ZwsKbfBttV2
-sDeO3qtS28nvmaVAgH4S7OhEJYZyetiCRbJvdaVVGHSlgeobYW4293HJ+WFge+T7
-eeYya5NBCvegrG9CEZLIfXvzCrVBYbs3g56E+gebm3SwzxPS3b2kdhRTA6onwvNu
-Xx88sv+dbMkh5YOrLyVVq7TxYklCwZbGw/3yZwWdyTIDPWnraiqFP6fD6wTj4roC
-twkb26Jr2Xhs6hYb0hkcGw8x+RInoN5qAY7sb0dq7Z7ZB163LVnbDk2zvz075Tpp
-7BGMIq7XVM0oNkS+xSpIAByC6eOp57JbPHsnfyQDnaBNfr/Mdl9g78ghTj4GaAoE
-pZGE4RwpTkC7xX4rJKnqsx0gB5JC59L2Sk4DKG8yhdePbwrzNfFx8MPCXu4hV94s
-+ubnam1RUU0c5nH5yw9Rqx56uCT5PN3V92bHQ/Bd2tbtYV84Nr79yinfAXSI1CrO
-smWx+k/VJbgbKvAVdiFV3dqPZDKAEUn5l/6lyAHrDbOZjt+DlrciTbYca8FPTXg7
-fHfKSmJadilxDCwHZJAy5OT4RmP2SeFWLS7X8nFfhrabvIMs0zuU4UPF/IRKY599
-yi+MslL5BTtbf1no5zfInQr8sQ74EzSUuYBXbfYPU6k2p9HskP6UW+0Zvc3fczSA
-8EsLv6GAcmMwh81r+3I1
-=N7FR
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDi30P/jfez+Mq2b5GoTiD6EDaD4y3
+nirvrbGmCwqH45lXX2936YYelT1tXJ+FYr4fTAckSbHzqSzRhk+v8jbuGgxj/FHm
+hnjT1k+qkw/8CQGxku1QGCzJ81My3lTADyAcGzGLDNXQ+JgJ3LusgICnfVyLjm/0
+mKDM5o2j4u2MEGZweKpIII4MYTO8lz7SpiK43szZLlx4urp/PdqoK8SaN9eSTfNW
+PUSXj1GBu0gMOkjbor1zXma25/9frlVAGt+i6Ijh7+1zvRQe+lOl0jCk5ncfNZNq
+rdekWxH1uMlRlRIzvngoENW50kY1lVDf3JHnvpyJhbopNABlm+xPa8Cz1mZq83kB
+0UyfuWzjJ1cJWJgufPGHBKE6MOhJ1zdVnO8V0oldK+XSUEQR6jU0c93oLu0BvVkQ
+zP5vfgx3WE130hLcG6KWLxFAa+oLC/Hbid1Ft5qKZIHaIhY7lbhh+Soei4qOEyBt
+VXoy+yif7NfuXIPrh5jN26PCbWKtpq9+kV257MH+Wkb+0OAT5doMnZBA+NbNmKFG
+kKQlj/bVHH7oz14wFAWRZQ4aL7kTAyQiC6+7M9QcawMartBkW4GqmcYD04PLZRWS
+R+yMJMFYO9SA6oNupE6AiEZ5ESmhxzaSxJxkNwfgLqEpazxL3WvALoHUri243F5B
+UB6KhIMIr7hFKgXEEWyY
+=7qJk
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch
deleted file mode 100644
index c115d350fa9a..000000000000
--- a/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From bb0c337005e9410769b22a78c39d3dc66e1f673c 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     | 30 +++++++++++++++++++++---------
- 2 files changed, 22 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile-man.am b/Makefile-man.am
-index 6e63135..3d881f5 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 a4576e5..48b95a8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -322,8 +322,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 \
-@@ -390,8 +389,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
- 
-@@ -422,13 +419,9 @@ 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 \
--	units/initrd-udevadm-cleanup-db.service \
- 	units/initrd-switch-root.service
- 
- dist_userunit_DATA = \
-@@ -1651,6 +1644,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
-+
- # ------------------------------------------------------------------------------
- libsystemd_bus_la_SOURCES = \
- 	src/libsystemd-bus/sd-bus.c \
-@@ -1737,7 +1746,7 @@ include_HEADERS += \
- 	src/libudev/libudev.h
- 
- lib_LTLIBRARIES += \
--	-ludev
-+	libudev.la
- 
- libudev_la_SOURCES =\
- 	src/libudev/libudev-private.h \
-@@ -2409,6 +2418,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 42269a34f9dc..04f7dcb34cf6 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,6 +11,7 @@
 		<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="gudev">enable libudev gobject interface</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>
 		<flag name='qrcode'>Enable qrcode output support in journal</flag>
diff --git a/sys-apps/systemd/systemd-198-r3.ebuild b/sys-apps/systemd/systemd-198-r3.ebuild
new file mode 100644
index 000000000000..425633371db2
--- /dev/null
+++ b/sys-apps/systemd/systemd-198-r3.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-r3.ebuild,v 1.1 2013/03/24 17:03:21 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils linux-info multilib 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 doc efi gcrypt gudev http
+	introspection +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-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 )
+	gudev? ( >=dev-libs/glib-2 )
+	http? ( net-libs/libmicrohttpd )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	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-20130309-r1[udev]
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!sys-auth/nss-myhostname
+	!<sys-libs/glibc-2.10
+	!sys-fs/udev"
+
+# 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-0.50
+	sys-fs/quota
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+src_prepare() {
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		# 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
+		# no deps
+		--enable-keymap
+		# just text files
+		--enable-polkit
+		# optional components/dependencies
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable doc gtk-doc)
+		$(use_enable efi)
+		$(use_enable gcrypt)
+		$(use_enable gudev)
+		$(use_enable http microhttpd)
+		$(use_enable introspection)
+		$(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
+
+	# zsh completion
+	insinto /usr/share/zsh/site-functions
+	newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
+
+	# remove pam.d plugin .la-file
+	prune_libtool_files --modules
+
+	# move nss_myhostname to rootfs (bug #460640)
+	dodir /$(get_libdir)
+	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() {
+	# for udev rules
+	enewgroup dialout
+
+	enewgroup systemd-journal
+	if use http; then
+		enewgroup systemd-journal-gateway
+		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
+	fi
+	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 9c303e131f90..3caf15a60f43 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.22 2013/03/23 07:46:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.23 2013/03/24 17:03:21 mgorny Exp $
 
 EAPI=5
 
@@ -22,20 +22,21 @@ 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"
+IUSE="acl audit cryptsetup doc efi gcrypt gudev http
+	introspection +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 )
+	gudev? ( >=dev-libs/glib-2 )
 	http? ( net-libs/libmicrohttpd )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	kmod? ( >=sys-apps/kmod-12 )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
@@ -46,14 +47,14 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 	xattr? ( sys-apps/attr )"
 
 RDEPEND="${COMMON_DEPEND}
-	sys-apps/hwids
+	>=sys-apps/hwids-20130309-r1[udev]
 	|| (
 		>=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/udev"
 
 # sys-fs/quota is necessary to store correct paths in unit files
 DEPEND="${COMMON_DEPEND}
@@ -61,47 +62,42 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	dev-util/gperf
-	dev-util/intltool
+	>=dev-util/intltool-0.50
 	sys-fs/quota
-	>=sys-kernel/linux-headers-${MINKV}"
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )"
 
-# eautomake will likely trigger a full autoreconf
-DEPEND+=" dev-libs/gobject-introspection
+#if LIVE
+DEPEND="${DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-libs/gobject-introspection
 	>=dev-libs/libgcrypt-1.4.5
 	>=dev-util/gtk-doc-1.18"
 
-#if LIVE
 SRC_URI=
 KEYWORDS=
 
 pkg_pretend() {
 	ewarn "Please note that the live systemd ebuild is not actively maintained"
-	ewarn "and since the udev split, it is an easy way to get your system broken"
-	ewarn "and unbootable. Please consider using the release ebuilds instead."
+	ewarn "and it is an easy way to get your system broken and unbootable."
+	ewarn "Please consider using the release ebuilds instead."
 }
 #endif
 
 src_prepare() {
-	# link against external udev.
-	sed -i -e 's:lib\(udev\)\.la:-l\1:' Makefile.am
-
-	local PATCHES=(
-		"${FILESDIR}"/199-0001-Disable-udev-targets.patch
-	)
-
 #if LIVE
 	gtkdocize --docdir docs/ || die
 #endif
 
 	autotools-utils_src_prepare
-
-	# XXX: support it within eclass
-	eautomake
 }
 
 src_configure() {
 	local myeconfargs=(
 		--localstatedir=/var
+		--with-firmware-path="/lib/firmware/updates:/lib/firmware"
 		# install everything to /usr
 		--with-rootprefix=/usr
 		--with-rootlibdir=/usr/$(get_libdir)
@@ -109,22 +105,20 @@ src_configure() {
 		--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
+		# no deps
+		--enable-keymap
 		# just text files
 		--enable-polkit
 		# optional components/dependencies
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable doc gtk-doc)
 		$(use_enable efi)
 		$(use_enable gcrypt)
+		$(use_enable gudev)
 		$(use_enable http microhttpd)
+		$(use_enable introspection)
 		$(use_enable kmod)
 		$(use_enable lzma xz)
 		$(use_enable pam)
@@ -140,8 +134,7 @@ src_configure() {
 }
 
 src_install() {
-	autotools-utils_src_install \
-		udevlibexecdir=/lib/udev
+	autotools-utils_src_install
 
 	# zsh completion
 	insinto /usr/share/zsh/site-functions
@@ -211,6 +204,9 @@ optfeature() {
 }
 
 pkg_postinst() {
+	# for udev rules
+	enewgroup dialout
+
 	enewgroup systemd-journal
 	if use http; then
 		enewgroup systemd-journal-gateway