Version bump. Use sys-fs/udev again.

Package-Manager: portage-2.2.0_alpha120_p6/cvs/Linux x86_64

8 files changed, 361 insertions, 261 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index d8ea3261558d..a1acf10c57b7 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.37 2012/08/09 20:52:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.38 2012/08/11 00:14:07 mgorny Exp $
+
+*systemd-188 (11 Aug 2012)
+
+  11 Aug 2012; Michał Górny <mgorny@gentoo.org>
+  +files/0001-Disable-udev-targets.patch, +systemd-188.ebuild,
+  -files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch,
+  -files/40-gentoo.rules, -systemd-186.ebuild, -systemd-187.ebuild,
+  metadata.xml:
+  Version bump. Use sys-fs/udev again.
 
   09 Aug 2012; Michał Górny <mgorny@gentoo.org> metadata.xml,
   systemd-44-r2.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d985b486edc5..6e94ec5766b8 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,28 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0001-udev-add-lib-udev-rules.d-to-rules-directories.patch 1170 SHA256 b059159e2f9c45aad2c62657fb07897efac27835d7b9172f39c626383b1e5895 SHA512 9154bf3dd6c1e80508b111bca510bee3592255aa512d2cfe0206c01672ff726a71a71cd07cc70604e3361f447a062eb0bba9928e6ee4f4beffe0a65f83455ea7 WHIRLPOOL a2ed9f7d4619ba8cae5118f924e5ad423f55a2269eaaa3f922e1fa8777c1b81c509cfcd604924a20578c4bf2e46348796563b31f1a719489a3bbb6a5cc281c1e
+AUX 0001-Disable-udev-targets.patch 8267 SHA256 53419139518c593f84655a5d60ad3b6bd7e552ed970afc8ead8897cb93256b9b SHA512 a332a5fd93136e68c9ba16bb03a3626625c2b869e92b4262de8d514ad5179812d763459f9e7d1c7808dbb5f1c82cf695d6d44c587e204a0bdc3281b996915ac5 WHIRLPOOL f3a93ac983c212d9807e59defc8e9c97128259b50ee6a452d012e20a8093c3daac1e658d822fd55556db7a3c2be0d411f5c4ca69c16af9773a0cbb5ead801cb8
 AUX 0001-util-never-follow-symlinks-in-rm_rf_children.patch 1262 SHA256 4bf6f7d0312f07614d2addece6b48f3301bb85de5f27c8b9729e11b1f4d9e36a SHA512 8ef4a893ad75522a334a5670426c6065da2225a392cde2f8e133b534a724300cb622813730202467ec108b5f527da1642f61d98bc8e604a0a9e11c727dabc24a WHIRLPOOL 250217791893ad70a4855aa3234b601af018ec0bedb2f61d41d0e623f2e49e42c765d53c0da8ea2bb33aa54c98d7710c9fa440983325551bf4c1c79e7c93f1dc
 AUX 0002-journal-PAGE_SIZE-is-not-known-on-ppc-and-other-arch.patch 2166 SHA256 935665adb6e6b515fe743463be226b109dabfb46491081ad910eb211fe1922f6 SHA512 74d3c25d170678593215f442a9578b327edb2307caa5299fe70137d80a4a9c4750f4c553a5b04e33f2c5994f57b536bf11bd3b53e12ea907fbb7ad439d94531e WHIRLPOOL b0d8b75325acbbe7a1f27401c85d0dc2fc0b4068b4b9648d9ad73423036024f4abccf0a82775ba98dbf053fc9daa46ca8043c091622e6370fb64f57a78a0c8ec
-AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
 AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed
 AUX update-etc-systemd-symlinks.path 119 SHA256 4dbbe99fdc4b7922ad6fb4c6f39c975a4b139e04b04a65e3c79650b364fdc02a SHA512 efef4b9a9d34c591b454557ebd35089403a8c01781c52819eba3719dfab527ffe611bcdbe264dffe074a10b5b1472e6c8ac90bd4cd8e5f14b74f441e80b6ea69 WHIRLPOOL f51028fb1bce0d96e3d3c19500687b0ff42144a7234c825b3266db3e1fb8649f5f7fdbdf2af8b565d3ca2a6ee68b9a328087f72aea1d64ee80ed0d2af9b3863a
 AUX update-etc-systemd-symlinks.service 165 SHA256 77f199392367cefc6d70110b955fb5f2ebafaf21ea8ca355b1863a44f130bf69 SHA512 f47ea87e25fbdd201db9b8f4ba4a5b6507c96fded1547d7f090544a00615d75d780fa9724d507c98c24e2b8653ca657af3332ea2cb0f236bfbda1f203cdcb8b5 WHIRLPOOL 4b0c706fe6b3caa512389686378cde9919e4270c8b5db5c49c4f4d45b52c0da89088058989396976aa6bcd22386c0b63d38effae927fc6f57273470587fc2c8b
 AUX update-etc-systemd-symlinks.sh 451 SHA256 1ed27cf8c2ca5ab862b9d935eec613d1a21ceb4cc363a4bfdac6430387e350df SHA512 e672ed60bc1e8ad614f7c7b0284284b61c9bbdf38370119ef47acdbbfe283eebe5e3760211c43fcc982f5d26b965542cfa0df3c3b58ac82a322452b1fed496dd WHIRLPOOL 3100dad0a68f0758f80e2eab8a65d6c69d5c04e64f295d37b752645cfa556dca776b34ec760089a61e236b448b5e08c1d7d27d02e519cb94db96cc66a71043d9
-DIST systemd-186.tar.xz 1296836 SHA256 b2c201f501952e52241827f01541de7ee05c1238fc39bfe97065f5a04e46b27e SHA512 1cc1ce7776e28b7b8eb1108d911c22f147ee4b8352728e5d0689bb209a43cff138fdc76d7368fe71a959182571e4d4576c1a263b28405170dd275c29b1592d54 WHIRLPOOL b476afcfe802d4857d8d214bb9c619384ff85aef6bf03dcc78f0bd521805a3b50bf82e4580862046b10dd63b7c5e77ff4e6bd802f5dc4850c09f92b111785128
-DIST systemd-187.tar.xz 1342508 SHA256 1a3b338f00cc1ec8b1dcdafe6ce7928f016f70403190db72960df38731fbeed4 SHA512 984647e8ddcaea6c02526e75467c42bfd78acf9318fbe8ae5052711a4a449cf688534159d132864eaac71c0860951a694d9eae69f227acf5d6104037c221b4a7 WHIRLPOOL 4a4a7fdd504bd506b5b837dd86b096701f1c4d4a19862a681d1c6d6eaef32ebc4e3d865d5411bce74629d874366c35ea827854671cad2e01715f99a9eeb3cb03
+DIST systemd-188.tar.xz 1348144 SHA256 e839ed6061db57933b956f5d6952d9ad9b5ec1608363269d627cfd58c363215b SHA512 1dc7b7ec23ae0d841ddfa992ccc38cc0cf417cf48c90c84b67df5832fb77a1650f7010bcc8728a7b7f897855a879acf3c23834abfc8eff51de0712180ca3c9aa WHIRLPOOL 29e44f2b42cd9b1b0e44e25a1ee0fc97feda699572dadaa21fa2140ad823013b86b32e16a8ac6b5077058a7f769a75431211439fa4874291396e9de827dfb054
 DIST systemd-44.tar.xz 885636 SHA256 7a5aac4b4b8b3a82bf59292f10e43d8f2c2d7039f34e95714f81d8edcb42233c SHA512 e1b9b69ce5381da04cd25154de45945cfbdbac061ff663c30a9d5ba063facfb6e42b876b7c12d72c217e71de812e95c7135683b2389dad292827a9711f746c5e WHIRLPOOL 684c00d1d63522264e999cb8eda7a4d28c76e4b7af77fe1da46a8706a95904d2abe20399ccec5443dca2c6a5f5e6ecc80620fd89431111244b66cb1a6cb3724e
-EBUILD systemd-186.ebuild 5116 SHA256 1e50c8b5eb833b091d54530adc73c5ba1e270a6107d4d3c8271973162c76ae23 SHA512 4d809db40ac7c976a6cf6c231c05e396427a220d6ee0fdb520d44e3adea4378de3d07782ef578a402089233dc2710ce0910ff8e11110a94404af1291ba93f0ba WHIRLPOOL 616ff9aec9927026aeaea5520d062bca755b3e3974885957b17f0db12baa8ffd5b86ced4793e3a9916a957125adad61486fd54566f7da357ccb55ffd3b735c26
-EBUILD systemd-187.ebuild 5434 SHA256 3dea7af7e4f04f360fabe52e553d4b5fde73b5b4176e778f924e70f10762637f SHA512 1e51afeb93af81e18c6a2d9284dd14a129b4d0908cb81591aceb420872dfa787abc6eac5d7b76b5d799c9cd23f92f7f1217bf7a3ba2ef7cb766c021ed10ba4be WHIRLPOOL 0368f4cad50ab0881bbbb2f2da5ca3207e714500139e6c2426beb0d4b8d93293331264fa1e8f94526397960c0a0586b169592d5b594999aaef01d4097a6a6222
+EBUILD systemd-188.ebuild 5195 SHA256 d40d4f3bb221414263abcfb57aa35190e0e3296e336df597d9296b74de94791a SHA512 8502ee1a40f6c50363dd7edddaaaa1ace5d9c10f90a05877d089e02f1bccb416297585a0348eca3a12b224b849a29f42ca9ce675f7bd5d3e3eaedbb99647f23c WHIRLPOOL 2c9c67f4a847ab150858899546106768006697c1cf8a86d1f40f312ff3f6980bb5f14b906e0bc04298799aac469793a81d344a1c0747cac17f353b36cd207c03
 EBUILD systemd-44-r2.ebuild 5802 SHA256 6fc03a866b72d522355b6e8231fb8c500e897a382868fd130d5247dcd5681115 SHA512 e7dcf76c7c55e6a7cce2944ed8615830b597b9f82a06d8ef54264dc09b3366d5abd7fdd21db769d3cb9ae183e266dc5a2fe5eeb6893a797ea92f8454f30775a9 WHIRLPOOL 56348c43ed186754d67acd50dd67cd9860a3724f560dd40ea4ea00eb046010a090f6cf7ea51fefd4476587d2b36a3217adcfb83906b9915be6ba8ce1ca0a40bb
-MISC ChangeLog 7171 SHA256 74bef9f59bc2869c5616b4082aefac12f498c4ce4fb4660af1f6be06c08b1992 SHA512 5087b3dff6b95892cc89d72b17ff289bafdd20da2e8ac6dcc5fc8ee2ff960fd0a6ffc11471385f78502434958f2aa5e67fc849d2785563ae9096fd7d7be22446 WHIRLPOOL f37fed2dc20965362176a85687b9e844c4da1a1b20b8bd8547cdce971966c928444ddf0d01f38fd32beeb22242a4d124b8c7231e1825f571993f1fb05bf1aa69
-MISC metadata.xml 636 SHA256 359fd2dcc1f63c70bd4191fd413b7cbdb5c43e226b737ce4b1831b941eb51d4a SHA512 d683e7b764c98ba2fdc0836965bd09b7fb6a392e2e19d07b90e2c8a27f692687a05e3ba72878bdf68ba1483be903cf824544139caf9b72d3c528d602c92faf99 WHIRLPOOL 66f6fdce4d94b07481c1dd31700783f788fb1d2eb8217063eb133b06815015fc654ffb71c6a1ec1b33f058708b3d2760dfaef3b39884b90c714360dba4103a4a
+MISC ChangeLog 7504 SHA256 95ef109c74f5a6f6b672eeda9efe987337ae824d8681f1118f53495a9d881ca6 SHA512 5735bd20b918c30333c76b43ebcdb5141dee3cd97896909e776a5ef4b70bc34467547f5f5f11ce3697313d2f1957ff06cf36ac57875db752954d8f82c5559f0b WHIRLPOOL 1933ba0c8dfb3ceef08a2399ef91d2e5bf4004bc01d4f5ffdd565acacad795762221d0b36ea80dbe18f336b1bb73df1d76ef2d1960b8f108bd4ad7091e185f63
+MISC metadata.xml 715 SHA256 f76cb6cf763712acb350c2d55e73ec25f647bd745635f8d02882c6b33566970b SHA512 823838cbb6a5f3244de9860482c848675c2db51c4c79cd8a35942e396a5b7ab70019a8063acbc88cbacfacecdacf08b30736d50c1f75e0b87f0753d5101d9a15 WHIRLPOOL 99c3c0feeef834d7577129a40e0623b583c3951fc37bcce27513d74c3df2049e15b1d3c0acc7a897bbb305d1232247f7287d4123a535006fbc1ca3d135aeafdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlAkIzwACgkQfXuS5UK5QB3c1AP/cYqMkxBI/l7U+MEIYuIkH7ZC
-Jp2kP06Uw1im3+1YiYDFe8ZehowezH1D6602GrTjnHWnE5Lz0wWfRM8vlbcTZnAS
-xmhkzimB/EFCiGD4hWhVKZrI7hONkp3nkY3tXXi0ua9vgxxrkjo/Gtijt7Qd/XPB
-V1B9rIc5IBcKGnXaMr0=
-=IDiQ
+iJwEAQEIAAYFAlAlpAQACgkQfXuS5UK5QB1ogQP/bxHidGdMrWJRMBZo1jQt6nxh
+edyrPFw5JZxNFrzOiQZVnIlVUU+st0or4ap9wJ8BKnSuUzH/v6RiMKPCTHCyKacp
+vUZZjbaA+yaJg15E6vahZiQyW3moWXN0lVc/GeWVMXv39qIaBkoPT9PXBLMDBgUy
+0Sn8QQENvt/C+TgSotM=
+=LOvM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets.patch b/sys-apps/systemd/files/0001-Disable-udev-targets.patch
new file mode 100644
index 000000000000..931d5fc9b029
--- /dev/null
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets.patch
@@ -0,0 +1,317 @@
+From 4d6860efaaaf14a99d18812c15aa063b43fe2834 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 11 Aug 2012 01:38:23 +0200
+Subject: [PATCH] Disable udev targets.
+
+---
+ Makefile.am | 183 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 182 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 39afb62..2126383 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1588,12 +1588,6 @@ SUBDIRS += \
+ 	docs/libudev
+ endif
+ 
+-include_HEADERS += \
+-	src/libudev/libudev.h
+-
+-lib_LTLIBRARIES += \
+-	-ludev
+-
+ libudev_la_SOURCES =\
+ 	src/libudev/libudev-private.h \
+ 	src/libudev/libudev.c \
+@@ -1616,9 +1610,6 @@ libudev_la_LDFLAGS = \
+ libudev_la_LIBADD = \
+ 	libsystemd-shared.la
+ 
+-pkgconfiglib_DATA += \
+-	src/libudev/libudev.pc
+-
+ EXTRA_DIST += \
+ 	src/libudev/libudev.pc.in \
+ 	src/libudev/libudev.sym
+@@ -1639,12 +1630,7 @@ libudev-install-move-hook:
+ libudev-uninstall-move-hook:
+ 	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
+ 
+-INSTALL_EXEC_HOOKS += libudev-install-move-hook
+-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+-
+ # ------------------------------------------------------------------------------
+-noinst_LTLIBRARIES += \
+-	libudev-private.la
+ 
+ libudev_private_la_SOURCES =\
+ 	$(libudev_la_SOURCES) \
+@@ -1659,15 +1645,6 @@ libudev_private_la_LIBADD = \
+ 	libsystemd-shared.la
+ 
+ # ------------------------------------------------------------------------------
+-MANPAGES += \
+-	man/udev.7 \
+-	man/udevadm.8 \
+-	man/systemd-udevd.service.8
+-
+-MANPAGES_ALIAS += \
+-	man/systemd-udevd.8 \
+-	man/systemd-udevd-control.socket.8 \
+-	man/systemd-udevd-kernel.socket.8
+ 
+ man/systemd-udevd.8: man/systemd-udevd.service.8
+ man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+@@ -1679,27 +1656,7 @@ udev-confdirs:
+ INSTALL_DATA_HOOKS += udev-confdirs
+ 
+ dist_udevrules_DATA += \
+-	rules/99-systemd.rules \
+-	rules/42-usb-hid-pm.rules \
+-	rules/50-udev-default.rules \
+-	rules/60-persistent-storage-tape.rules \
+-	rules/60-persistent-serial.rules \
+-	rules/60-persistent-input.rules \
+-	rules/60-persistent-alsa.rules \
+-	rules/60-persistent-storage.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
+-
+-udevconfdir = $(sysconfdir)/udev
+-dist_udevconf_DATA = \
+-	src/udev/udev.conf
+-
+-sharepkgconfigdir = $(datadir)/pkgconfig
+-sharepkgconfig_DATA = \
+-	src/udev/udev.pc
++	rules/99-systemd.rules
+ 
+ EXTRA_DIST += \
+ 	rules/99-systemd.rules.in \
+@@ -1729,15 +1686,6 @@ systemd-install-hook:
+ 
+ INSTALL_DATA_HOOKS += systemd-install-hook
+ 
+-bin_PROGRAMS += \
+-	udevadm
+-
+-rootlibexec_PROGRAMS += \
+-	systemd-udevd
+-
+-noinst_LTLIBRARIES += \
+-	libudev-core.la
+-
+ libudev_core_la_SOURCES = \
+ 	src/udev/udev.h \
+ 	src/udev/udev-event.c \
+@@ -1803,14 +1751,6 @@ udevadm_LDADD = \
+ 	libsystemd-shared.la
+ 
+ # ------------------------------------------------------------------------------
+-TESTS += \
+-	test/udev-test.pl \
+-	test/rules-test.sh
+-
+-noinst_PROGRAMS += \
+-	test-libudev \
+-	test-udev
+-
+ test_libudev_SOURCES = \
+ 	src/test/test-libudev.c
+ 
+@@ -1860,8 +1800,6 @@ ata_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	ata_id
+ 
+ # ------------------------------------------------------------------------------
+ cdrom_id_SOURCES = \
+@@ -1871,12 +1809,6 @@ cdrom_id_LDADD = \
+ 	-ludev \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	cdrom_id
+-
+-dist_udevrules_DATA += \
+-	rules/60-cdrom_id.rules
+-
+ # ------------------------------------------------------------------------------
+ collect_SOURCES = \
+ 	src/udev/collect/collect.c
+@@ -1884,9 +1816,6 @@ collect_SOURCES = \
+ collect_LDADD = \
+ 	libudev-private.la
+ 
+-udevlibexec_PROGRAMS += \
+-	collect
+-
+ # ------------------------------------------------------------------------------
+ scsi_id_SOURCES =\
+ 	src/udev/scsi_id/scsi_id.c \
+@@ -1898,9 +1827,6 @@ scsi_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	scsi_id
+-
+ EXTRA_DIST += \
+ 	src/udev/scsi_id/README
+ 
+@@ -1911,9 +1837,6 @@ v4l_id_SOURCES = \
+ v4l_id_LDADD = \
+ 	-ludev
+ 
+-udevlibexec_PROGRAMS += \
+-	v4l_id
+-
+ dist_udevrules_DATA += \
+ 	rules/60-persistent-v4l.rules
+ 
+@@ -1925,9 +1848,6 @@ accelerometer_LDADD = \
+ 	-ludev -lm \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	accelerometer
+-
+ dist_udevrules_DATA += \
+ 	rules/61-accelerometer.rules
+ 
+@@ -2111,98 +2031,11 @@ nodist_keymap_SOURCES = \
+ BUILT_SOURCES += \
+ 	$(nodist_keymap_SOURCES)
+ 
+-udevlibexec_PROGRAMS += \
+-	keymap
+-
+-dist_doc_DATA += \
+-	src/udev/keymap/README.keymap.txt
+-
+-dist_udevrules_DATA += \
+-	src/udev/keymap/95-keymap.rules \
+-	src/udev/keymap/95-keyboard-force-release.rules
+-
+-dist_udevhome_SCRIPTS = \
+-	src/udev/keymap/findkeyboards \
+-	src/udev/keymap/keyboard-force-release.sh
+-
+-TESTS += \
+-	src/udev/keymap/check-keymaps.sh
+-
+ CLEANFILES += \
+ 	src/udev/keymap/keys.txt \
+ 	src/udev/keymap/keys-from-name.gperf \
+ 	src/udev/keymap/keyboard-force-release.sh
+ 
+-udevkeymapdir = $(udevlibexecdir)/keymaps
+-dist_udevkeymap_DATA = \
+-	keymaps/acer \
+-	keymaps/acer-aspire_5720 \
+-	keymaps/acer-aspire_8930 \
+-	keymaps/acer-aspire_5920g \
+-	keymaps/acer-aspire_6920 \
+-	keymaps/acer-travelmate_c300 \
+-	keymaps/asus \
+-	keymaps/compaq-e_evo \
+-	keymaps/dell \
+-	keymaps/dell-latitude-xt2 \
+-	keymaps/everex-xt5000 \
+-	keymaps/fujitsu-amilo_li_2732 \
+-	keymaps/fujitsu-amilo_pa_2548 \
+-	keymaps/fujitsu-amilo_pro_edition_v3505 \
+-	keymaps/fujitsu-amilo_pro_v3205 \
+-	keymaps/fujitsu-amilo_si_1520 \
+-	keymaps/fujitsu-esprimo_mobile_v5 \
+-	keymaps/fujitsu-esprimo_mobile_v6 \
+-	keymaps/genius-slimstar-320 \
+-	keymaps/hewlett-packard \
+-	keymaps/hewlett-packard-2510p_2530p \
+-	keymaps/hewlett-packard-compaq_elitebook \
+-	keymaps/hewlett-packard-pavilion \
+-	keymaps/hewlett-packard-presario-2100 \
+-	keymaps/hewlett-packard-tablet \
+-	keymaps/hewlett-packard-tx2 \
+-	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+-	keymaps/inventec-symphony_6.0_7.0 \
+-	keymaps/lenovo-3000 \
+-	keymaps/lenovo-ideapad \
+-	keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+-	keymaps/lenovo-thinkpad_x6_tablet \
+-	keymaps/lenovo-thinkpad_x200_tablet \
+-	keymaps/lg-x110 \
+-	keymaps/logitech-wave \
+-	keymaps/logitech-wave-cordless \
+-	keymaps/logitech-wave-pro-cordless \
+-	keymaps/maxdata-pro_7000 \
+-	keymaps/medion-fid2060 \
+-	keymaps/medionnb-a555 \
+-	keymaps/micro-star \
+-	keymaps/module-asus-w3j \
+-	keymaps/module-ibm \
+-	keymaps/module-lenovo \
+-	keymaps/module-sony \
+-	keymaps/module-sony-old \
+-	keymaps/module-sony-vgn \
+-	keymaps/olpc-xo \
+-	keymaps/onkyo \
+-	keymaps/oqo-model2 \
+-	keymaps/samsung-other \
+-	keymaps/samsung-90x3a \
+-	keymaps/samsung-sq1us \
+-	keymaps/samsung-sx20s \
+-	keymaps/toshiba-satellite_a100 \
+-	keymaps/toshiba-satellite_a110 \
+-	keymaps/toshiba-satellite_m30x \
+-	keymaps/zepto-znote
+-
+-udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
+-dist_udevkeymapforcerel_DATA = \
+-	keymaps-force-release/dell-touchpad \
+-	keymaps-force-release/dell-xps \
+-	keymaps-force-release/hp-other \
+-	keymaps-force-release/samsung-other \
+-	keymaps-force-release/samsung-90x3a \
+-	keymaps-force-release/common-volume-keys
+-
+ 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/' > $@
+@@ -2230,12 +2063,6 @@ mtd_probe_SOURCES =  \
+ mtd_probe_CPPFLAGS = \
+ 	$(AM_CPPFLAGS)
+ 
+-dist_udevrules_DATA += \
+-	rules/75-probe_mtd.rules
+-
+-udevlibexec_PROGRAMS += \
+-	mtd_probe
+-
+ # ------------------------------------------------------------------------------
+ libsystemd_id128_la_SOURCES = \
+ 	src/libsystemd-id128/sd-id128.c
+@@ -3244,14 +3071,6 @@ systemd_multi_seat_x_LDADD = \
+ rootlibexec_PROGRAMS += \
+ 	systemd-multi-seat-x
+ 
+-dist_udevrules_DATA += \
+-	src/login/70-uaccess.rules \
+-	src/login/70-power-switch.rules
+-
+-nodist_udevrules_DATA += \
+-	src/login/71-seat.rules \
+-	src/login/73-seat-late.rules
+-
+ MANPAGES += \
+ 	man/systemd-logind.service.8 \
+ 	man/logind.conf.5 \
+-- 
+1.7.11.1
+
diff --git a/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch b/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
deleted file mode 100644
index 318df1b252c7..000000000000
--- a/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d395d7616d089eae34c5b2a81e5cefa13c32acb1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 13 Jul 2012 16:15:14 +0200
-Subject: [PATCH] udev: add /lib/udev/rules.d to rules directories
-
-This adds /lib if split-usr is enabled
-to the directories where udev searches for rules.d.
-
-This is needed if split-usr is enabled because some software still
-installs rules in /lib/udev/rules.d.
----
- src/udev/udev-rules.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index d3b33e4..f30fa5a 100644
---- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -1760,6 +1760,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
-         rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d",
-                                "/run/udev/rules.d",
-                                UDEVLIBEXECDIR "/rules.d",
-+#ifdef HAVE_SPLIT_USR
-+                               "/lib/udev/rules.d",
-+#endif
-                                NULL);
-         if (!rules->dirs) {
-                 log_error("failed to build config directory array");
--- 
-1.7.8.6
-
diff --git a/sys-apps/systemd/files/40-gentoo.rules b/sys-apps/systemd/files/40-gentoo.rules
deleted file mode 100644
index fa99ba9fe5e6..000000000000
--- a/sys-apps/systemd/files/40-gentoo.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# setting permissions
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-
-# dialout devices
-KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
-
-# sound devices (oss)
-SUBSYSTEM=="snd",	GROUP="audio"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi",	MODE="0666"
-
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 9ea8633cab43..4a129bbe5887 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -13,5 +13,6 @@
 		<flag name='gudev'>Enable libudev gobject interface</flag>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
+		<flag name='plymouth'>Enable support for <pkg>sys-boot/plymouth</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/systemd/systemd-187.ebuild b/sys-apps/systemd/systemd-187.ebuild
deleted file mode 100644
index b8a70a674bd0..000000000000
--- a/sys-apps/systemd/systemd-187.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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-187.ebuild,v 1.1 2012/08/06 16:30:11 mgorny Exp $
-
-EAPI=4
-
-inherit autotools-utils bash-completion-r1 linux-info pam 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 doc gudev introspection lzma pam selinux tcpd"
-
-# We need to depend on sysvinit for sulogin which is used in the rescue
-# mode. Bug #399615.
-
-MINKV="2.6.39"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.4.10
-	>=sys-apps/kmod-5
-	>=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 )
-	gudev? ( dev-libs/glib:2 )
-	introspection? ( dev-libs/gobject-introspection )
-	lzma? ( app-arch/xz-utils )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-# sysvinit for sulogin
-# udev is bundled
-# udev-init-scripts not to break systems running openrc
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/hwids
-	sys-apps/sysvinit
-	>=sys-fs/udev-init-scripts-14
-	!sys-fs/udev
-	!<sys-libs/glibc-2.10"
-DEPEND="${COMMON_RDEPEND}
-	app-arch/xz-utils
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	dev-util/intltool
-	>=sys-kernel/linux-headers-${MINKV}
-	doc? ( dev-util/gtk-doc )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# systemd-analyze is for python2.7 only nowadays.
-	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
-
-	# change rules back to group uucp instead of dialout for now
-	sed -e '/GROUP=/s:dialout:uucp:' \
-		-i rules/*.rules || die
-
-	local PATCHES=(
-		"${FILESDIR}"/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch
-	)
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--with-distro=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
-		# this avoids dep on pciutils & usbutils
-		--with-pci-ids-path=/usr/share/misc/pci.ids
-		--with-usb-ids-path=/usr/share/misc/usb.ids
-		# firmware search path
-		--with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		$(use_enable acl)
-		$(use_enable audit)
-		$(use_enable cryptsetup libcryptsetup)
-		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable introspection)
-		$(use_enable lzma xz)
-		$(use_enable pam)
-		$(use_enable selinux)
-		$(use_enable tcpd tcpwrap)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install \
-		bashcompletiondir=/tmp
-
-	# 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
-
-	# Create /run/lock as required by new baselay/OpenRC compat.
-	insinto /usr/lib/tmpfiles.d
-	doins "${FILESDIR}"/gentoo-run.conf
-
-	# Gentoo rules for udev.
-	insinto /usr/lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-}
-
-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."
-}
diff --git a/sys-apps/systemd/systemd-186.ebuild b/sys-apps/systemd/systemd-188.ebuild
index fc0ebea19f0b..5a50872ce0f4 100644
--- a/sys-apps/systemd/systemd-186.ebuild
+++ b/sys-apps/systemd/systemd-188.ebuild
@@ -1,6 +1,6 @@
 # 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-186.ebuild,v 1.1 2012/07/09 21:27:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-188.ebuild,v 1.1 2012/08/11 00:14:07 mgorny Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ 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 doc gudev introspection lzma pam selinux tcpd"
+IUSE="acl audit cryptsetup lzma pam selinux tcpd"
 
 # We need to depend on sysvinit for sulogin which is used in the rescue
 # mode. Bug #399615.
@@ -23,32 +23,29 @@ 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-187-r3
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
-	cryptsetup? ( sys-fs/cryptsetup )
-	gudev? ( dev-libs/glib:2 )
-	introspection? ( dev-libs/gobject-introspection )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
 # sysvinit for sulogin
-# udev is bundled
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/hwids
 	sys-apps/sysvinit
-	!sys-fs/udev
-	!<sys-libs/glibc-2.10"
+	!<sys-libs/glibc-2.10
+	!<sys-fs/udev-187-r3"
 DEPEND="${COMMON_RDEPEND}
 	app-arch/xz-utils
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	dev-util/gperf
 	dev-util/intltool
-	>=sys-kernel/linux-headers-${MINKV}
-	doc? ( dev-util/gtk-doc )"
+	>=sys-kernel/linux-headers-${MINKV}"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
@@ -61,15 +58,22 @@ src_prepare() {
 	# systemd-analyze is for python2.7 only nowadays.
 	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
 
-	# change rules back to group uucp instead of dialout for now
-	sed -e '/GROUP=/s:dialout:uucp:' \
-		-i rules/*.rules || die
+	# link against external udev.
+	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
+
+	local PATCHES=(
+		"${FILESDIR}"/0001-Disable-udev-targets.patch
+	)
 
 	autotools-utils_src_prepare
+
+	# XXX: support it within eclass
+	eautomake
 }
 
 src_configure() {
 	local myeconfargs=(
+		--localstatedir=/var
 		--with-distro=gentoo
 		# install everything to /usr
 		--with-rootprefix=/usr
@@ -79,15 +83,15 @@ src_configure() {
 		# this avoids dep on pciutils & usbutils
 		--with-pci-ids-path=/usr/share/misc/pci.ids
 		--with-usb-ids-path=/usr/share/misc/usb.ids
-		--localstatedir=/var
 		# make sure we get /bin:/sbin in $PATH
 		--enable-split-usr
+		# udev parts
+		--disable-introspection
+		--disable-gudev
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
 		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable introspection)
 		$(use_enable lzma xz)
 		$(use_enable pam)
 		$(use_enable selinux)
@@ -120,9 +124,9 @@ src_install() {
 	insinto /usr/lib/tmpfiles.d
 	doins "${FILESDIR}"/gentoo-run.conf
 
-	# Gentoo rules for udev.
-	insinto /usr/lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
+	# 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() {