From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 18 Jan 2015 14:19:15 +0000 (+0000)
Subject: Backport patch for compatibility with >=sys-apps/kmod-18-r2.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b07fd6faa876aeec63d3687e375bc53ffd48a13a;p=gentoo.git

Backport patch for compatibility with >=sys-apps/kmod-18-r2.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
---

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index d1591719a1e1..caf640308ad3 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.339 2015/01/18 13:25:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.340 2015/01/18 14:19:13 floppym Exp $
+
+*systemd-216-r3 (18 Jan 2015)
+
+  18 Jan 2015; Mike Gilbert <floppym@gentoo.org>
+  +files/216-tmpfiles-setup-dev.patch, +systemd-216-r3.ebuild:
+  Backport patch for compatibility with >=sys-apps/kmod-18-r2.
 
   18 Jan 2015; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Describe USE=curl, bug #536934. Thanks to Elias Probst for the description.
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 5391aaf700af..ac6e10ae74b0 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,6 +5,7 @@ AUX 215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch 4685 SHA
 AUX 215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch 1485 SHA256 0fa0dfe08367fd31c36e286ee1b53782892ffa03c443db3564cbf6b0fe7789bc SHA512 1bc38a00f58ee15a86e4240f7a136889c7a2b662d8ada4299f1fafe73f21d3c9728db4f38e486c26f605ed2da01bc766413ff274b3ee230a784f398ca30bcb99 WHIRLPOOL 84b4190bb78d7e9dd56aa998d60b96ee2dfc75111a991e8a11b7bafaa42a56ebf8ab1d9b3c1e3d60350cd070b3ed423ee76874d27c970c0dcaec47ac0f4a48e5
 AUX 215-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch 2892 SHA256 6f2a59488e384aab809a4d31df0b088b2f052f53d68a6fe34117c3af336c9e1c SHA512 4ec1f99760a416f7825e1ab760779ce1be70d2c6c583dda7d3b22b076507fc26209d04a6a8312d73db74a65035dcc5c5147d6784ea7292be402ea565919ef59e WHIRLPOOL 11d9df38a05e0bc8c9ff3a48dd34ffa91277464d1c5f874e19cb2c1f152957ab88caf520d079671bc907adc6a546c279f7e54dca33c2e0e502fc3f6593ebbb0a
 AUX 216-lz4-build.patch 592 SHA256 c914d38894f6743361e511378b43aaa632bd2abc9b1f87bea58af389a80c3dbc SHA512 9dc7eb596448b49ac99189cd1fefe6921945feeeb0e0e15068bd580fd2045641b9afda092a706bbd4dfe11c9af0a7c91d4f754cf4e59973a909036dc1b706365 WHIRLPOOL d9051cb0dff1b32b5d8caf47d98f14fea047b4630e69422def572cfce566e8a3205d02b6311c3886b2afb9ec4e687eb0e9b1881f3cba1a1f222adc1bea045e8c
+AUX 216-tmpfiles-setup-dev.patch 837 SHA256 3d6e24f17eb5669c565375c158ba2a0b550d6c847d116fb278e4d430280734a6 SHA512 b0bc01b3947c9d72e1cf61e603726905ede86a861b861e905a124e0d8f3eba857946b0e1044b0e21e37d64a1c724df13931b65ceb2cf5300e963282dddf4eced WHIRLPOOL c1649530581f6cfa3ada6e10dd3efbbcc223e4ea8b90a61dead5b3d2bddbc0c46c96e026c67bb12c64f2c85c35777908aa16e7aa98ab2f3467a0c0c5c562d9f7
 AUX 217-systemd-consoled.service.in 444 SHA256 c576b19723087b9068593053e101c4fb047d451ee200586149fdf8b21917e797 SHA512 19b182bbdde7645626d661b3e753356483b4c40e19e5790cabf7b94a0c5322eddb151336f7f61347fd52d664b1ecfedbd9e0d55f4f08143e87777503f08bf686 WHIRLPOOL 2d2e4b63fb4cadb60ca855984c61d16b85483653bf241e4f6179ea5fc38276faf68de01140109f7280a45683e8a54034e7b653dbd14d76a04929f093a03833d7
 AUX 218-Dont-enable-audit-by-default.patch 1027 SHA256 760365637ea7528623fa1685d454ecdbd2dbae29990062e0bb234a5e662b2123 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 WHIRLPOOL 14c689ba78c7b4221657931fb909d9d37ab14078ade593986f1abaf643e82b5b0677dddd69134bdbf6e087b4f694d252d7cd6558c671d061a80f7dc3c99e5175
 DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a
@@ -14,28 +15,17 @@ DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b090
 DIST systemd-gentoo-patches-217-r1.tar.xz 8388 SHA256 09a75238e12f520560de2a0714a0c37f206e25ae2c348cbfbf6ea526307e7a1b SHA512 bf310fa0dbcc82c49d7d537fb0cddd79ab83c836888706b946f110424a35cd71da9c509cc968a2dc3ccbb5ef6947b2d8b45b9d58a64da3c3dea269d8e8cf5fa7 WHIRLPOOL aad35822a2bed9f60a04245bd79434833e6f08331768b3bac2cea59c37e405064c29b5dca2f767eeace723a6daaf456862667aebc1c4b4a47548c817b5721755
 EBUILD systemd-215-r3.ebuild 16088 SHA256 29066774eada0721a1c48aa49273ce79052f76679fc1ac398519d77a0d012400 SHA512 1535b50eadca16d59fed82c2df29be8ed3fdfaa09daa73daf754a22a03858033a3f522292e23adede305ade08057471c9b368f7bf5403c2133524ca3612ef678 WHIRLPOOL 900f36eb522e48bffbe1a9dc121834f63b0030a3ee87ed467b1f7e9b34cc1d0373408c217da0dea40aed116bae627b175ba65d1fcf16a0d4836da947bc934fda
 EBUILD systemd-216-r2.ebuild 16052 SHA256 99f24b3d604762727852c9367e157ccb5bfc0005acdf923c645599ae0fbebc27 SHA512 65c3d9a1f9e2d8886182a4cc219cc485825e72f6453c6a9903b3e8fc0f9fcd21c2798783df24fd692263f1ee7e57984d043122849501a5736f25d9c2666d51aa WHIRLPOOL 9f5ef2cadd44621cf5866e529e5abee3f69b2d21ba9ffeff8b33f893ba274c1eca2ff15336dae0ca8a187c42f843ef7c3a328bf4f5b00b8747719ab714ffbb75
+EBUILD systemd-216-r3.ebuild 16101 SHA256 47851c5641dd639c41b0be8b447de48d3fb131a1b310947f752214e1f53cc7df SHA512 a47fe485f468917dac0ad2f02de2988306dcf67b2b28fb0f19b1fa1e272fe942dfdc2d13d78ba3bd626d2a27ebbca8b6064274670bffadfd02b73549e931c9c0 WHIRLPOOL 31d26957d6248bdc566e10ad674a31467139fc934188bf56b7daf6654886ac7bbc7f3bb37fe8de1f83cde420f9252eb03883e0e6cbf9b043acd94d0e83e19fc1
 EBUILD systemd-217-r4.ebuild 15912 SHA256 561c2ce6d447d5815490ecdd06cd1fc370cee040a667b3d02c39e38364845014 SHA512 fc18b1e2b86ca161aa36874d3cebe6c5f410195785db7b40bba953d71d784e06f3041a8b8055aaf44b0039526a66d5f9b5b201cafac622eae2ab1949d9902470 WHIRLPOOL d51381ae93216140567ba6b114a89b087e77f6db9c6882256b90a914709f7c61b5c4420e58289e51529751da9251302b689c272da3a74b906b01548109785399
 EBUILD systemd-218-r1.ebuild 15926 SHA256 b1423ef151904973217a0ad1913eb2b6c046874a11785d66711ef17d77154e95 SHA512 9312fe83c60754c8214b4f6ed7ebfffa2045c7566ab09532266b9f5d1284299360109df441065cee10ffc8b04060d7e1e33c12ab5d8ba3b28091f7bfaa41e6fc WHIRLPOOL f03ee2c5c6e89d86b93a9f1cd62b6a656212196e3c90c203131898367594be535b277b597db12f70c64a93fa6fb9f96d945872779a0985267e6cb492c923c8e5
 EBUILD systemd-218-r2.ebuild 15992 SHA256 c1ff23e9984004b48fb8c214b681b3f674926253fd7724dfae3c1b80f8757e41 SHA512 200d21d568ba21bc2377ef302714faf244d6bf826b7dc9e10d758478487a0bc7c660c598ad445f3a7c8ef66a9ecb75100d98e1826a6e4cc1665d986af7741f48 WHIRLPOOL 9457ad9b72e9360ac6879fcbb18a6fbfcb59394a4936a2a27b0146c0d0de26a2866146b9b283acdba6df907b8b60c16c9a1fc1d31cd9b01cb9973885fab8df52
 EBUILD systemd-9999.ebuild 16314 SHA256 4f1814a103c388da85a8e65e6c0d1359b5d8ae28fd81a1e5a6718667b4221512 SHA512 9e1a59e3cd8c516955b072414f74eba1c34764ba20fa02851bf67785dabf2f7ee11150ac546150118677c0a1597c9f80120b8132d5f15b1a1c2c7ce1960f0c0f WHIRLPOOL 85acbf7a0c5265997e5814e364bc03ffe481d2b26cefe2a35d474d3d6bd16521d77702e3ab5d8c9e0f30048ed389e0b73c3f8df10b41f6859de3fbc64cb6ef29
-MISC ChangeLog 60634 SHA256 253a871d344f087bc357820dbe366c217fe66af218602c0154245fcf3b9cc852 SHA512 aae82ef4e25550929865bc62a30c4ad9404f44927016761b280b63c00c4e909119395190bf784b00f38dbb6f7fcd2a0768bea4d98317a37e00027b47223c3c93 WHIRLPOOL c75559f53c2800923464c4147323d04aead80f9ba032045abdfa95d51edf4030c7461eb81425915dcbdb3511b165d740e13f302b18108ef91938f40741c4443f
+MISC ChangeLog 60842 SHA256 b077059dddd96f6d591e475d4572f882afe0746819fe6c6885acebd48cc540cb SHA512 718c91a5f4913847128b3fe5e7bd441efcc06c195401c05f502eca53533fcd5a7e117d5640abee6d854f96d092179791c43c2f15db5c133c2364f4c675bebd63 WHIRLPOOL 720fcefde4403b627fdffc63f017d323dff8f76f5dd7a2ff2a0815f40943b3f525cb6c0918067b55170f478b71a61d22acbac6004bf132e8eaac83eff6c76aee
 MISC metadata.xml 1656 SHA256 5ab8de382185d396f02a48ba6c4329ff5ef479d4d3158a48e84073227a56bfc7 SHA512 f7b630c312305f187cc7f7da916c68a88272ec31749010b029044151f565b781066d1af5ec979835fd5366a39cbed10f9031c441383154918b6abecfdd21b108 WHIRLPOOL ee73c0a35a68783591d98d637ca75072f42ea82a657cd9b562cd1292012976f4cf7344079159429b6e4237e00d0cf0a457c35005d2a1cd935bad9c7e6732b075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUu7RZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOo2kP/3Mg9qSP1kzlItCgNTXIQ0ge
-VVyjpNS7IlQM6ka2yapWiorGeByYK9q5Yp6f9IB2x2sLjixNyaQOJc74U/bpE9gv
-D+ebMK3ZaEJC56v1umIGYjAfzaALAeFMydL+nFqw5utbvZ3FMo2Ee8+W82bmtFRT
-gzDW1XLo6rcrrTJHmWxyNpshliW3xdk+AwatfFu+eco7EpLB2xKERf9WvSWxJKC8
-SXONdGqSzWc1kDRBPD/rTe3nSUQGpJ8lKEHciBp4cM7wpf63K+uQu7gj2fNs8xpz
-Ug18YmUMNUmszTCEdiTe5B5aWOAQZy62UpbBor0vT4Uayd1jqoK8YEuS/eddF20j
-33xZDewDj8/JTv2CtDxzqjTLDsqLLdlu1KiOTuVgqJalDp9W6IyrvhnhzrPd2mtk
-3UCZvqKC4vCyOb2z7r6tZWzwDHCDXfzdDK9JKuPCovwWibcdUbPnm5chFHtoa7iq
-NV4zDgmz58JFP1u52Zrb5TkGb9VlKj98crvUDvstxZwvbNtxVlrXC2Yo5HGeDliO
-g/QVj5Hi3x1oZvyTnFnC59eOu9crySNd/fpR8B2V7OIbv6Ien5lGf9EyHfNucCIt
-s7BZstJXPGdWwy8+WabXQ5YC7KxSXo4Rtw51uURk9vZ9aoKG3EsYwyFCIcT0QzoV
-XwDtzkRH2AEmNSbY3dz6
-=Kq3u
+iF4EAREIAAYFAlS7wOIACgkQC77qH+pIQ6QpqwD/R7yH4MWot768cJx1dSsr5Hak
+o6WD8cb4YnN+9ldHTAsA/1G1ws4tTZQcF8oYaRdh/JY/mINtDQ7FUQ5vthlUOM6q
+=klmv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/216-tmpfiles-setup-dev.patch b/sys-apps/systemd/files/216-tmpfiles-setup-dev.patch
new file mode 100644
index 000000000000..1fa4a3e7ecae
--- /dev/null
+++ b/sys-apps/systemd/files/216-tmpfiles-setup-dev.patch
@@ -0,0 +1,21 @@
+From 8c94052ee543c3598a3c7b0c46688150aa2c6168 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Mon, 27 Oct 2014 17:15:42 +0100
+Subject: units: tmpfiles-setup-dev - allow unsafe file creation to happen in
+ /dev at boot
+
+This will allow us to mark static device nodes with '!' to indicate that they should only be created at early boot.
+
+diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
+index f3833fd..0123a03 100644
+--- a/units/systemd-tmpfiles-setup-dev.service.in
++++ b/units/systemd-tmpfiles-setup-dev.service.in
+@@ -17,4 +17,4 @@ ConditionCapability=CAP_SYS_MODULE
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create
++ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create --boot
+-- 
+cgit v0.10.2
+
diff --git a/sys-apps/systemd/systemd-216-r3.ebuild b/sys-apps/systemd/systemd-216-r3.ebuild
new file mode 100644
index 000000000000..d384c7cd84c2
--- /dev/null
+++ b/sys-apps/systemd/systemd-216-r3.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r3.ebuild,v 1.1 2015/01/18 14:19:13 floppym Exp $
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+inherit autotools-utils bash-completion-r1 linux-info multilib \
+	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
+	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 public-domain"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl apparmor audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http
+	idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
+	selinux ssl sysv-utils test vanilla"
+
+MINKV="3.8"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
+	sys-libs/libcap:0=
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? ( net-dns/libidn:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	pam? ( virtual/pam:= )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( sys-libs/libseccomp:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit
+		>=sys-apps/util-linux-2.24.1-r2 )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!sys-auth/nss-myhostname
+	!<sys-libs/glibc-2.14
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
+	>=sys-apps/hwids-20130717-r1[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-devel/binutils-2.23.1
+	>=sys-devel/gcc-4.6
+	>=sys-kernel/linux-headers-${MINKV}
+	ia64? ( >=sys-kernel/linux-headers-3.9 )
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )
+	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
+
+PATCHES=(
+	"${FILESDIR}/216-lz4-build.patch"
+	"${FILESDIR}/216-tmpfiles-setup-dev.patch"
+)
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	autotools-utils_src_prepare
+}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
+		~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
+		~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~DEVPTS_MULTIPLE_INSTANCES
+		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+		~!GRKERNSEC_PROC"
+
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+	use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
+
+	if linux_config_exists; then
+		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) -lt 4
+			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
+		then
+			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
+			eerror "gcc version using gcc-config."
+			die "systemd requires at least gcc 4.6"
+		fi
+	fi
+
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		if ! use firmware-loader && kernel_is -lt 3 8; then
+			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
+			ewarn "require systemd with USE=firmware-loader to support loading"
+			ewarn "firmware. Missing this flag may cause some hardware not to work."
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	multilib-minimal_src_configure
+}
+
+multilib_native_enable() {
+	if multilib_is_native_abi; then
+		echo "--enable-${1}"
+	else
+		echo "--disable-${1}"
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(use_enable gudev)
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable introspection)
+		$(use_enable kdbus)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with python)
+		$(multilib_native_use_enable python python-devel)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+
+		# Disable optional binaries for non-native abis
+		$(multilib_native_enable backlight)
+		$(multilib_native_enable binfmt)
+		$(multilib_native_enable bootchart)
+		$(multilib_native_enable coredump)
+		$(multilib_native_enable firstboot)
+		$(multilib_native_enable hostnamed)
+		$(multilib_native_enable localed)
+		$(multilib_native_enable logind)
+		$(multilib_native_enable machined)
+		$(multilib_native_enable networkd)
+		$(multilib_native_enable quotacheck)
+		$(multilib_native_enable randomseed)
+		$(multilib_native_enable readahead)
+		$(multilib_native_enable resolved)
+		$(multilib_native_enable rfkill)
+		$(multilib_native_enable sysusers)
+		$(multilib_native_enable timedated)
+		$(multilib_native_enable timesyncd)
+		$(multilib_native_enable tmpfiles)
+		$(multilib_native_enable vconsole)
+
+		# not supported (avoid automagic deps in the future)
+		--disable-chkconfig
+
+		# hardcode a few paths to spare some deps
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+		--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
+
+		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+	)
+
+	if use firmware-loader; then
+		myeconfargs+=(
+			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myeconfargs+=(
+			ac_cv_search_cap_init=
+			ac_cv_header_sys_capability_h=yes
+		)
+	fi
+
+	# Work around bug 463846.
+	tc-export CC
+
+	autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		# prerequisites for gudev
+		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
+
+		echo 'gentoo: $(BUILT_SOURCES)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || continue
+
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-libLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			# safe to call unconditionally, 'installs' empty list
+			install-libgudev_includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+
+	# install compat pkg-config files
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# 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
+	fi
+
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
+	rm -rf "${D}"/etc/systemd/system/network-online.target.wants
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+migrate_net_name_slot() {
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+		net_move=yes
+	elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+		net_move=yes
+		net_name_slot_sym=yes
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $? || FAIL=1
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+	use http && newusergroup systemd-journal-gateway
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
+	migrate_net_name_slot
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
+		ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
+		ewarn "and 'mount' to not work properly. Please run:"
+		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+		ewarn
+	fi
+
+	if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
+		ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
+		ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
+		ewarn "to /run/systemd/resolve/resolv.conf"
+		ewarn
+	fi
+
+	if ! has_version sys-apps/systemd-ui; then
+		elog "To get additional features, a number of optional runtime dependencies may"
+		elog "be installed:"
+		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
+	fi
+
+	if has_version sys-apps/openrc &&
+		! has_version sys-fs/udev-init-scripts; then
+		elog "If you plan to boot using OpenRC and udev or eudev, you"
+		elog "need to install the udev-init-scripts package."
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}