Version bump. Enable Python support. Drop old patches.

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

11 files changed, 267 insertions, 395 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index c2a5984b80eb..a1f1918e136e 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.60 2012/12/01 15:26:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.61 2012/12/02 10:58:37 mgorny Exp $
+
+*systemd-196 (02 Dec 2012)
+
+  02 Dec 2012; Michał Górny <mgorny@gentoo.org>
+  +files/196-0001-Disable-udev-targets.patch, +systemd-196.ebuild,
+  -files/0001-Disable-udev-targets-for-udev-189.patch,
+  -files/0002-journald-add-missing-includes.patch,
+  -files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch,
+  -files/0004-journal-don-t-try-to-compress-without-XZ.patch,
+  -files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch,
+  -files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch,
+  -files/update-etc-systemd-symlinks.path,
+  -files/update-etc-systemd-symlinks.service,
+  -files/update-etc-systemd-symlinks.sh:
+  Version bump. Enable Python support. Drop old patches.
 
   01 Dec 2012; Michał Górny <mgorny@gentoo.org> -systemd-189-r3.ebuild,
   -systemd-191-r1.ebuild, -systemd-192.ebuild, -systemd-193.ebuild,
diff --git a/sys-apps/systemd/files/0002-journald-add-missing-includes.patch b/sys-apps/systemd/files/0002-journald-add-missing-includes.patch
deleted file mode 100644
index 50604d17a603..000000000000
--- a/sys-apps/systemd/files/0002-journald-add-missing-includes.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 4871690d9e32608bbd9b18505b5326c2079c9690 Mon Sep 17 00:00:00 2001
-From: Allin Cottrell <cottrell@wfu.edu>
-Date: Fri, 24 Aug 2012 01:46:38 +0200
-Subject: [PATCH 1/4] journald: add missing includes
-
----
- src/journal/journald-console.c   | 1 +
- src/journal/journald-gperf.gperf | 1 +
- src/journal/journald-kmsg.c      | 1 +
- src/journal/journald-native.c    | 1 +
- src/journal/journald-stream.c    | 1 +
- src/journal/journald-syslog.c    | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
-index 6cd2397..2596d44 100644
---- a/src/journal/journald-console.c
-+++ b/src/journal/journald-console.c
-@@ -21,6 +21,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/socket.h>
- 
- #include "journald.h"
- #include "journald-console.h"
-diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
-index 2f83cbd..32474df 100644
---- a/src/journal/journald-gperf.gperf
-+++ b/src/journal/journald-gperf.gperf
-@@ -1,5 +1,6 @@
- %{
- #include <stddef.h>
-+#include <sys/socket.h>
- #include "conf-parser.h"
- #include "journald.h"
- %}
-diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
-index aebca5d..b259480 100644
---- a/src/journal/journald-kmsg.c
-+++ b/src/journal/journald-kmsg.c
-@@ -23,6 +23,7 @@
- #include <sys/epoll.h>
- #include <fcntl.h>
- #include <sys/mman.h>
-+#include <sys/socket.h>
- 
- #include <systemd/sd-messages.h>
- #include <libudev.h>
-diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
-index 7aa99a3..4e44c3a 100644
---- a/src/journal/journald-native.c
-+++ b/src/journal/journald-native.c
-@@ -20,6 +20,7 @@
- ***/
- 
- #include <unistd.h>
-+#include <stddef.h>
- #include <sys/epoll.h>
- 
- #include "socket-util.h"
-diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 3e4022a..113c421 100644
---- a/src/journal/journald-stream.c
-+++ b/src/journal/journald-stream.c
-@@ -21,6 +21,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
-+#include <stddef.h>
- #include <sys/epoll.h>
- 
- #ifdef HAVE_SELINUX
-diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index daed095..9db9198 100644
---- a/src/journal/journald-syslog.c
-+++ b/src/journal/journald-syslog.c
-@@ -20,6 +20,7 @@
- ***/
- 
- #include <unistd.h>
-+#include <stddef.h>
- #include <sys/epoll.h>
- 
- #include "socket-util.h"
--- 
-1.7.12
-
diff --git a/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch b/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch
deleted file mode 100644
index ea1b185236db..000000000000
--- a/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 70f09301d5d47577cfa4fe70c7b3cba336529cdf Mon Sep 17 00:00:00 2001
-From: Yin Kangkai <kangkai.yin@intel.com>
-Date: Fri, 24 Aug 2012 16:52:58 +0800
-Subject: [PATCH] journal: add HAVE_XZ check to avoid build failure
-
-Without this, build fail with --disable-xz or xz not installed.
----
- src/journal/journal-verify.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 2401293..5d134bd 100644
---- a/src/journal/journal-verify.c
-+++ b/src/journal/journal-verify.c
-@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
-                 h1 = le64toh(o->data.hash);
- 
-                 if (o->object.flags & OBJECT_COMPRESSED) {
-+#ifdef HAVE_XZ
-                         void *b = NULL;
-                         uint64_t alloc = 0, b_size;
- 
-@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
- 
-                         h2 = hash64(b, b_size);
-                         free(b);
-+#else
-+                        return -EPROTONOSUPPORT;
-+#endif
-                 } else
-                         h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
- 
--- 
-1.7.12
-
diff --git a/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch b/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch
deleted file mode 100644
index 475766544bfb..000000000000
--- a/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 48b617399d7d8446c5310b2568b2af6f13331b4c Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 3 Sep 2012 15:46:44 +0200
-Subject: [PATCH] journal: don't try to compress without XZ
-
-otherwise the header contains the HEADER_INCOMPATIBLE_COMPRESSED
-flag even though the data is not compressed and reading the journal
-fails.
----
- src/journal/journal-file.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index c8193ba..8bd5273 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -2021,7 +2021,9 @@ int journal_file_open(
-         f->flags = flags;
-         f->prot = prot_from_flags(flags);
-         f->writable = (flags & O_ACCMODE) != O_RDONLY;
-+#ifdef HAVE_XZ
-         f->compress = compress;
-+#endif
-         f->seal = seal;
- 
-         if (mmap_cache)
--- 
-1.7.12
-
diff --git a/sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch b/sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch
deleted file mode 100644
index 353b7e8d209a..000000000000
--- a/sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sat, 22 Sep 2012 00:16:13 +0200
-Subject: [PATCH] journal: bring mmap cache prototype in sync
-
----
- src/journal/mmap-cache.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
-index de34634..0c42fb8 100644
---- a/src/journal/mmap-cache.h
-+++ b/src/journal/mmap-cache.h
-@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
- MMapCache* mmap_cache_ref(MMapCache *m);
- MMapCache* mmap_cache_unref(MMapCache *m);
- 
--int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
-+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
- void mmap_cache_close_fd(MMapCache *m, int fd);
- void mmap_cache_close_context(MMapCache *m, unsigned context);
--- 
-1.7.12
-
diff --git a/sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch b/sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch
deleted file mode 100644
index 2e543a9ec5c4..000000000000
--- a/sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 963ddb917de3140308ee62fb642b2307a577a39e Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Mon, 24 Sep 2012 23:22:19 +0200
-Subject: [PATCH] log: fix repeated invocation of vsnprintf()/vaprintf() in
- log_struct()
-
-https://bugs.freedesktop.org/show_bug.cgi?id=55213
----
- src/nspawn/nspawn.c |  6 ++++++
- src/shared/log.c    | 22 ++++++++++++++++++++--
- src/shared/macro.h  | 43 +++++++++++++++++++++++++++++++++++++++++++
- src/test/test-log.c |  7 +++++++
- 4 files changed, 76 insertions(+), 2 deletions(-)
-
-diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 959df4e..5cac32c 100644
---- a/src/nspawn/nspawn.c
-+++ b/src/nspawn/nspawn.c
-@@ -1307,6 +1307,12 @@ int main(int argc, char *argv[]) {
- 
-                         if (arg_user) {
- 
-+                                /* Note that this resolves user names
-+                                 * inside the container, and hence
-+                                 * accesses the NSS modules from the
-+                                 * container and not the host. This is
-+                                 * a bit weird... */
-+
-                                 if (get_user_creds((const char**)&arg_user, &uid, &gid, &home, NULL) < 0) {
-                                         log_error("get_user_creds() failed: %m");
-                                         goto child_fail;
-diff --git a/src/shared/log.c b/src/shared/log.c
-index b618458..6357868 100644
---- a/src/shared/log.c
-+++ b/src/shared/log.c
-@@ -27,6 +27,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <stddef.h>
-+#include <printf.h>
- 
- #include "log.h"
- #include "util.h"
-@@ -705,11 +706,23 @@ int log_struct_internal(
-                 va_start(ap, format);
-                 while (format && n + 1 < ELEMENTSOF(iovec)) {
-                         char *buf;
-+                        va_list aq;
- 
--                        if (vasprintf(&buf, format, ap) < 0) {
-+                        /* We need to copy the va_list structure,
-+                         * since vasprintf() leaves it afterwards at
-+                         * an undefined location */
-+
-+                        va_copy(aq, ap);
-+                        if (vasprintf(&buf, format, aq) < 0) {
-+                                va_end(aq);
-                                 r = -ENOMEM;
-                                 goto finish;
-                         }
-+                        va_end(aq);
-+
-+                        /* Now, jump enough ahead, so that we point to
-+                         * the next format string */
-+                        VA_FORMAT_ADVANCE(format, ap);
- 
-                         IOVEC_SET_STRING(iovec[n++], buf);
- 
-@@ -742,8 +755,11 @@ int log_struct_internal(
- 
-                 va_start(ap, format);
-                 while (format) {
-+                        va_list aq;
- 
--                        vsnprintf(buf, sizeof(buf), format, ap);
-+                        va_copy(aq, ap);
-+                        vsnprintf(buf, sizeof(buf), format, aq);
-+                        va_end(aq);
-                         char_array_0(buf);
- 
-                         if (startswith(buf, "MESSAGE=")) {
-@@ -751,6 +767,8 @@ int log_struct_internal(
-                                 break;
-                         }
- 
-+                        VA_FORMAT_ADVANCE(format, ap);
-+
-                         format = va_arg(ap, char *);
-                 }
-                 va_end(ap);
-diff --git a/src/shared/macro.h b/src/shared/macro.h
-index c7ce7c8..0dd210a 100644
---- a/src/shared/macro.h
-+++ b/src/shared/macro.h
-@@ -193,4 +193,47 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
- #define _cleanup_closedir_ __attribute__((cleanup(closedirp)))
- #define _cleanup_umask_ __attribute__((cleanup(umaskp)))
- 
-+#define VA_FORMAT_ADVANCE(format, ap) do {                              \
-+        int _argtypes[64];                                              \
-+        size_t _i, _k;                                                  \
-+        _k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
-+        for (_i = 0; _i < _k; _i++) {                                   \
-+                if (_argtypes[_i] & PA_FLAG_PTR)  {                     \
-+                        (void) va_arg(ap, void*);                       \
-+                        continue;                                       \
-+                }                                                       \
-+                                                                        \
-+                switch (_argtypes[_i]) {                                \
-+                case PA_INT:                                            \
-+                case PA_INT|PA_FLAG_SHORT:                              \
-+                case PA_CHAR:                                           \
-+                        (void) va_arg(ap, int);                         \
-+                        break;                                          \
-+                case PA_INT|PA_FLAG_LONG:                               \
-+                        (void) va_arg(ap, long int);                    \
-+                        break;                                          \
-+                case PA_INT|PA_FLAG_LONG_LONG:                          \
-+                        (void) va_arg(ap, long long int);               \
-+                        break;                                          \
-+                case PA_WCHAR:                                          \
-+                        (void) va_arg(ap, wchar_t);                     \
-+                        break;                                          \
-+                case PA_WSTRING:                                        \
-+                case PA_STRING:                                         \
-+                case PA_POINTER:                                        \
-+                        (void) va_arg(ap, void*);                       \
-+                        break;                                          \
-+                case PA_FLOAT:                                          \
-+                case PA_DOUBLE:                                         \
-+                        (void) va_arg(ap, double);                      \
-+                        break;                                          \
-+                case PA_DOUBLE|PA_FLAG_LONG_DOUBLE:                     \
-+                        (void) va_arg(ap, long double);                 \
-+                        break;                                          \
-+                default:                                                \
-+                        assert_not_reached("Unknown format string argument."); \
-+                }                                                       \
-+        }                                                               \
-+} while(false)
-+
- #include "log.h"
-diff --git a/src/test/test-log.c b/src/test/test-log.c
-index cc924fa..8dc3d53 100644
---- a/src/test/test-log.c
-+++ b/src/test/test-log.c
-@@ -42,5 +42,12 @@ int main(int argc, char* argv[]) {
-                    "SERVICE=foobar",
-                    NULL);
- 
-+        log_struct(LOG_INFO,
-+                   "MESSAGE=Foobar PID=%lu", (unsigned long) getpid(),
-+                   "FORMAT_STR_TEST=1=%i A=%c 2=%hi 3=%li 4=%lli 1=%p foo=%s 2.5=%g 3.5=%g 4.5=%Lg",
-+                   (int) 1, 'A', (short) 2, (long int) 3, (long long int) 4, (void*) 1, "foo", (float) 2.5f, (double) 3.5, (long double) 4.5,
-+                   "SUFFIX=GOT IT",
-+                   NULL);
-+
-         return 0;
- }
--- 
-1.7.12
-
diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch b/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch
index 05b4a9df677a..814c8f41610d 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
+++ b/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch
@@ -1,17 +1,17 @@
-From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001
+From 3108c60ba5f4f46fa4b4ca0927d8b5df1b701a75 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Wed, 15 Aug 2012 14:02:07 +0200
-Subject: [PATCH] Disable udev targets, for udev-189.
+Subject: [PATCH] Disable udev targets.
 
 ---
- Makefile.am | 189 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 188 deletions(-)
+ Makefile.am | 203 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 202 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 8de4aa4..5fa3085 100644
+index 29d6323..2df0ec2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -307,8 +307,6 @@ dist_systemunit_DATA = \
+@@ -316,8 +316,6 @@ dist_systemunit_DATA = \
  	units/systemd-ask-password-wall.path \
  	units/systemd-ask-password-console.path \
  	units/syslog.target \
@@ -20,7 +20,7 @@ index 8de4aa4..5fa3085 100644
  	units/system-update.target
  
  nodist_systemunit_DATA = \
-@@ -338,9 +336,6 @@ nodist_systemunit_DATA = \
+@@ -347,9 +345,6 @@ nodist_systemunit_DATA = \
  	units/systemd-kexec.service \
  	units/systemd-fsck@.service \
  	units/systemd-fsck-root.service \
@@ -29,8 +29,8 @@ index 8de4aa4..5fa3085 100644
 -	units/systemd-udev-settle.service \
  	units/debug-shell.service
  
- dist_userunit_DATA = \
-@@ -1588,12 +1583,6 @@ SUBDIRS += \
+ if HAVE_KMOD
+@@ -1756,12 +1751,6 @@ SUBDIRS += \
  	docs/libudev
  endif
  
@@ -43,7 +43,7 @@ index 8de4aa4..5fa3085 100644
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
  	src/libudev/libudev.c \
-@@ -1616,9 +1605,6 @@ libudev_la_LDFLAGS = \
+@@ -1786,9 +1775,6 @@ libudev_la_LDFLAGS = \
  libudev_la_LIBADD = \
  	libsystemd-shared.la
  
@@ -53,7 +53,7 @@ index 8de4aa4..5fa3085 100644
  EXTRA_DIST += \
  	src/libudev/libudev.pc.in \
  	src/libudev/libudev.sym
-@@ -1639,12 +1625,7 @@ libudev-install-move-hook:
+@@ -1809,12 +1795,7 @@ libudev-install-move-hook:
  libudev-uninstall-move-hook:
  	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
  
@@ -66,7 +66,7 @@ index 8de4aa4..5fa3085 100644
  
  libudev_private_la_SOURCES =\
  	$(libudev_la_SOURCES) \
-@@ -1659,15 +1640,6 @@ libudev_private_la_LIBADD = \
+@@ -1829,15 +1810,6 @@ libudev_private_la_LIBADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -82,7 +82,7 @@ index 8de4aa4..5fa3085 100644
  
  man/systemd-udevd.8: man/systemd-udevd.service.8
  man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-@@ -1679,27 +1651,7 @@ udev-confdirs:
+@@ -1850,40 +1822,7 @@ udev-confdirs:
  INSTALL_DATA_HOOKS += udev-confdirs
  
  dist_udevrules_DATA += \
@@ -94,12 +94,25 @@ index 8de4aa4..5fa3085 100644
 -	rules/60-persistent-input.rules \
 -	rules/60-persistent-alsa.rules \
 -	rules/60-persistent-storage.rules \
+-	rules/64-btrfs.rules \
 -	rules/75-net-description.rules \
 -	rules/75-tty-description.rules \
 -	rules/78-sound-card.rules \
--	rules/80-drivers.rules \
 -	rules/95-udev-late.rules
 -
+-if HAVE_KMOD
+-dist_udevrules_DATA += \
+-	rules/80-drivers.rules
+-endif
+-
+-dist_udevhwdb_DATA = \
+-	hwdb/20-pci-vendor-product.hwdb \
+-	hwdb/20-pci-classes.hwdb \
+-	hwdb/20-usb-vendor-product.hwdb \
+-	hwdb/20-usb-classes.hwdb \
+-	hwdb/20-acpi-vendor.hwdb \
+-	hwdb/20-OUI.hwdb
+-
 -udevconfdir = $(sysconfdir)/udev
 -dist_udevconf_DATA = \
 -	src/udev/udev.conf
@@ -111,7 +124,7 @@ index 8de4aa4..5fa3085 100644
  
  EXTRA_DIST += \
  	rules/99-systemd.rules.in \
-@@ -1727,17 +1679,6 @@ systemd-install-hook:
+@@ -1911,17 +1850,6 @@ systemd-install-hook:
  	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
  	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
  
@@ -129,8 +142,8 @@ index 8de4aa4..5fa3085 100644
  libudev_core_la_SOURCES = \
  	src/udev/udev.h \
  	src/udev/udev-event.c \
-@@ -1803,14 +1744,6 @@ udevadm_LDADD = \
- 	libsystemd-shared.la
+@@ -2008,14 +1936,6 @@ hwdb-remove-hook:
+ 	-test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
  
  # ------------------------------------------------------------------------------
 -TESTS += \
@@ -144,7 +157,7 @@ index 8de4aa4..5fa3085 100644
  test_libudev_SOURCES = \
  	src/test/test-libudev.c
  
-@@ -1860,8 +1793,6 @@ ata_id_LDADD = \
+@@ -2065,8 +1985,6 @@ ata_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -153,7 +166,7 @@ index 8de4aa4..5fa3085 100644
  
  # ------------------------------------------------------------------------------
  cdrom_id_SOURCES = \
-@@ -1871,12 +1802,6 @@ cdrom_id_LDADD = \
+@@ -2076,12 +1994,6 @@ cdrom_id_LDADD = \
  	-ludev \
  	libsystemd-shared.la
  
@@ -166,7 +179,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  collect_SOURCES = \
  	src/udev/collect/collect.c
-@@ -1884,9 +1809,6 @@ collect_SOURCES = \
+@@ -2089,9 +2001,6 @@ collect_SOURCES = \
  collect_LDADD = \
  	libudev-private.la
  
@@ -176,7 +189,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  scsi_id_SOURCES =\
  	src/udev/scsi_id/scsi_id.c \
-@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \
+@@ -2103,9 +2012,6 @@ scsi_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -186,7 +199,7 @@ index 8de4aa4..5fa3085 100644
  EXTRA_DIST += \
  	src/udev/scsi_id/README
  
-@@ -1911,12 +1830,6 @@ v4l_id_SOURCES = \
+@@ -2116,12 +2022,6 @@ v4l_id_SOURCES = \
  v4l_id_LDADD = \
  	-ludev
  
@@ -199,7 +212,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  accelerometer_SOURCES = \
  	src/udev/accelerometer/accelerometer.c
-@@ -1925,12 +1838,6 @@ accelerometer_LDADD = \
+@@ -2130,12 +2030,6 @@ accelerometer_LDADD = \
  	-ludev -lm \
  	libsystemd-shared.la
  
@@ -212,7 +225,7 @@ index 8de4aa4..5fa3085 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2111,99 +2018,11 @@ nodist_keymap_SOURCES = \
+@@ -2316,100 +2210,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -266,6 +279,7 @@ index 8de4aa4..5fa3085 100644
 -	keymaps/hewlett-packard-presario-2100 \
 -	keymaps/hewlett-packard-tablet \
 -	keymaps/hewlett-packard-tx2 \
+-	keymaps/hewlett-packard_elitebook-8440p \
 -	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
 -	keymaps/inventec-symphony_6.0_7.0 \
 -	keymaps/lenovo-3000 \
@@ -312,7 +326,7 @@ index 8de4aa4..5fa3085 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2231,12 +2050,6 @@ mtd_probe_SOURCES =  \
+@@ -2437,12 +2242,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -326,5 +340,5 @@ index 8de4aa4..5fa3085 100644
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
 -- 
-1.7.12
+1.8.0
 
diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.path b/sys-apps/systemd/files/update-etc-systemd-symlinks.path
deleted file mode 100644
index 33a95763da2a..000000000000
--- a/sys-apps/systemd/files/update-etc-systemd-symlinks.path
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Update /etc/systemd/system symlinks for units moved to /usr
-
-[Path]
-PathChanged=/lib/systemd/system
diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.service b/sys-apps/systemd/files/update-etc-systemd-symlinks.service
deleted file mode 100644
index c05a19439d9b..000000000000
--- a/sys-apps/systemd/files/update-etc-systemd-symlinks.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Update /etc/systemd/system symlinks for units moved to /usr
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/systemd/update-etc-systemd-symlinks.sh
diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
deleted file mode 100755
index ce81bba58f25..000000000000
--- a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# Update symlinks to systemd units moved into /usr/systemd.
-# (c) 2012 Michał Górny
-# Released under the terms of the 2-clause BSD license
-
-IFS_SAVE=${IFS}
-IFS='
-'
-# follow + symlink type will match broken symlinks only
-set -- $(find -L /etc/systemd/system -type l -print)
-IFS=${IFS_SAVE}
-
-for f; do
-	old_path=$(readlink "${f}")
-	new_path=/usr/lib${old_path#/lib}
-	if [ -f "${new_path}" ]; then
-		ln -v -s -f "${new_path}" "${f}"
-	fi
-done
diff --git a/sys-apps/systemd/systemd-196.ebuild b/sys-apps/systemd/systemd-196.ebuild
new file mode 100644
index 000000000000..a3e965ba3716
--- /dev/null
+++ b/sys-apps/systemd/systemd-196.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.1 2012/12/02 10:58:37 mgorny Exp $
+
+EAPI=4
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils bash-completion-r1 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 ~x86"
+IUSE="acl audit cryptsetup gcrypt http lzma pam python qrcode selinux
+	tcpd vanilla xattr"
+
+MINKV="2.6.39"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	>=sys-apps/kmod-5
+	>=sys-apps/util-linux-2.20
+	~sys-fs/udev-${PV}
+	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 )
+	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-libs/glibc-2.10
+	!~sys-fs/udev-187"
+
+# 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}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	enewgroup lock # used by var-lock.mount
+	enewgroup tty 5 # used by mount-setup for /dev/pts
+
+	use python && python-single-r1_pkg_setup
+}
+
+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.
+	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
+
+	local PATCHES=(
+		"${FILESDIR}"/196-0001-Disable-udev-targets.patch
+	)
+
+	autotools-utils_src_prepare
+
+	# XXX: support it within eclass
+	eautomake
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-distro=$(use vanilla && echo other || echo gentoo)
+		# 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
+		# udev parts
+		--disable-introspection
+		--disable-gtk-doc
+		--disable-gudev
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable gcrypt)
+		$(use_enable http microhttpd)
+		$(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 \
+		bashcompletiondir=/tmp
+
+	# remove pam.d plugin .la-file
+	prune_libtool_files --modules
+
+	# 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
+	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() {
+	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 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
+
+	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."
+}