Handle moving initrd-udevadm-cleanup.service to sys-fs/udev. Update the live version patch.

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

5 files changed, 276 insertions, 43 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index a050f6a082ca..014ad5b4f8c3 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.88 2013/03/14 09:25:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.89 2013/03/23 07:46:53 mgorny Exp $
+
+*systemd-198-r2 (23 Mar 2013)
+
+  23 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-198-r2.ebuild,
+  files/199-0001-Disable-udev-targets.patch, systemd-9999.ebuild:
+  Handle moving initrd-udevadm-cleanup.service to sys-fs/udev. Update the live
+  version patch.
 
 *systemd-198-r1 (14 Mar 2013)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 55925d4b6e1b..d24732ad9d78 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,7 +8,7 @@ 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 3486 SHA256 b4bc79f47d6a4abfa76150c689f740adb90c24e2a3d26b6b2430c16a0bb09a8f SHA512 53b5d7ca7ae681c80772f6f7da572dcea9bbb96bf5404f59f2f434b5c081eda2343d7d6bf686612e2df1bbf298308f9ac21075ecbd4e86898e5563dda3509428 WHIRLPOOL e864a4d4ec50aada78858d1932e9d19ed9fce6f4cc25ae7332f190166fb234249b001666c099466dce07cf26da03c9dab55001320b5c21b301744b64ee3ee7c0
+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 +16,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 6840 SHA256 ee9d73058ea5d6f09c80f0f3a2e55c912e51838ef55f580f673eca2c34184487 SHA512 20dcf640ef624fdb1186f0922bc96b9cf5490fd37a6727d6714daa2205438ac84ecc771554ac5d19ff869c14e3c25adb0d96c408b1d84aa526ef1e1183e2b298 WHIRLPOOL a9fa4dddde6eedf9bf12d5693b7ad3e81d90d6924cd283b2b99d5c151618ba0772956ff4a8e86589fc0b8d87c0fd900733582dd9a304800e46fd9dfc97eeb5fe
-EBUILD systemd-9999.ebuild 7165 SHA256 14c75ec067f785a637bf6718ddf191c1e236cfce87c909b8ff31d334e955ec94 SHA512 75179f121cf5df98f917755088285c8def0e65c4dc13eb858f239ae5ca17bf86ec4cd8d74a0409865514ac1e8eb7e965e9aa39a0d56712c61270d8419204c6d5 WHIRLPOOL 455b8e7140b9b6f97af09d3a4313bd6b640bfc9cffa1a50d4054345f020b7321cce17969959c167acf18f62bf26970550896a9e32ff1a1747f80ca3ccc680532
-MISC ChangeLog 17401 SHA256 1de333415deeb876cdf3088dc28d88895fa8649dc3e465a035d6bd30ba77b4c8 SHA512 ebda6c0c6e2587bb8c651635b77d411a01cfaf02406c97c313351a9ea4d6435f2929d65c66f6699edb218ea6fbe34f18a803125f174dd331c6d6d6538b40d932 WHIRLPOOL b231ad036eef679a19d21c56313103843d56bc80486966aed5004798ca3842844b85d128f9a0472668bac11efe6f383a7bb68ebc8743b43fa50f179e018690fc
+EBUILD systemd-198-r2.ebuild 6954 SHA256 8f9d81bc3dfdab12fdbcffc1cc888c1deb668797bdb4cf4dcd35e8b4d4a560c5 SHA512 d425164f30b01202fee091c55cc380f9c3b12a9837c7df4f773f6cc0f24a4b01c2bec740da52aa4ee0c54c89e275760c6c2f927d800b40bae1990610321f3f4d WHIRLPOOL 156070e14b10efa623f10bd8ca664ca035b6a859bea4e7120ce6c6ecdd9bad233a8a932617ef411556eaff1f13e97524b18f37979029e5104581ab340ecce9dd
+EBUILD systemd-9999.ebuild 7133 SHA256 6109aae146699032f9a5c809bde7e279224d5e260d9a9ae8d4f0943e7712f6de SHA512 7a46015cc35d9c680b681c34776a76ef1e6db9750ed0f4bcd81898cd5136a01088c71cc19c8d3ca0fc755887b0d9b37aff240138e8560b677d91c69ffd1887b2 WHIRLPOOL 2a1040c048360dad2f19620d39ba0eacdf84a2dcba3e8e285b636e4c7d7102d4181e37253c7f137e22f17b0ee8f9f0cded367c86091de0f7e1aa61c9fb3e1b55
+MISC ChangeLog 17669 SHA256 5435298da485897a4323aa2cc4ac17f6ef5ced5d183317cdad0b1c4635cbe077 SHA512 47f2d5a84e3e988f426c6c3033ef08bf5f58c710d37dba2893130507a6a35f09c0f2c369cec596b2f5d995e6a4711e51277d1020a103d6be9d3b9db918d15dcf WHIRLPOOL fe2eaf70191b3a1d13e8f33333ecf92bca0936bd587b67247e2ef4ef81996b4f135662ae7c63e8368c6338a2c9ab8e485670dc7c26dfc13fcb6b70dd076e1b0c
 MISC metadata.xml 870 SHA256 d10bf3958e17ce55fc757cebfb5be5b4a8f74d3948f572ae6997cdec040d4a65 SHA512 7e7740688960cb004f6bdcc200d13ff7f6a920bb0a2573499b730cb2ec7fd3493c3c839c0383e465cba9c22d7fe722b6f41205ce1b75436cf923a41d3cbdb94f WHIRLPOOL 8990c497b916df66e92deda13376eb057abc3137807bc126b80b4b217d8a65cafb1bf21de4f8030bb4cdcde69fc8632ef36f7868a93911b813a1b7de9b38a283
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRQZfUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRTV4mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD+0IQALHt+7s0Vwj5jWc6p64tw8UO
-OlrZvmeLkLooj8HCIA3T6uKcuVB39wEP0AOlmC8E0BaB67o8pQhB7HTzU3iVtt9x
-t0gZND0ioomKH3luQM052wPY/hxBPU6I/sLU+j9XoPuE+H0TGeXpzM+rHmKdp0uW
-K3yIHG5c3dB4DRa3nmXS9+QCtMHrpVoLcrizHKf8Xdw6dhuUXXg+cAc/y5BkiqtG
-IveiX838afW+Jgmrs5yqWapOblFUIfqRlHyK7c+V9/DltZ1qM0Xei9wRihJtmf1n
-s/fmw9/kj8AnIGc+yoED3E6B6kdCcxRlhmGRM0tnUFrL4pNMVAKGmHwvjB9qU5xY
-RMyLEp7gju1C15zrL68CFOH6f4JpAWJ+3iqZGR6rEEssA/26Kd8mKnj4j2aBHp5/
-T0Vwiw2k3yL5wzITSI6bi6SxPT6E2Fnd0wa0Av1BB3jud3wa0bMCRXs4CdmIeQVj
-m42cJ0JNmhsxQlYechLlzJCaCh8gwh4wyFrZ67MlSGfcUvzNOe/spBj10B1u9+zR
-mZE9UDIQDNcApO+11e7nOnrWvIQuyvjCgAxxn0J23Ez9tgD/yV7nrMowOOTh3xjo
-Hvb2OY77h1C8Y2l/XLOr1IaA95h+DE9KgVKngVm0rlgb73JQ/SRxKK0YnCKDAJGH
-Pk+d5pmk+5UpFjTCmy6k
-=e0To
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD0x8P/iTbfVT1cFil4XZl+DsOeaih
+1sOk0CXuY5AlZHoP2EKPMJ7GGycyPSE1DNTDtMZiAxZzbHLmcnQbYymx+bGS+VmB
+lKN0ep5YIoHUv2n3zUZ0dfPFSBr87TU1EhOfgzUVxWz+gyTwH4fFC8N0Rn2sz7Iu
+bYG5fGJdIOoc3eMdPSBDkDNf6yuYGs0Zu2bqUMU7zeDCxYqlofeUecT8FoDf7Z56
+NAI6h4bE/aG/0LpTWuy5ue6U40yej/WdGKguQFfi1SlMckc3f36Cieqf5GOwg//J
+wpflQSvbz2zOv1GCLZcWwuueLEVfHnsodlrOWSyxQBm5OHkjbdEst8jAQcVBSBc+
+ljWy8ob3NDxdU+Nq6KujQTCFaU2C+oRrPfIBvOvm0f0HsAYPCdq4bKFxB1BlKN/c
+nXJJF69eQKoJGz9D+y9CvYHeFjQQnHSifPceMWpcnRe2FZR0MzpfCH9JUnVWNaCu
+yTBwdsGe4Q5j1BaHsZMc7cYDRpyWbgKa82rOy8fWN6pY5x1DLQZ61YfbLT3E65gQ
++PsDZ+oXpXYVQ+W5O6lKUI0md2ztWLadacNHI7yVRbGV8xPAc+Bu1hyzAppflrT6
+zKvbguoJ/hfntNZlYC5I8C90pW8/+BazTTGo+BmVX3/E3A6wOl9C5mp0ZEQVwOEa
+Q7ddWbfIKUhX5hNkoNV/
+=fcs3
 -----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
index 6102c11f16e2..c115d350fa9a 100644
--- a/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch
+++ b/sys-apps/systemd/files/199-0001-Disable-udev-targets.patch
@@ -1,15 +1,15 @@
-From 487e2edd3d05f990f98c112deb96033b4ce3cd06 Mon Sep 17 00:00:00 2001
+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     | 32 +++++++++++++++++++++-----------
- 2 files changed, 22 insertions(+), 16 deletions(-)
+ Makefile.am     | 30 +++++++++++++++++++++---------
+ 2 files changed, 22 insertions(+), 14 deletions(-)
 
 diff --git a/Makefile-man.am b/Makefile-man.am
-index 8d48ee0..8dc145b 100644
+index 6e63135..3d881f5 100644
 --- a/Makefile-man.am
 +++ b/Makefile-man.am
 @@ -70,7 +70,6 @@ MANPAGES += \
@@ -40,10 +40,10 @@ index 8d48ee0..8dc145b 100644
  	man/systemd-update-utmp.8 \
  	man/systemd-user.conf.5
 diff --git a/Makefile.am b/Makefile.am
-index 6af451b..2cb89ea 100644
+index a4576e5..48b95a8 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -317,8 +317,7 @@ systemd_analyze_LDADD = \
+@@ -322,8 +322,7 @@ systemd_analyze_LDADD = \
  
  dist_bashcompletion_DATA = \
  	shell-completion/bash/journalctl \
@@ -53,7 +53,7 @@ index 6af451b..2cb89ea 100644
  
  dist_tmpfiles_DATA = \
  	tmpfiles.d/systemd.conf \
-@@ -379,8 +378,6 @@ dist_systemunit_DATA = \
+@@ -390,8 +389,6 @@ dist_systemunit_DATA = \
  	units/quotaon.service \
  	units/systemd-ask-password-wall.path \
  	units/systemd-ask-password-console.path \
@@ -62,7 +62,7 @@ index 6af451b..2cb89ea 100644
  	units/system-update.target \
  	units/initrd-switch-root.target
  
-@@ -411,9 +408,6 @@ nodist_systemunit_DATA = \
+@@ -422,13 +419,9 @@ nodist_systemunit_DATA = \
  	units/systemd-kexec.service \
  	units/systemd-fsck@.service \
  	units/systemd-fsck-root.service \
@@ -72,17 +72,11 @@ index 6af451b..2cb89ea 100644
  	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
+-	units/initrd-udevadm-cleanup-db.service \
+ 	units/initrd-switch-root.service
  
--dist_udevrules_DATA += \
--	rules/80-drivers.rules
--
- endif
- 
- EXTRA_DIST += \
-@@ -1610,6 +1601,22 @@ EXTRA_DIST += \
+ dist_userunit_DATA = \
+@@ -1651,6 +1644,22 @@ EXTRA_DIST += \
  	src/libsystemd-daemon/libsystemd-daemon.pc.in \
  	src/libsystemd-daemon/libsystemd-daemon.sym
  
@@ -103,9 +97,9 @@ index 6af451b..2cb89ea 100644
 +if ENABLE_GUDEV
 +
  # ------------------------------------------------------------------------------
- if ENABLE_GTK_DOC
- SUBDIRS += \
-@@ -1620,7 +1627,7 @@ include_HEADERS += \
+ libsystemd_bus_la_SOURCES = \
+ 	src/libsystemd-bus/sd-bus.c \
+@@ -1737,7 +1746,7 @@ include_HEADERS += \
  	src/libudev/libudev.h
  
  lib_LTLIBRARIES += \
@@ -114,7 +108,7 @@ index 6af451b..2cb89ea 100644
  
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
-@@ -2272,6 +2279,9 @@ udevlibexec_PROGRAMS += \
+@@ -2409,6 +2418,9 @@ udevlibexec_PROGRAMS += \
  	mtd_probe
  
  # ------------------------------------------------------------------------------
diff --git a/sys-apps/systemd/systemd-198-r2.ebuild b/sys-apps/systemd/systemd-198-r2.ebuild
new file mode 100644
index 000000000000..d1dc1e8e315d
--- /dev/null
+++ b/sys-apps/systemd/systemd-198-r2.ebuild
@@ -0,0 +1,232 @@
+# 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-r2.ebuild,v 1.1 2013/03/23 07:46:53 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 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-fs/udev-198-r4
+	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}"
+
+# eautomake will likely trigger a full autoreconf
+DEPEND+=" dev-libs/gobject-introspection
+	>=dev-libs/libgcrypt-1.4.5
+	>=dev-util/gtk-doc-1.18"
+
+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
+		"${FILESDIR}"/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch
+		"${FILESDIR}"/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.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
+
+	# Moved to udev
+	rm "${D}$(systemd_get_unitdir)/initrd-udevadm-cleanup-db.service" || die
+
+	# 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() {
+	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 bf629a93b654..9c303e131f90 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.21 2013/03/10 17:57:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.22 2013/03/23 07:46:53 mgorny Exp $
 
 EAPI=5
 
@@ -177,8 +177,7 @@ src_install() {
 	fi
 
 	# Disable storing coredumps in journald, bug #433457
-	mv "${D}"/usr/lib/sysctl.d/coredump.conf \
-		"${D}"/etc/sysctl.d/coredump.conf.disabled || die
+	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
 
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \