Update wrt changes to udev ebuild.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 141 insertions, 22 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 4dcbaddeb3c9..4a456db1ae5a 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.77 2013/01/21 19:48:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.78 2013/02/08 18:38:36 mgorny Exp $
+
+  08 Feb 2013; Michał Górny <mgorny@gentoo.org>
+  +files/198-0001-Disable-udev-targets.patch, systemd-9999.ebuild:
+  Update wrt changes to udev ebuild.
 
   21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   systemd-197-r1.ebuild, systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0f3b7186f436..aa04df30c4dc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,22 +5,21 @@ 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 3177 SHA256 d22e6711bde70a07c15a3ae265de99cd786c673bf6de312aa5cf6305bb879fdf SHA512 25c8c57b536beb60a1b414aab4c786387af74ab6bcd540ca96858e5702f826546f7487aa4cb8b2047b8c5bcc63dcef56e182e459633d5ac6714827bb007ac1bc WHIRLPOOL 24c779b7d26eec6b88d3c3e1247680d927d82fb24c130ee0466801e4b48a68c3781dbdd90294018a5825dcd17330bf36ec4edd6ae797368c9b412cd061eb066f
 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
 EBUILD systemd-197-r1.ebuild 6495 SHA256 6d9604c771e668e89c483b2cb8e3d3585dec381729c67951f887da4c33dadf50 SHA512 a8170a3bab77dd7e6c85f8dff130e4889386f583725c5665b5e4a068b665b57486f96af52c982c2759dd36d5e398079248d340393ba0aeec50a4c3941539a78d WHIRLPOOL f83d0751862599e9ff94a2ad094499ec65dd386f5814cc4ac67e663d6e59e1440e4bc4acfa464f6a17cc798430e9f9957e1c47495b41eef6476f54a3084a6cad
-EBUILD systemd-9999.ebuild 6805 SHA256 95809c65237156805413489fc69fe247edae3e12cdd655b023077727b7ca15a7 SHA512 a9982be92c3779eb2a76dfc66cef044dc8e281a9dff887d13dbb1130e157aa49a57bdb89a6fea5feaca3fea392f5a9bbf2fe63d8f839d43971ba92aef1c98f6c WHIRLPOOL e9cf68fd21f0e63ae6b744ba8c1a3f0140f9f706355fec8b3cca2bed535efcd7c3aa28270588f54310eb7a3437d3bcaf72e290fe105f6702d02be64ec762b10a
-MISC ChangeLog 15295 SHA256 4ee72c0af31fd368ed51ea6ba0f16f903d24b88f8282121fdb1d00141f93d864 SHA512 868a92d8aee7a914fcf409a1b2c3170ff9e8bdcace26095869e84ac1e42d18c1b49c3d29413c3774af797717fa2aef0d56db1af030a0af5a8fddb2affb25c9ab WHIRLPOOL 3fc09e83fdf24addd2c2bb7c971fb37f5836dd8a908858b15cf6a5ef91dd5b5d4a9bbc241d44ad63dc0f1f3e62b55590c2cdf031ec86d1c20283c0f6435c913f
+EBUILD systemd-9999.ebuild 6820 SHA256 ac7374263d03bb759e21db48a04e2e49780e5ffd9f7c6cf97ff904ffb9befbeb SHA512 7f323c3307828037778a3876a26526798675f3f209d843b8ee8dafcdea546941787d304f95b26d46ae442698d76a0a48a42806fa0ccb1969b7257d4f75c9c97c WHIRLPOOL 5b5a37c5e00adec2fd0a34d5a976bccebb1910d9c77aa09f30c58e1647ef56de7c970364656ec780d7acb2ec1331d7b56c0a09f2d18942a3ad3764dbe87f7ac3
+MISC ChangeLog 15447 SHA256 3eb6041806859a905209ffcf1df1218a7e6bb1b3f86a954ebaeae57e6628fbd0 SHA512 01131a8bae7d51a88372e8181d4e8cf9e155f01aabd83a5ab398390343fb5171945f34e7b916e2f1f667656ad3d24a776c213ea49cc81280125f6ed71ef6ce22 WHIRLPOOL ba439f98c77d2287402a0348baa4418655127dabdff701f587e961cdf6f3d5cf67300cb39951721b7ac617e698b6f4a6a3aa29f22eed111e92952a7a3a74c37c
 MISC metadata.xml 806 SHA256 f66a9c3e81790ff9486773029cf2c40cdfc5a475f067cb3466b12eb8b5cfeade SHA512 954feb6fc20f83a22e0cee07e66ff41d7720b05ab078f72e95670b8196ec2d0b301a4c01fb67a056133a945c63725033986e7124c856646fe48388d33f2164f9 WHIRLPOOL dbea1c81a9be27437ec37da9b42593b8d894b7f68bf349d5de335ed851a647588a87045f4aaece8ae41d0ff458b6a87f0bb6ab96f605950e9b914751a21053aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/ZuNAAoJEJ0WA1zPCt1h7K8H/0OLeLMeysQFHhcLQAe9dlfu
-k2cL1SYfXxEQVXrWqY3MQ++Y3bncMWDl8c2Ie2I+vfl8ekHUgJUXIOnLSY/l0N5t
-JcSPM+IaUqsCGmuD1ylfOi/lL83GJ3eObdfJhGglRqYS0ErgUR7Ca7ZvR28A5RsL
-Pibayd1NZBENL7ZWSdxkqOXO9rGiYXGEnBWBBIkAXOD4tzx8aE1IDHEwmfr5mpbU
-uTTOcBMzBXjfwDFv2VqTSg+CzYQKp8VjicBE2KMKAwiAhIglMD6AG7R7YmcTIHXb
-nuA11vMctmI6IPpG34BIyTBKg52vtm66oSvyq4wKrCR86C3/wRSA5lW2Fs0M9wU=
-=Y5e/
+iJwEAQEIAAYFAlEVRjgACgkQfXuS5UK5QB0JowP9GQc+5lXWSmxUp+ntLePETjm/
+/5+CdFJ8vFJXMmEAdEn1wp+X2LRwO0yWxxGMzizEzctSDsAf/AhPhlSYKZw3kzoX
+x4wijFAqZfy3Rf6dh5HkCe4TZJZskBBfFNsJMlLLsI99MbihKFxPrwyJIEpSSeVk
+yrRrDIugwp8DUAnqFeI=
+=GN61
 -----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
new file mode 100644
index 000000000000..15e30d854f24
--- /dev/null
+++ b/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch
@@ -0,0 +1,119 @@
+From 501e4eda140f1cf676f821599a7992819eb8aace 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(-)
+
+diff --git a/Makefile-man.am b/Makefile-man.am
+index ee9a952..dd16432 100644
+--- a/Makefile-man.am
++++ b/Makefile-man.am
+@@ -69,7 +69,6 @@ MANPAGES += \
+ 	man/systemd-system-update-generator.8 \
+ 	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/SD_ALERT.3: man/sd-daemon.3
+diff --git a/Makefile.am b/Makefile.am
+index 7bc6902..642a285 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -368,8 +368,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
+ 
+ nodist_systemunit_DATA = \
+@@ -399,9 +397,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
+ 
+ dist_userunit_DATA = \
+@@ -1274,9 +1269,6 @@ nodist_systemunit_DATA += \
+ SYSINIT_TARGET_WANTS += \
+ 	systemd-modules-load.service
+ 
+-dist_udevrules_DATA += \
+-	rules/80-drivers.rules
+-
+ endif
+ 
+ EXTRA_DIST += \
+@@ -1555,6 +1547,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 += \
+@@ -1565,7 +1573,7 @@ include_HEADERS += \
+ 	src/libudev/libudev.h
+ 
+ lib_LTLIBRARIES += \
+-	-ludev
++	libudev.la
+ 
+ libudev_la_SOURCES =\
+ 	src/libudev/libudev-private.h \
+@@ -2217,6 +2225,9 @@ udevlibexec_PROGRAMS += \
+ 	mtd_probe
+ 
+ # ------------------------------------------------------------------------------
++
++endif
++
+ libsystemd_id128_la_SOURCES = \
+ 	src/libsystemd-id128/sd-id128.c
+ 
+-- 
+1.8.1.2
+
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8e57f0a09c70..433147788a77 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.13 2013/01/21 19:48:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.14 2013/02/08 18:38:36 mgorny Exp $
 
 EAPI=5
 
@@ -72,23 +72,20 @@ KEYWORDS=
 
 DEPEND+=" dev-libs/gobject-introspection
 	>=dev-util/gtk-doc-1.18"
-#endif
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
+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."
 }
+#endif
 
 src_prepare() {
-	# systemd-analyze is for python2.7 only nowadays.
-	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
-
-	# link against external udev & libsystemd-daemon.
-	sed -i -e 's:lib\(udev\|systemd-daemon\)\.la:-l\1:' Makefile.am
+	# link against external udev.
+	sed -i -e 's:lib\(udev\)\.la:-l\1:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/197-0001-Disable-udev-targets.patch
+		"${FILESDIR}"/198-0001-Disable-udev-targets.patch
 	)
 
 #if LIVE