Version bump.

(Portage version: 2.2.0_alpha120_p33/cvs/Linux x86_64)

5 files changed, 613 insertions, 1 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index e0af7996d038..118a6802f6be 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.41 2012/08/15 12:36:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.42 2012/08/24 17:21:06 mgorny Exp $
+
+*systemd-189 (24 Aug 2012)
+
+  24 Aug 2012; Michał Górny <mgorny@gentoo.org>
+  +files/0001-Disable-udev-targets-for-udev-189.patch,
+  +files/0002-journald-add-missing-includes.patch, +systemd-189.ebuild,
+  metadata.xml:
+  Version bump.
 
 *systemd-188-r1 (15 Aug 2012)
 
diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
new file mode 100644
index 000000000000..05b4a9df677a
--- /dev/null
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
@@ -0,0 +1,330 @@
+From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Aug 2012 14:02:07 +0200
+Subject: [PATCH] Disable udev targets, for udev-189.
+
+---
+ Makefile.am | 189 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 188 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8de4aa4..5fa3085 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -307,8 +307,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 = \
+@@ -338,9 +336,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 = \
+@@ -1588,12 +1583,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 +1605,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 +1625,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 +1640,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 +1651,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 \
+@@ -1727,17 +1679,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 \
+@@ -1803,14 +1744,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 +1793,6 @@ ata_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	ata_id
+ 
+ # ------------------------------------------------------------------------------
+ cdrom_id_SOURCES = \
+@@ -1871,12 +1802,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 +1809,6 @@ collect_SOURCES = \
+ collect_LDADD = \
+ 	libudev-private.la
+ 
+-udevlibexec_PROGRAMS += \
+-	collect
+-
+ # ------------------------------------------------------------------------------
+ scsi_id_SOURCES =\
+ 	src/udev/scsi_id/scsi_id.c \
+@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \
+ 	libudev-private.la \
+ 	libsystemd-shared.la
+ 
+-udevlibexec_PROGRAMS += \
+-	scsi_id
+-
+ EXTRA_DIST += \
+ 	src/udev/scsi_id/README
+ 
+@@ -1911,12 +1830,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
+@@ -1925,12 +1838,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
+@@ -2111,99 +2018,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/' > $@
+@@ -2231,12 +2050,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/0002-journald-add-missing-includes.patch b/sys-apps/systemd/files/0002-journald-add-missing-includes.patch
new file mode 100644
index 000000000000..50604d17a603
--- /dev/null
+++ b/sys-apps/systemd/files/0002-journald-add-missing-includes.patch
@@ -0,0 +1,88 @@
+From 4871690d9e32608bbd9b18505b5326c2079c9690 Mon Sep 17 00:00:00 2001
+From: Allin Cottrell <cottrell@wfu.edu>
+Date: Fri, 24 Aug 2012 01:46:38 +0200
+Subject: [PATCH 1/4] journald: add missing includes
+
+---
+ src/journal/journald-console.c   | 1 +
+ src/journal/journald-gperf.gperf | 1 +
+ src/journal/journald-kmsg.c      | 1 +
+ src/journal/journald-native.c    | 1 +
+ src/journal/journald-stream.c    | 1 +
+ src/journal/journald-syslog.c    | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
+index 6cd2397..2596d44 100644
+--- a/src/journal/journald-console.c
++++ b/src/journal/journald-console.c
+@@ -21,6 +21,7 @@
+ 
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/socket.h>
+ 
+ #include "journald.h"
+ #include "journald-console.h"
+diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
+index 2f83cbd..32474df 100644
+--- a/src/journal/journald-gperf.gperf
++++ b/src/journal/journald-gperf.gperf
+@@ -1,5 +1,6 @@
+ %{
+ #include <stddef.h>
++#include <sys/socket.h>
+ #include "conf-parser.h"
+ #include "journald.h"
+ %}
+diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
+index aebca5d..b259480 100644
+--- a/src/journal/journald-kmsg.c
++++ b/src/journal/journald-kmsg.c
+@@ -23,6 +23,7 @@
+ #include <sys/epoll.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <sys/socket.h>
+ 
+ #include <systemd/sd-messages.h>
+ #include <libudev.h>
+diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
+index 7aa99a3..4e44c3a 100644
+--- a/src/journal/journald-native.c
++++ b/src/journal/journald-native.c
+@@ -20,6 +20,7 @@
+ ***/
+ 
+ #include <unistd.h>
++#include <stddef.h>
+ #include <sys/epoll.h>
+ 
+ #include "socket-util.h"
+diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
+index 3e4022a..113c421 100644
+--- a/src/journal/journald-stream.c
++++ b/src/journal/journald-stream.c
+@@ -21,6 +21,7 @@
+ 
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <stddef.h>
+ #include <sys/epoll.h>
+ 
+ #ifdef HAVE_SELINUX
+diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
+index daed095..9db9198 100644
+--- a/src/journal/journald-syslog.c
++++ b/src/journal/journald-syslog.c
+@@ -20,6 +20,7 @@
+ ***/
+ 
+ #include <unistd.h>
++#include <stddef.h>
+ #include <sys/epoll.h>
+ 
+ #include "socket-util.h"
+-- 
+1.7.12
+
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 2c289e206f6f..74a2018ea9fc 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,5 +9,7 @@
 		<!-- XXX: describe those two better -->
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
+		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
+		<flag name='qrcode'>Enable qrcode output support in journal</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/systemd/systemd-189.ebuild b/sys-apps/systemd/systemd-189.ebuild
new file mode 100644
index 000000000000..0b8f28cb0266
--- /dev/null
+++ b/sys-apps/systemd/systemd-189.ebuild
@@ -0,0 +1,184 @@
+# 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-189.ebuild,v 1.1 2012/08/24 17:21:06 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"
+
+# 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-fs/udev-189
+	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 )"
+
+# sysvinit for sulogin
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwids
+	sys-apps/sysvinit
+	!<sys-libs/glibc-2.10
+	!~sys-fs/udev-187"
+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}"
+
+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-189.patch
+		"${FILESDIR}"/0002-journald-add-missing-includes.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)
+	)
+
+	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
+
+	# 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."
+}