Drop old patches.

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

10 files changed, 12 insertions, 1113 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 7c7bb03405f8..48caf1b98bbc 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.154 2013/07/31 22:23:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.155 2013/07/31 22:44:12 mgorny Exp $
+
+  31 Jul 2013; Michał Górny <mgorny@gentoo.org>
+  -files/191-0001-Disable-udev-targets-for-udev-190.patch,
+  -files/196-0001-Disable-udev-targets.patch,
+  -files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch,
+  -files/197-0001-Disable-udev-targets.patch,
+  -files/198-0001-Disable-udev-targets.patch,
+  -files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch,
+  -files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch,
+  -files/199-firmware.patch, -files/203-systemd-sleep.patch:
+  Drop old patches.
 
 *systemd-206-r1 (31 Jul 2013)
 
diff --git a/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch b/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch
deleted file mode 100644
index fb70b80c3d4a..000000000000
--- a/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-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/files/196-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch
deleted file mode 100644
index 814c8f41610d..000000000000
--- a/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-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.
-
----
- Makefile.am | 203 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 202 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 29d6323..2df0ec2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -316,8 +316,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 = \
-@@ -347,9 +345,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
- 
- if HAVE_KMOD
-@@ -1756,12 +1751,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 \
-@@ -1786,9 +1775,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
-@@ -1809,12 +1795,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) \
-@@ -1829,15 +1810,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
-@@ -1850,40 +1822,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/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
--
--sharepkgconfigdir = $(datadir)/pkgconfig
--sharepkgconfig_DATA = \
--	src/udev/udev.pc
-+	rules/99-systemd.rules
- 
- EXTRA_DIST += \
- 	rules/99-systemd.rules.in \
-@@ -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
- 
--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 \
-@@ -2008,14 +1936,6 @@ hwdb-remove-hook:
- 	-test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
- 
- # ------------------------------------------------------------------------------
--TESTS += \
--	test/udev-test.pl \
--	test/rules-test.sh
--
--noinst_PROGRAMS += \
--	test-libudev \
--	test-udev
--
- test_libudev_SOURCES = \
- 	src/test/test-libudev.c
- 
-@@ -2065,8 +1985,6 @@ ata_id_LDADD = \
- 	libudev-private.la \
- 	libsystemd-shared.la
- 
--udevlibexec_PROGRAMS += \
--	ata_id
- 
- # ------------------------------------------------------------------------------
- cdrom_id_SOURCES = \
-@@ -2076,12 +1994,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
-@@ -2089,9 +2001,6 @@ collect_SOURCES = \
- collect_LDADD = \
- 	libudev-private.la
- 
--udevlibexec_PROGRAMS += \
--	collect
--
- # ------------------------------------------------------------------------------
- scsi_id_SOURCES =\
- 	src/udev/scsi_id/scsi_id.c \
-@@ -2103,9 +2012,6 @@ scsi_id_LDADD = \
- 	libudev-private.la \
- 	libsystemd-shared.la
- 
--udevlibexec_PROGRAMS += \
--	scsi_id
--
- EXTRA_DIST += \
- 	src/udev/scsi_id/README
- 
-@@ -2116,12 +2022,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
-@@ -2130,12 +2030,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
-@@ -2316,100 +2210,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/hewlett-packard_elitebook-8440p \
--	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/' > $@
-@@ -2437,12 +2242,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.8.0
-
diff --git a/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch b/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch
deleted file mode 100644
index 694d3ef01138..000000000000
--- a/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 94949efc89245ad8234d704ebb453e2f77605fd3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 4 Dec 2012 17:35:55 +0100
-Subject: [PATCH 2/2] Don't fail with missing gcrypt macros.
-
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index d0003bb..e804fdc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -412,12 +412,14 @@ AC_ARG_ENABLE([gcrypt],
-                 [have_gcrypt=auto])
- 
- if test "x${have_gcrypt}" != xno ; then
-+m4_ifdef([AM_PATH_LIBGCRYPT], [
-         AM_PATH_LIBGCRYPT(
-                 [1.4.5],
-                 [have_gcrypt=yes],
-                 [if test "x$have_gcrypt" = xyes ; then
-                         AC_MSG_ERROR([*** GCRYPT headers not found.])
-                 fi])
-+])
- 
-         if test "x$have_gcrypt" = xyes ; then
-                 GCRYPT_LIBS="$LIBGCRYPT_LIBS"
--- 
-1.8.0
-
diff --git a/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch
deleted file mode 100644
index fca24ccce568..000000000000
--- a/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 39640ff78085e151b9f9fe03bde76efb47facdd0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 18 Jan 2013 17:35:54 +0100
-Subject: [PATCH] Disable udev & libsystemd-daemon for systemd ebuild.
-
----
- Makefile.am | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fb7d8fe..09cf7c2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -293,8 +293,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 = \
-@@ -324,9 +322,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
- 
- if HAVE_KMOD
-@@ -1658,6 +1653,13 @@ systemd_tty_ask_password_agent_LDADD = \
- 	libsystemd-label.la \
- 	libsystemd-shared.la
- 
-+dist_udevrules_DATA += \
-+	rules/99-systemd.rules
-+
-+# disable udev & systemd-daemon which are installed by sys-fs/udev
-+# ENABLE_GUDEV is something that won't be set in systemd ebuild
-+if ENABLE_GUDEV
-+
- # ------------------------------------------------------------------------------
- libsystemd_daemon_la_SOURCES = \
- 	src/libsystemd-daemon/sd-daemon.c
-@@ -2417,6 +2419,9 @@ dist_udevrules_DATA += \
- udevlibexec_PROGRAMS += \
- 	mtd_probe
- 
-+endif
-+# (udev disable)
-+
- # ------------------------------------------------------------------------------
- libsystemd_id128_la_SOURCES = \
- 	src/libsystemd-id128/sd-id128.c
--- 
-1.8.1.1
-
diff --git a/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch
deleted file mode 100644
index 2f8f08aca5f1..000000000000
--- a/sys-apps/systemd/files/198-0001-Disable-udev-targets.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 3d8c9ce43939b5b10bb29d459c6ea6cb35455765 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 8 Feb 2013 18:16:52 +0100
-Subject: [PATCH] Disable udev targets.
-
----
- Makefile-man.am |  6 +-----
- Makefile.am     | 32 +++++++++++++++++++++-----------
- 2 files changed, 22 insertions(+), 16 deletions(-)
-
-diff --git a/Makefile-man.am b/Makefile-man.am
-index 8d48ee0..8dc145b 100644
---- a/Makefile-man.am
-+++ b/Makefile-man.am
-@@ -70,7 +70,6 @@ MANPAGES += \
- 	man/systemd-system.conf.5 \
- 	man/systemd-tmpfiles.8 \
- 	man/systemd-tty-ask-password-agent.1 \
--	man/systemd-udevd.service.8 \
- 	man/systemd-update-utmp-runlevel.service.8 \
- 	man/systemd.1 \
- 	man/systemd.automount.5 \
-@@ -91,9 +90,7 @@ MANPAGES += \
- 	man/systemd.timer.5 \
- 	man/systemd.unit.5 \
- 	man/telinit.8 \
--	man/tmpfiles.d.5 \
--	man/udev.7 \
--	man/udevadm.8
-+	man/tmpfiles.d.5
- MANPAGES_ALIAS += \
- 	man/SD_ALERT.3 \
- 	man/SD_CRIT.3 \
-@@ -185,7 +182,6 @@ MANPAGES_ALIAS += \
- 	man/systemd-tmpfiles-setup.service.8 \
- 	man/systemd-udevd-control.socket.8 \
- 	man/systemd-udevd-kernel.socket.8 \
--	man/systemd-udevd.8 \
- 	man/systemd-update-utmp-shutdown.service.8 \
- 	man/systemd-update-utmp.8 \
- 	man/systemd-user.conf.5
-diff --git a/Makefile.am b/Makefile.am
-index 0243fa7..0f2ea1c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -317,8 +317,7 @@ systemd_analyze_LDADD = \
- 
- dist_bashcompletion_DATA = \
- 	shell-completion/bash/journalctl \
--	shell-completion/bash/systemctl \
--	shell-completion/bash/udevadm
-+	shell-completion/bash/systemctl
- 
- dist_tmpfiles_DATA = \
- 	tmpfiles.d/systemd.conf \
-@@ -379,8 +378,6 @@ dist_systemunit_DATA = \
- 	units/quotaon.service \
- 	units/systemd-ask-password-wall.path \
- 	units/systemd-ask-password-console.path \
--	units/systemd-udevd-control.socket \
--	units/systemd-udevd-kernel.socket \
- 	units/system-update.target \
- 	units/initrd-parse-etc.service \
- 	units/initrd-cleanup.service \
-@@ -415,9 +412,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 = \
-@@ -1321,9 +1315,6 @@ nodist_systemunit_DATA += \
- SYSINIT_TARGET_WANTS += \
- 	systemd-modules-load.service
- 
--dist_udevrules_DATA += \
--	rules/80-drivers.rules
--
- endif
- 
- EXTRA_DIST += \
-@@ -1606,6 +1597,22 @@ EXTRA_DIST += \
- 	src/libsystemd-daemon/libsystemd-daemon.pc.in \
- 	src/libsystemd-daemon/libsystemd-daemon.sym
- 
-+# needed parts of udev
-+
-+dist_udevrules_DATA += \
-+	rules/99-systemd.rules
-+
-+SOCKETS_TARGET_WANTS += \
-+	systemd-udevd-control.socket \
-+	systemd-udevd-kernel.socket
-+SYSINIT_TARGET_WANTS += \
-+	systemd-udevd.service \
-+	systemd-udev-trigger.service
-+
-+# we won't set this in systemd ebuild, so it is an easy way
-+# of stripping the whole udev.
-+if ENABLE_GUDEV
-+
- # ------------------------------------------------------------------------------
- if ENABLE_GTK_DOC
- SUBDIRS += \
-@@ -1616,7 +1623,7 @@ include_HEADERS += \
- 	src/libudev/libudev.h
- 
- lib_LTLIBRARIES += \
--	-ludev
-+	libudev.la
- 
- libudev_la_SOURCES =\
- 	src/libudev/libudev-private.h \
-@@ -2268,6 +2275,9 @@ udevlibexec_PROGRAMS += \
- 	mtd_probe
- 
- # ------------------------------------------------------------------------------
-+
-+endif
-+
- libsystemd_id128_la_SOURCES = \
- 	src/libsystemd-id128/sd-id128.c
- 
--- 
-1.8.1.5
-
diff --git a/sys-apps/systemd/files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch b/sys-apps/systemd/files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch
deleted file mode 100644
index e4ed61199ff0..000000000000
--- a/sys-apps/systemd/files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ee465038ce86bd3a0f21d5e2723393ff9d78855d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 12 Mar 2013 23:05:20 -0400
-Subject: [PATCH] build-sys: break dependency loop between libsystemd-id128.la
- and -shared.la
-
-The loop was added in d848b9cbfa0ba72 'Move generic specifier functions to shared'.
----
- Makefile.am | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c8f7b8e..96262ec 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -652,8 +652,6 @@ libsystemd_shared_la_SOURCES = \
- 	src/shared/watchdog.h \
- 	src/shared/spawn-ask-password-agent.c \
- 	src/shared/spawn-ask-password-agent.h \
--	src/shared/specifier.c \
--	src/shared/specifier.h \
- 	src/shared/replace-var.c \
- 	src/shared/replace-var.h \
- 	src/shared/spawn-polkit-agent.c \
-@@ -697,7 +695,9 @@ libsystemd_units_la_SOURCES = \
- 	src/shared/install-printf.c \
- 	src/shared/install-printf.h \
- 	src/shared/path-lookup.c \
--	src/shared/path-lookup.h
-+	src/shared/path-lookup.h \
-+	src/shared/specifier.c \
-+	src/shared/specifier.h
- 
- libsystemd_units_la_CFLAGS = \
- 	$(AM_CFLAGS) \
-@@ -1235,6 +1235,7 @@ test_strv_SOURCES = \
- 
- test_strv_LDADD = \
- 	libsystemd-shared.la \
-+	libsystemd-units.la \
- 	libsystemd-id128-internal.la
- 
- test_strxcpyx_SOURCES = \
--- 
-1.8.1.5
-
diff --git a/sys-apps/systemd/files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch b/sys-apps/systemd/files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch
deleted file mode 100644
index 6c24f463a75c..000000000000
--- a/sys-apps/systemd/files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d29dd033022b41794c7475a5ec4d9d683d18417e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 13 Mar 2013 21:59:11 -0400
-Subject: [PATCH] build-sys: link libsystemd-login also against
- libsystemd-daemon-internal
-
-https://bugs.freedesktop.org/show_bug.cgi?id=62085
-
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/../../../../lib64/libsystemd-login.so:
-undefined reference to `sd_listen_fds'
-
-In ee465038ce8 'build-sys: break dependency loop between
-libsystemd-id128.la and -shared.la', a partial fix was applied, and
-the use of functions from libsystemd-id128 was removed from
-libsystemd-shared. Nevertheless, fdset.c was still using sd_listen_fds,
-so libsystemd-login should be linked against libysystemd-daemon
-or libsystemd-daemon-internal.
-
-Tested-by: Elias Probst <mail@eliasprobst.eu>
----
- Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index a12e57e..175d14b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3356,7 +3356,8 @@ libsystemd_login_la_LDFLAGS = \
- 	-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
- 
- libsystemd_login_la_LIBADD = \
--	libsystemd-shared.la
-+	libsystemd-shared.la \
-+	libsystemd-daemon-internal.la
- 
- libsystemd_login_internal_la_SOURCES = \
- 	$(libsystemd_login_la_SOURCES)
--- 
-1.8.1.5
-
diff --git a/sys-apps/systemd/files/199-firmware.patch b/sys-apps/systemd/files/199-firmware.patch
deleted file mode 100644
index b62af973c481..000000000000
--- a/sys-apps/systemd/files/199-firmware.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-This is same as upstream commit:
-
-http://cgit.freedesktop.org/systemd/systemd/commit/?id=d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff
-
-Except we patch configure and config.h.in to avoid autotools.
-
---- src/udev/udev-builtin.c
-+++ src/udev/udev-builtin.c
-@@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = {
-         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
- #endif
-         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
- #endif
-         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
---- src/udev/udev.h
-+++ src/udev/udev.h
-@@ -140,7 +140,7 @@ enum udev_builtin_cmd {
-         UDEV_BUILTIN_BLKID,
- #endif
-         UDEV_BUILTIN_BTRFS,
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         UDEV_BUILTIN_FIRMWARE,
- #endif
-         UDEV_BUILTIN_HWDB,
-@@ -169,7 +169,7 @@ struct udev_builtin {
- extern const struct udev_builtin udev_builtin_blkid;
- #endif
- extern const struct udev_builtin udev_builtin_btrfs;
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
- extern const struct udev_builtin udev_builtin_firmware;
- #endif
- extern const struct udev_builtin udev_builtin_hwdb;
---- src/udev/udevd.c
-+++ src/udev/udevd.c
-@@ -98,7 +98,7 @@ struct event {
-         dev_t devnum;
-         int ifindex;
-         bool is_block;
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         bool nodelay;
- #endif
- };
-@@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev)
-         event->devnum = udev_device_get_devnum(dev);
-         event->is_block = streq("block", udev_device_get_subsystem(dev));
-         event->ifindex = udev_device_get_ifindex(dev);
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         if (streq(udev_device_get_subsystem(dev), "firmware"))
-                 event->nodelay = true;
- #endif
-@@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event)
-                         return true;
-                 }
- 
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-                 /* allow to bypass the dependency tracking */
-                 if (event->nodelay)
-                         continue;
---- configure
-+++ configure
-@@ -18066,6 +18099,11 @@
- done
- IFS=$OLD_IFS
- 
-+if test "x${FIRMWARE_PATH}" != "x"; then :
-+
-+$as_echo "#define HAVE_FIRMWARE 1" >>confdefs.h
-+
-+fi
-  if test "x${FIRMWARE_PATH}" != "x"; then
-   ENABLE_FIRMWARE_TRUE=
-   ENABLE_FIRMWARE_FALSE='#'
---- config.h.in
-+++ config.h.in
-@@ -57,6 +57,9 @@
- /* Define to 1 if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
- 
-+/* Define if FIRMWARE is available */
-+#undef HAVE_FIRMWARE
-+
- /* GCRYPT available */
- #undef HAVE_GCRYPT
- 
diff --git a/sys-apps/systemd/files/203-systemd-sleep.patch b/sys-apps/systemd/files/203-systemd-sleep.patch
deleted file mode 100644
index 5c7c2b24988c..000000000000
--- a/sys-apps/systemd/files/203-systemd-sleep.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=468998
-
-commit 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829
-Author: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-Date:   Tue May 7 11:35:23 2013 -0400
-
-    systemd-sleep: it is not an error if the config file is missing
-
-diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index 73a3acb..cd3238b 100644
---- a/src/shared/sleep-config.c
-+++ b/src/shared/sleep-config.c
-@@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
-         FILE _cleanup_fclose_ *f;
- 
-         f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
--        if (!f) {
--                if (errno == ENOENT)
--                        return 0;
--
--                log_warning("Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
--                return 0;
-+        if (!f)
-+                log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
-+                         "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
-+        else {
-+                r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
-+                                 config_item_table_lookup, (void*) items, false, false, NULL);
-+                if (r < 0)
-+                        log_warning("Failed to parse configuration file: %s", strerror(-r));
-         }
- 
--        r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
--                         config_item_table_lookup, (void*) items, false, false, NULL);
--        if (r < 0)
--                log_warning("Failed to parse configuration file: %s", strerror(-r));
--
-         if (streq(verb, "suspend")) {
-                 /* empty by default */
-                 *modes = suspend_mode;