More backports.

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

4 files changed, 518 insertions, 8 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index eb3e62ec42f0..9a4054b40600 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.368 2015/05/26 19:47:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.369 2015/05/28 03:35:00 floppym Exp $
+
+*systemd-220-r2 (28 May 2015)
+
+  28 May 2015; Mike Gilbert <floppym@gentoo.org> +systemd-220-r2.ebuild,
+  systemd-220-r1.ebuild, systemd-9999.ebuild:
+  More backports.
 
 *systemd-220-r1 (26 May 2015)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3d5034695d50..74509be39e91 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,6 +14,7 @@ DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b090
 DIST systemd-219.tar.xz 3938228 SHA256 5c57113454e37c040d0cb481bd960ae7cf3a3fe0a231ff4945259bc74503f2d9 SHA512 19a92891996723bbd83fe745f365d25b2879a059466670aebb9e9fbb6a79a3ed6e1a93e8b76042605038766cabad3ddb89aff40b4a11ab830ffa7dc64f87234f WHIRLPOOL 440868c47bed26571084009fa86d267c921cd5cbbc63b596c1161ef7f33a1b9427ad315450014cd729c761b27bf42542c3b0b7ca68e09b23fc8f606147e7e9fb
 DIST systemd-219_p112.tar.xz 3944604 SHA256 8394ca0d55b05cb07c2187da8b614f3cb4eacc297c501dd09a31dad18acf28ea SHA512 480526ff45a8588b3a572ccc455d6357208093f5dae858947182f6e9e4595c1f612d1b661eff41f39f5df6ad0dcb6b0a08b08c15125baf1cf07402ac18a5130b WHIRLPOOL cf1ea60dc59a2a3f54cb66d24a529b742bd403f996a9e8f132fd9f9dc551308ee233fec4fec3e8feb7a657ccdd25e56a6e0756633a1c76a9c427588b262558d9
 DIST systemd-220-gentoo-r1.tar.xz 4960 SHA256 97cdcab301d2ac35a362aeb2c3e71af9860500a2c5742c627a893aaa19b25764 SHA512 aa46736930b08390d444fe7ce79c71e7db0910c530d6bd61b86138c2c8f60c8bea74a30f74e1f08ba89f1f2e560e1460b9f5e24c99853fffe6735a8e999e2af1 WHIRLPOOL bac6dc35e7372b6cd51f4573ce63ba8df38b8b45c22de01925a175cabf94d78bc6ecfc5ca80d193adc00f3e724b43dd9aca54608cfcea20687a7c72906feddad
+DIST systemd-220-gentoo-r2.tar.xz 7008 SHA256 9d40328056437d0ad799ef6c659e1017cba482888b8f03b8b4628990d79b2a20 SHA512 b0c45d73ee0d0be114f48f4e071a596d6d069c04c8012761aae33658fe569f6ab89e6df370101432484c288b79eb1aef6f0e6c586ce0237c455c7ba6e23d3ab7 WHIRLPOOL 2b017f5d453bd485203a613f6cad424067cb4f561c070e3b2574fdfa1877da3ab45e98d647eec463df8c625c2ce13d7289f439f5ac7a76c2d4f44b256a834d24
 DIST systemd-220-gentoo.tar.xz 4624 SHA256 5d1fb014a8c6742f645ea8ea97ec92b97b506186ab2dd674c30cd1f34b8c4d0a SHA512 e1be8d547c75789e26c16d67377eccffa0ac2dc7e9f2ea820e6d6388668e074db5e60cb76b3151b4a3d5b48d48af2b3e0608eb7a15bb47316b9f537064196e30 WHIRLPOOL cc18d7b15cbc7aa9a92daf8d58bfd35a9c461672b799d2dbd30b617d510a8ee804a0a07e74f89ce50fa02cc16cc9058b57cc8ea590beb7a527c1e9288febb7c1
 DIST systemd-220-src-boot-efi.tar.xz 19024 SHA256 63aa064938e6d295a2ac4b308876c161aff9eddd1d2012cec0ce00d9b8423469 SHA512 33f8b7d2d09c7dc2f9c55791ab855e3b1763a17db8dd534f67bc4b116def905c2782039e38bb93cd071b198ef582b1d923a5eb15b97a0d6983cb0afffdccdef9 WHIRLPOOL 675654d1fe5c021d7f9ec10d439ccd959812e69b0b816cbdb12508516e41be416a0e7adcb556f49aa7abfaceba4f682ccd353628ddf87cc8d507e5e75ea750b8
 DIST systemd-220.tar.xz 4036028 SHA256 3659588c40221ee7257502c0735491f72796dbe17be560013f6d310deb446332 SHA512 c309b4309f8b8d2d97450fb281053feec7b89227626b69e37f3a0d2154c2810c217e58e218f17da11c04f703c6196cec21c4afdcf63879bc736bbdca058a5da5 WHIRLPOOL 2f8974eacb706987e85c7907a517f6b2d47b009f9259a36375537c8bd09bc4774c81e8dc853aa83e644d7c1b579f5113d0bb8a504c7caa5a9240750f9936d561
@@ -25,14 +26,15 @@ EBUILD systemd-218-r3.ebuild 15060 SHA256 bcfe74f74390134a3ca1f97bfe25fd62a355d8
 EBUILD systemd-219-r2.ebuild 15469 SHA256 eace7a3a729f73a79331ebaf82e7aa7239c63bfe0fa4731055b1d3d3a8a758e5 SHA512 c15cadeeaef561cabf2ee8e1a8b8fa10659514b74b34b7588a13d8a6c51db03c75f44fb26f5ea80d312568b2cf2e7858c0747b935aff4f7cbc79dd36429625aa WHIRLPOOL 68aa2ca25d6d3e006c248237a91c3853da72977a849ca118dfa0d3ab62c7ec0ca60b8d81cc08cce3410ee3a07c56ec6670744c5d87894635ebe2628b15e12367
 EBUILD systemd-219_p112.ebuild 15488 SHA256 f82fd9bbff6598a95e749d7d573821532d88218dc4e4f93d268310b477f52858 SHA512 f4d467ca4e5ee46196339b871302b08f9da7aaacce559e93ff0237454917d3bb8dd7d5c25997819e4e3ed3e8fd5b40cc0f233fe35a74859cdc3a5c43707b185d WHIRLPOOL 643c690512a5dedaba05923e1595b418b107d0309e51969b88fdc181652be8bfadb786da197a91b8f0bb8310a02ef98647c8a3f870358c302519387849e37765
 EBUILD systemd-220-r1.ebuild 15711 SHA256 390b9fd7131aa2d353a73fa293c1de3c7b08fa2d0c934901bbe4bf9e7294b335 SHA512 037ddbf6c373e8a075fedd1db94737a0193a17f78cb6ec19d015cf9603ba9b960e46daf902fd9967771df18bbb24105903345f9d31c96b2ac357902e0a2d68ce WHIRLPOOL c52348dd32ed5b7eabfd15613fc230b67b9f84d890636945d3b2860455ffe28dffe25c79440bfa2c7afdb7ef9ba8fae3c298f940740ad3f42033c3948d829ed0
+EBUILD systemd-220-r2.ebuild 15823 SHA256 fe4f7d2e59791f8073939c859d113ff8b1933dcb27487ca85820db88b7041711 SHA512 e08f39cf4b980069d948244bee23d2aac287dd101784380eaebe732483ac76849c52183669ad2f0742dfbfef2f8271c20d7e395f9ad5fd1ce2da38ed3e8adce5 WHIRLPOOL 02fb621d98ec5c3b2043d627f3e1fc46a4fc7572ad9ad3c406a269e66d95f50ed55a5ea4d67332434cb23f7ea59b9b180e6cd6f9592e444f26a7b5e9c788ceb7
 EBUILD systemd-220.ebuild 15705 SHA256 581c93b27aa1df46bd99e158d8966c2db2372471957bd271b6e7789ef67f354a SHA512 4bc215424e374663f69485f0ea540a093f2e83d2e71d0ca5c6e6f78f1d31ba42bf505c226fb46a7aed152384ddf6d79cc8019741484a964fd857910dda61c4fa WHIRLPOOL e2a2cc77f79f995704ff6de78ff0b5bda190a485023e9554df804346f1ee3047c91b36128905062eb193792c01d81eb0f1ea032369334e5aca6b894f765ed01b
-EBUILD systemd-9999.ebuild 15815 SHA256 e83311921e8038c110dce9738345b45c3d37b05530d5915e4581f7b2c0fa754f SHA512 107db838089e14cbce1a81ec5ed19e3039e1a0e2a49d704662c8834aea65f10c33edc2cb113ab2b7f110f54490dc12a0a5ed525dad197338d9e85761f73874be WHIRLPOOL e896173595e3a893aac95a5d6b13c6e99d1a8fe06407ae00ee71349f99d6d6759c8c624e7da3470a5ef8989a4c8805aa2ab81facae23023553c2975673d8ad6b
-MISC ChangeLog 64978 SHA256 2d2d3881fe6f879714ee07237c8e1902d354f46e743c6bf68cf69d8fc8a27759 SHA512 4c134e1f747cf2aee7f370889cf4d2e2d88e7d06a89d1a098163effa9d3ba608f54a5c6604820d1c008a9a538cef9c55681f4b8ad44ab5b6f6b018c575ba3588 WHIRLPOOL ee99101335a1ce46a9653ee22078f209f0b959e643680bccd16558a4193b62c38312737ef7b7c01100d2a33fed423461a96b0916956cafdccd57f2d139fb5b5b
+EBUILD systemd-9999.ebuild 15822 SHA256 b43219f89f534a6fb5400796339035c708aa8c22b66182cb18fe8721f91db708 SHA512 616788a056b99d0399eb3fad62e74df1cbf7a3ab1a02ae09238687dee43bd35567b45910ced93d0af852e0d4ffeb0a2d6673825c2410232da67b4e188f9cb016 WHIRLPOOL ab84746e41314be4d45a3faa8a478ce60634f886045acf964c6760d97b1810b3a883170444874e0a8d7f1d05a3897ea7b3ee2423f45f4497a3ee3874e4f52e29
+MISC ChangeLog 65147 SHA256 8d1625ba09734792ac1b8934caeff305981c46ca7345e6988161c22f3b7c1622 SHA512 7e3b5ffe7eb5ef5de7db841f69a7ea8246955f9af4fbe72464b9076f9c81f3f5db1b8504507a9b01d7f9007a5dac8a756a874fadff8f79118d0d89b50e3b07ff WHIRLPOOL 2aa47007fa31e599716ef0e157be374c6015e2adb0cac379ec12a4ae8a8c70774c84d18886f6d48b6c7a88bd9bb9e3d656e3e2471b4e4b4351490e3366ed027f
 MISC metadata.xml 2141 SHA256 d21a56048e94d30ebd8ee2a218ec3f19eee184ddb63fd240168348e0e82fde0a SHA512 2140c71ee89ff12de395799cc6f1968a92d9437b2cb7ea0d4aaf553fc073f038cc3c27c522922eb8a7706f40ca8e146de53efa8f57927e6aaf9bca732f9f14fe WHIRLPOOL c2ccc32563da1514c9d58ac358546e719967acd705a4dec862471b0900d3ff55e7d5b718a04e0ca05a70fc5d80ab4309d8fb9b7d86eea0de78531cf77eb0c661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVkzcQACgkQC77qH+pIQ6RrywEAsGZsvtOLAQGPj1nARIFwVTkc
-8SJp0Tli3oA+X8eeJT4A/3itUnC2CZFxWcp1FgxHFsZ3i7zvMWG3nDh6vBVbMWiy
-=J2z+
+iF4EAREIAAYFAlVmjOYACgkQC77qH+pIQ6T9VgEAmPK1cWB3JmmoM1A5QkI5Yrdy
+15cjbFbQVJEypjBsVe8A/RghcXf7YjqY79E4Zo/o+RKhz0X9UXs1yu5IFar78cKR
+=n368
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-220-r2.ebuild b/sys-apps/systemd/systemd-220-r2.ebuild
new file mode 100644
index 000000000000..3cd5321eec62
--- /dev/null
+++ b/sys-apps/systemd/systemd-220-r2.ebuild
@@ -0,0 +1,502 @@
+# 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-220-r2.ebuild,v 1.1 2015/05/28 03:35:00 floppym Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+PYTHON_COMPAT=( python{2_7,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
+	http://dev.gentoo.org/~floppym/dist/systemd-220-src-boot-efi.tar.xz
+	http://dev.gentoo.org/~floppym/dist/systemd-220-gentoo-r2.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http
+	idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
+	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.8"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
+	sys-libs/libcap:0=
+	!<sys-libs/glibc-2.16
+	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= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib: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}] )
+	nat? ( net-firewall/iptables:0= )
+	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 )
+	terminal? ( >=dev-libs/libevdev-1.2:0=
+		>=x11-libs/libxkbcommon-0.5:0=
+		>=x11-libs/libdrm-2.4:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	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-auth/nss-myhostname
+	!sys-fs/eudev
+	!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 )
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	terminal? ( media-fonts/unifont[utils(+)] )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
+
+if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+	DEPEND+=" >=dev-libs/libgcrypt-1.4.5:0"
+fi
+
+PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" )
+
+pkg_pretend() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
+		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+		~TIMERFD ~TMPFS_XATTR
+		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+		~!SYSFS_DEPRECATED_V2"
+
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+
+	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
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	# http://lists.freedesktop.org/archives/systemd-devel/2015-May/032149.html
+	rm src/journal/audit_type-to-name.h src/udev/keyboard-keys-from-name.gperf || die
+
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch
+
+	autotools-utils_src_prepare
+}
+
+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_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)
+		$(multilib_native_use_enable gnuefi)
+		$(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 importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(multilib_native_use_enable introspection)
+		$(use_enable kdbus)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(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 terminal)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+
+		# 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
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# 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-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+	)
+
+	if ! multilib_is_native_abi; then
+		myeconfargs+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+
+			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
+	# Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
+	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 "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+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
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a91a1185eabb..ef6f33a037f2 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.165 2015/05/24 20:53:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.166 2015/05/28 03:35:00 floppym Exp $
 
 EAPI=5
 
@@ -109,7 +109,7 @@ DEPEND="${DEPEND}
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt:0
-	dev-libs/gobject-introspection
+	dev-libs/gobject-introspection-common
 	>=dev-libs/libgcrypt-1.4.5:0"
 
 SRC_URI=