Version bump.

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

5 files changed, 735 insertions, 7 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 385764611585..09a0b282e2bd 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2012/09/21 20:47:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.50 2012/09/22 16:15:33 mgorny Exp $
+
+*systemd-191 (22 Sep 2012)
+*systemd-190 (22 Sep 2012)
+
+  22 Sep 2012; Michał Górny <mgorny@gentoo.org>
+  +files/0001-Disable-udev-targets-for-udev-190.patch, +systemd-190.ebuild,
+  +systemd-191.ebuild:
+  Version bump.
 
   21 Sep 2012; Michał Górny <mgorny@gentoo.org>
   -files/0001-Disable-udev-targets-for-udev-188.patch,
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 50915813eb1e..f965e6ac8841 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 0001-Disable-udev-targets-for-udev-189.patch 9041 SHA256 cbee32960346f8256442f1c929c53b902faa0f05a6ef89809b85051797c05001 SHA512 9a3eb390cda20e69d1c271c657f795ea507610f92c2a679f43fa2c7477e56fb69de432669eaee74ac7962ad7f33efc6e127195e2d6b31757ed6630f7c90c1c71 WHIRLPOOL 053485bf8c335bb967c385e729b8a62c2cf84bb53ad3c2fb1d6ad7869e2706289ad94af53fe0391bc882b3fab4219e83ace9aa9d7d386ad9b3a6d1d431eb1c9f
+AUX 0001-Disable-udev-targets-for-udev-190.patch 9066 SHA256 b884eb4a803ae22ac1bd8475d3cba2eee2206bc421cf9ecb700acffc98e5f06a SHA512 9bdeb93c6f7f96e0bb74f96c01c3b72bea5e9d89800b53ce8ce6dae3a531e4328495e31d7850d07cf5d0537c2f64a5080683fe83e13055c29e9a2c075a6c593f WHIRLPOOL 5989a42ec109002e9887d6e6af46d60e9091517752bab6480a5afc3db6fbc2a17373fb2d26bee50745dc299710b003a1b6347f6a4c1015586e50539f6f50ec22
 AUX 0002-journald-add-missing-includes.patch 2361 SHA256 16706ac16219c815527f919db60584fbbbb77ee3d648c73cdb464504a08ef3cf SHA512 aa325f971dfe64750706ff817b80594a68c98e50e65b1ccc3eec36e5fd825623661016f0c593217129b3049af5f441cceb1673139cfcfb76933ba92ae69ee6e5 WHIRLPOOL 0a3e5cf1d6e2490dcb7dae529f00af6121b40957df186e993d71e80197e8ceb54810aeb6849abf234f47d0d6e4f32de683b6d5c0bcf33c296dca84e9d1f25cc6
 AUX 0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch 1223 SHA256 a073095c30e9ec788423b6a474770509c62ae6307ea1282a60b2ca8c1e2fd081 SHA512 fcac5e3039f9ef2762f70b07778948a5d709294d209aa8f8208d80628b482824394662d64fd9ded10a57dfed7ab5f57a1f6d953c3ca28dcdc2d3308368f415b4 WHIRLPOOL 9f071ee137a8fb2e7e9313319c244ddd8a0e5bd4cce1e77b956b9007b3fdac43eefbccfe79bdc6dcfd858ce55508cf4d007d861d9da1c84bc3ee309086d0bba6
 AUX 0004-journal-don-t-try-to-compress-without-XZ.patch 887 SHA256 825324966324f1bd7b207676ef9cd28047bfac566a7fcb6173501ea24e8b2b9a SHA512 5892bac4b57f6c76db6f5c5ea97e9c38be175ba3c5c79d893d2ab6169714a3848a310c119da6a345beb7b243367269349b4261de3fcbe72a6a6661bf52858425 WHIRLPOOL 28c204d55b33aabb42a6b455edfd5a7dada30f658c1964a33fac722531640e0ae24580645351be360b173efcc9386fcba31b304c9de8b46a356a8e1fa86ac6a9
@@ -12,15 +13,19 @@ AUX update-etc-systemd-symlinks.sh 451 SHA256 1ed27cf8c2ca5ab862b9d935eec613d1a2
 AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa8ec2aafc22868a SHA512 8a4d72c63794676a01db2792b44fa39ec4ea80db97f2b54904f5b118a776c08721d360f8bb2ed15da12e922dbac3f2a431d6a6f98831bef3520d781d97d665db WHIRLPOOL e83955a1d86400ee16d35d61eaa35fb3050af2b2805a2049c37a602be1bd60233caaa1cadbbd4a3b3e425a44629c9cac921a5c4b2fca9003a45e49b89298ca50
 AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01
 DIST systemd-189.tar.xz 1371872 SHA256 fec0efd82c9f1bdff6cb9d9811c00830ed890dbe915e79c90ae306cdbd8c4529 SHA512 a275dc93ad68a95f6695cd4d5472d15c3a3a0439944ce54b5dc6bd14500755d769e708510877e5681b4906ef2b8eb0d67c3d77a161db717e6e9a43888c3b50af WHIRLPOOL cd3377da687f12e0a07cbf6fe74b362bbd4118905a7b2e3488170b9b0ca88238a0379df9b18e9cd506e6544311ae83cd26f493568d85b457a1a2469e06083713
+DIST systemd-190.tar.xz 1404812 SHA256 2fb2f894b8cd4aa87420517b55d938837111aa47b4a09ea8306f90be1f7277dc SHA512 e2ecca0c47a26a7a38368cea0fc7f835086fb2f73154185c6b5627cf72c75dfcfcbe3ccfb77fed5f2ce3da781be0d32d7b561f1d00a521bc3af42bb9d572159c WHIRLPOOL 710f08f10f8861bde548575604258abd3bae8b08822f99180e21089c61f3dff4e55bd61e9c1b8e2d24dc2955c20735d8b89b574ec9e0f69656b9ad2260653b5d
+DIST systemd-191.tar.xz 1401640 SHA256 2fa0a2b4a1eb855f4e1d7f4f1a1883cd43d68dc3534d130a1095293d1bfa1d64 SHA512 9d0636df307d37f95a77368a7392d40e15a16354c838c9415af700fbd86f0da6474f5750fe2d93018984169107943be2cb87bff4b5f432afba6956ee1bd4a2bd WHIRLPOOL eea13b258cb8762a7c650333974011c6319cf3c1664363fc027c64d67199f83f597729b22a130b0c0058a6b31eafcb363baa2c66f864b3a8dc3a0175de043c26
 EBUILD systemd-189-r3.ebuild 5672 SHA256 31312135e9fc3e13995250e87a2e22aeaf50f06b3fd5d95fac6d50c75cafab11 SHA512 4fca2fe58799c867b441fcd333a302873966ef3f40fc5114b54eab6aa0541038e88327da48f4174a0706a0a94dca341e3d26c2dbb4af09c38d24186dec02f9f7 WHIRLPOOL 1dcfb21fd29b2e0571c077933c036600416fb29ae1e1a833874408335be67173d27f6c9c0e70b7e2d21d44e6911a93b5a5535cee1b0d62ba8716fdf485648a19
-MISC ChangeLog 9825 SHA256 8e4b27c02468543f9cdeb1700f8b68bb42cd6cfdf82fdaa199d86382b71453cc SHA512 b39a1f01d512501fda3a8401e5624a6d35eb8e8452adab1a02405d397b615ee4b2fbbfd9c1b376f12f0479a570d32d9a1ca76caa5f9a8b84f637e6980629dafb WHIRLPOOL 36c24eec51d32213e74a6a5800a4e38c3806b5e41ca571f887422958f65f1ea648b7a9d8bc2b314cfedbc0dfb46864bc9cc8c448e0a69aa502799b056533f280
+EBUILD systemd-190.ebuild 5588 SHA256 a2f65140eca1889d499f184b99e9418f409b3d53baa3a3af344417bc6765d6a6 SHA512 e1d3c83b8b57140adaf41f1bae07675f7c4cbf11f3dfaf33a142b2d11c04c5d3fe68e6ccee55acf759d928f3159066d4c592557248350cf8b695d5bec312d610 WHIRLPOOL 23250bbb34c249385a16ddccc0b965275b46caf0acd6062bff837aff0d5340b9e6f29e7b309f812dc02f86f1f7d9e8b597ec6be14243f13502ba259555ace0eb
+EBUILD systemd-191.ebuild 5588 SHA256 e1d157621493889488c629615380724b2c3d0791d41db8410478b46d5c752535 SHA512 111a2e5767fde0e97b01a67358b11086d15457525740923c115badd0b6d17342eb4e8e1ef1f9d7d1be6288e47e97be0881ce1ea946330785e74723a55c5e5bb4 WHIRLPOOL f750121efd0743f237c7e9d248bcd15e26951e9e98c7a8feafcfe56acd7dfe0f52754df0ca431da0b5d54524a74e670def8ef40dc763d0d5eb8e19a2a8911cda
+MISC ChangeLog 10046 SHA256 9ab39b10237cb81b6149c8a05cf42bdb9edf0cdcba114faf65ed8d734fd9f393 SHA512 813e48baf700566eecf45860e7cbce89b856ddc47f404345d076b0c41c7f084c7f75ee48d26bb55ab080750d7192a7f4c352f8af3ba3c7cb84e93358ad3608ca WHIRLPOOL 4a18eac9120a9a694c854bcb12c98e4751ca276958a85d70ec10969790a48fda4c313c858033877d5f7740fef523d4c1c1c184834cad6fbce3646fa8332f404b
 MISC metadata.xml 566 SHA256 5b00ceccd213a57c6f1a81dd9fb026aa914aefe444bd9f60480efc2bb46a1ed7 SHA512 ea7579c1c22711253f6411cbf47333d26df384ae2a2fc1b50ad3df39332e2839aae1c3356397e5806830dda264cdb9d26f6cb54d172f840f5e518218766fe268 WHIRLPOOL a910da4dab04376307f327bd6a06e479e145eb5ba836496ec180ca7d536265d261545618103da3afb8ff1e5ef3529294d502cd81562c267355b8501aba8325a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlBc0oUACgkQfXuS5UK5QB0DKwP/Q0EP5W144f3ECfs2W+OaZf8X
-NdpYfpg5PGpWvOsMDfasHpCQLBXQ11OleQNHW118jGDVriNFaZnGR1qmt+uIWkEj
-tYKqS1/K7RSjperNe09sKN/JIqVq575BSsq1ccfhaolx+ZIJuPPewm9/d+7Bwd7y
-zm8V+wVBVfsyx3UOqc4=
-=Q9DZ
+iJwEAQEIAAYFAlBd5DcACgkQfXuS5UK5QB0VcwQAmN48EqkQZazFcvghISZCu9pa
+il1vzKD/cfFftsedGFXYAm8W0C3p38qk1vse4N3f1QLR124FdECCAkNX1Q2RLiuB
+HbuGIaYW94I6dlB+XRtD0DA8byLDHLgaafQ/UQGt5CyGmI94KT0rdmiPOLm8zM9J
+lJYWzKxdy6qVVmizgBQ=
+=yIsS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch
new file mode 100644
index 000000000000..fb70b80c3d4a
--- /dev/null
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-190.patch
@@ -0,0 +1,331 @@
+From 202a70158973fee73432816d2b7612161824cc29 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-190.
+
+---
+ Makefile.am | 190 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 189 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 64dfe81..a378007 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -309,8 +309,6 @@ dist_systemunit_DATA = \
+ 	units/systemd-ask-password-wall.path \
+ 	units/systemd-ask-password-console.path \
+ 	units/syslog.target \
+-	units/systemd-udevd-control.socket \
+-	units/systemd-udevd-kernel.socket \
+ 	units/system-update.target
+ 
+ nodist_systemunit_DATA = \
+@@ -340,9 +338,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 = \
+@@ -1643,12 +1638,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 \
+@@ -1671,9 +1660,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
+@@ -1694,12 +1680,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) \
+@@ -1714,15 +1695,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
+@@ -1734,28 +1706,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/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
+-
+-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 \
+@@ -1783,17 +1734,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
+ 
+-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 \
+@@ -1860,14 +1800,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
+ 
+@@ -1917,8 +1849,6 @@ ata_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	ata_id
+ 
+ # ------------------------------------------------------------------------------
+ cdrom_id_SOURCES = \
+@@ -1928,12 +1858,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
+@@ -1941,9 +1865,6 @@ collect_SOURCES = \
+ collect_LDADD = \
+ 	libudev-private.la
+ 
+-udevlibexec_PROGRAMS += \
+-	collect
+-
+ # ------------------------------------------------------------------------------
+ scsi_id_SOURCES =\
+ 	src/udev/scsi_id/scsi_id.c \
+@@ -1955,9 +1876,6 @@ scsi_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	scsi_id
+-
+ EXTRA_DIST += \
+ 	src/udev/scsi_id/README
+ 
+@@ -1968,12 +1886,6 @@ v4l_id_SOURCES = \
+ v4l_id_LDADD = \
+ 	-ludev
+ 
+-udevlibexec_PROGRAMS += \
+-	v4l_id
+-
+-dist_udevrules_DATA += \
+-	rules/60-persistent-v4l.rules
+-
+ # ------------------------------------------------------------------------------
+ accelerometer_SOURCES = \
+ 	src/udev/accelerometer/accelerometer.c
+@@ -1982,12 +1894,6 @@ accelerometer_LDADD = \
+ 	-ludev -lm \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	accelerometer
+-
+-dist_udevrules_DATA += \
+-	rules/61-accelerometer.rules
+-
+ # ------------------------------------------------------------------------------
+ if ENABLE_GUDEV
+ if ENABLE_GTK_DOC
+@@ -2168,99 +2074,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/module-sony-vpc \
+-	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/' > $@
+@@ -2288,12 +2106,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
+-- 
+1.7.12
+
diff --git a/sys-apps/systemd/systemd-190.ebuild b/sys-apps/systemd/systemd-190.ebuild
new file mode 100644
index 000000000000..66a79c64ac80
--- /dev/null
+++ b/sys-apps/systemd/systemd-190.ebuild
@@ -0,0 +1,192 @@
+# 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-190.ebuild,v 1.1 2012/09/22 16:15:33 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 gcrypt lzma pam qrcode selinux tcpd"
+
+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-190
+	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 )
+	lzma? ( app-arch/xz-utils )
+	pam? ( virtual/pam )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+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
+}
+
+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}"/0001-Disable-udev-targets-for-udev-190.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
+		--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
+		# 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 lzma xz)
+		$(use_enable pam)
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+
+		# Disable Python for now.
+		PYTHON=:
+	)
+
+	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.
+	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
+
+	# 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."
+}
diff --git a/sys-apps/systemd/systemd-191.ebuild b/sys-apps/systemd/systemd-191.ebuild
new file mode 100644
index 000000000000..5e2ed03487ff
--- /dev/null
+++ b/sys-apps/systemd/systemd-191.ebuild
@@ -0,0 +1,192 @@
+# 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-191.ebuild,v 1.1 2012/09/22 16:15:33 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 gcrypt lzma pam qrcode selinux tcpd"
+
+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-191
+	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 )
+	lzma? ( app-arch/xz-utils )
+	pam? ( virtual/pam )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+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
+}
+
+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}"/0001-Disable-udev-targets-for-udev-190.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
+		--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
+		# 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 lzma xz)
+		$(use_enable pam)
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+
+		# Disable Python for now.
+		PYTHON=:
+	)
+
+	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.
+	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
+
+	# 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."
+}