Update wrt changes to udev ebuild.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)

3 files changed, 133 insertions, 13 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/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