From b195ff09c9790e192da7b4ab614aa8fd9464b089 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 18 Apr 2015 23:54:22 +0000
Subject: [PATCH] Adjust glibc blocker, bug 546194.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
---
 sys-apps/systemd/ChangeLog             |   7 +-
 sys-apps/systemd/Manifest              |  29 +-
 sys-apps/systemd/systemd-216-r3.ebuild |   4 +-
 sys-apps/systemd/systemd-216-r4.ebuild |   4 +-
 sys-apps/systemd/systemd-218-r3.ebuild |   4 +-
 sys-apps/systemd/systemd-219-r1.ebuild | 485 -------------------------
 sys-apps/systemd/systemd-219-r2.ebuild |   4 +-
 sys-apps/systemd/systemd-9999.ebuild   |   4 +-
 8 files changed, 25 insertions(+), 516 deletions(-)
 delete mode 100644 sys-apps/systemd/systemd-219-r1.ebuild

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 8a9f1560d964..2ac265802a1f 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.361 2015/04/14 12:37:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.362 2015/04/18 23:54:18 floppym Exp $
+
+  18 Apr 2015; Mike Gilbert <floppym@gentoo.org> -systemd-219-r1.ebuild,
+  systemd-216-r3.ebuild, systemd-216-r4.ebuild, systemd-218-r3.ebuild,
+  systemd-219-r2.ebuild, systemd-9999.ebuild:
+  Adjust glibc blocker, bug 546194.
 
   14 Apr 2015; Agostino Sarubbo <ago@gentoo.org> systemd-216-r3.ebuild:
   Stable for ia64, wrt bug #525112
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 941295330d21..4ebcedd8835d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,28 +14,17 @@ DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b090
 DIST systemd-219.tar.xz 3938228 SHA256 5c57113454e37c040d0cb481bd960ae7cf3a3fe0a231ff4945259bc74503f2d9 SHA512 19a92891996723bbd83fe745f365d25b2879a059466670aebb9e9fbb6a79a3ed6e1a93e8b76042605038766cabad3ddb89aff40b4a11ab830ffa7dc64f87234f WHIRLPOOL 440868c47bed26571084009fa86d267c921cd5cbbc63b596c1161ef7f33a1b9427ad315450014cd729c761b27bf42542c3b0b7ca68e09b23fc8f606147e7e9fb
 DIST systemd.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f
 EBUILD systemd-215-r3.ebuild 16083 SHA256 8495ef81907c4ab43de633e0e7947c632e5c55eefaa7f2a4b201d491ac798597 SHA512 ffdbcb167db4bb4d6c722964ebb7e29d6636fd3e11f62889988ea0aed9df2754e7f18927ec9e62844f240cf4c9d878b3618ce295657674730e1aab6e5a0a60bd WHIRLPOOL 901e59257abd0d06f0c50dd9b0f95f504af302197570213da5576049bcd09dab46b3a07eee58da5cc2193aaceb50f3caaf2b80a759b9b182541ab2dc1f80f191
-EBUILD systemd-216-r3.ebuild 16086 SHA256 210b4899076fb7adef030acfdbb63c1a82e5cfb28d54f8486723106f40633904 SHA512 3cdc4537136fc147d78fc7f13e2babd98f3508f1655811421e6b521a4e4d30b8d7f886cb0a88f569261b7d286c86b54ff6e74dcaf5b6aab26474e17babfe0079 WHIRLPOOL fb37c160eb7b1d628dff7ac800bd6385ea5f3342de07e56b7ccb6e66bc8da749dfa8e2408f693d594715b124c763986edbcfcfa96b8f42bab8185b6b4d614d8e
-EBUILD systemd-216-r4.ebuild 16022 SHA256 49744d6fe5613da943a06fae7888106b84f2223434ab5178a42410edbf7f39c9 SHA512 3405423311e001f674229591a651e2b7772a35d291d7428e8fd401fe392a3051fd933a6812033a86b84b88d1a12bad13e201d28d7a824a0fd3a59febd2f360ae WHIRLPOOL 312b40061939b8cbc7508fbaf6fc6f4ffeef3b6ef44afba5e1546c6da0dd37f0cc096e114ff89645a6817e239886cab6af0306af269c0517217d533b388f49b9
-EBUILD systemd-218-r3.ebuild 15065 SHA256 ef6515f802c4be70c6591eada5e853c0d0c57a71fa918f3770159ba21e3c7460 SHA512 8897850f9f5ae6f947284559b1b30996651e14310862749dfc74878c15ed73f18db8f13e8ec0cf7a2f160e2fef2c2088d2a364ca07f9b90f7feee775eda332c9 WHIRLPOOL 3965a86cc6342d6ac818a4172f91d7b411db27bd2fb58a3c20c3fad7d2b032eadb2bf0715ddab47a264904609a949db77c5163775b030dc858da695ff13fffec
-EBUILD systemd-219-r1.ebuild 15241 SHA256 a2127df4530d956ea2d9b79166e7cbccc2d15169656876f4ab50de6f03b3f30a SHA512 640e4993b2b998bb717fb63c1969757fa75e3d7fba3a1cda729cdfba08b339a38a90235ebb140d996ba5f436749a5222a8262652932b2db3a54697bb637b4efd WHIRLPOOL 61b26c0ca3e1a4e249dbf4e91a5a1d8802d0c416d85efad35b8424a3825063efd83953e4ba79d8ce298e225a81a27cd13f7a83e596a2eff917e5f959394b64f3
-EBUILD systemd-219-r2.ebuild 15468 SHA256 8c75f61e275084fa72c4a13b020a9427e4202cbb08064775932bb4e9f9be70c0 SHA512 6f095a4c588ed5adaf1cd4955bf6a8dd329077c4a0a4329a598e7465ddaadbe3b54a8cdeb74af5ef555d5a31aaa345af58c8a1f66b67098e183da54bb3967f6b WHIRLPOOL ceaa193c6b924480c82404697cc2007a6221b7f39736c8a757a65271bee58bf354aeed54be56f904e7633e92dcdccbdbafe993db77a647f469acdd0ba4ba5529
-EBUILD systemd-9999.ebuild 15840 SHA256 616e3d06c60deb9928a9b49e636094f6930622ebc2ea20de40fcb1274a23a0ba SHA512 b0971a719c8e3014f35ec49538eade5121bc3b7378dad1eb45f489b1d416048bf059f6937c676a31f8348e738af32d9dbb8884b26c901404c00ac07311177864 WHIRLPOOL 581cdc126f6ee8bdeb9eecbe98bc7caaf529362fc1ab74ce4a0d9400de2976680ae4e3bcfb6446947293c2271d7c3bbaec5c70582fc09be7751355901aca1b1c
-MISC ChangeLog 63924 SHA256 1164019b897b708dedfdf831199a82296b03dddf59ce522f3aa59805cf4952ef SHA512 b72c77b70d74541089acb8f0b7a19505886ee7219d2b9d19c50915aefe56c5ed8ac2d2d2b6965b8f6d8e13bb6957d56c5642b71b5f1984fcb775969801338fec WHIRLPOOL a567e3f4808b428e207d6eacb55b7365182e053efa5e224728cf833845b15d9a4146e668addb6ea3d9c8bcad3d67a6f7f4a37e642b973d30a289a96a39e27e54
+EBUILD systemd-216-r3.ebuild 16090 SHA256 c4b2c2a3ec1d401a2cbd0f2b241698d2cc1fa19efe11a2060758523f62b4c1e1 SHA512 2b4eeb142b9426bf8c84294b4234a4fd611d7722d189719dbec42a7bb1e2d78d6dc938e93b5e82d20aeca8481f7580020065efaf34789dcb4b4907f2298d0137 WHIRLPOOL 5ffc5a936d9b8836f0c09e7ec25a8e32a91ee7ed6683c806867943ec8e87ee88d6e8ca9faecb45339101486f904e3e889bd46cc3cb321aa87b3382465ed79b68
+EBUILD systemd-216-r4.ebuild 16023 SHA256 dc741cb224c519e07351929fc2bdbf57acf4c899aa17c1e6076f3e9c44a8a855 SHA512 a86914677d340147da7a7cb17b47d0f92d86fc4b6e9cec8839c75ec5d09220edd6a1a46321d5f5ff84ba832b95e1551a4946d00195d3101a73fe9a0c945d0819 WHIRLPOOL d5bca84b20b9bc5dfe226f9dce5e78d2331466d900e13381b2b8aafd1475e27ea3f415a5868a7949dc5180109c59cd34558b03fb12e94712c93910b73b3e9ab5
+EBUILD systemd-218-r3.ebuild 15066 SHA256 ad11161c6754497f42b80b4b1b6189079dbd4ca50415641b3e189447efe2cbd7 SHA512 67c9e1391ec927d254bfac2ab57c728b17844c0245f520ec3312ad6ec24369d8366c03cc1671677ad69ec6c6bdfb906835b8cf405f0be82559689a8d7b3d2da3 WHIRLPOOL dd70b95f76af63712ab8e0410775bd94c12fe0baec5ad186133165ba7be0b6dba9f45a7c68b881fef8468340fa98ded5c803db6653606babb3c712c60cb515ca
+EBUILD systemd-219-r2.ebuild 15469 SHA256 eace7a3a729f73a79331ebaf82e7aa7239c63bfe0fa4731055b1d3d3a8a758e5 SHA512 c15cadeeaef561cabf2ee8e1a8b8fa10659514b74b34b7588a13d8a6c51db03c75f44fb26f5ea80d312568b2cf2e7858c0747b935aff4f7cbc79dd36429625aa WHIRLPOOL 68aa2ca25d6d3e006c248237a91c3853da72977a849ca118dfa0d3ab62c7ec0ca60b8d81cc08cce3410ee3a07c56ec6670744c5d87894635ebe2628b15e12367
+EBUILD systemd-9999.ebuild 15841 SHA256 4f6dbac397fe989ff7f005ebc42dbb660848d93af55067e0b2caf647a24b0a66 SHA512 02096ffb702a2758781fe492eb74ec939623184cc9afc90d3650838a0aedc11314d6327bcafce98b5c39721128e840cf4fe8dfc5bfab6f8069fc2deacb7e9062 WHIRLPOOL de255f5f39ea26806c5c946082eb62b1df957a88483b31aae7d1b92dad5e108b90fc08bd18587d4a7652dcecc86b1cd6ca723700698d20f01b8f9b923c3ec9d5
+MISC ChangeLog 64155 SHA256 538c2639a80eb6ed55a2351665b8438926ac261474a5dac56593b7e6f1f6c844 SHA512 63ce2a82898dd882981c94f8ada8ba569cad27b730c4e6cbc4dfedc7d577828bcb4a15459b4983cf26520fed167ea9697bc68d45f6c78572d933f3c6c55edfa2 WHIRLPOOL 62ead6f620b19e1778d92f3b87c9d6998dbc9b81bb27450415fda306bc46745dad63dc00fc8c5ba14fcc16fe103caf226f650cdad35580ca084f1a1b8ab99175
 MISC metadata.xml 2141 SHA256 d21a56048e94d30ebd8ee2a218ec3f19eee184ddb63fd240168348e0e82fde0a SHA512 2140c71ee89ff12de395799cc6f1968a92d9437b2cb7ea0d4aaf553fc073f038cc3c27c522922eb8a7706f40ca8e146de53efa8f57927e6aaf9bca732f9f14fe WHIRLPOOL c2ccc32563da1514c9d58ac358546e719967acd705a4dec862471b0900d3ff55e7d5b718a04e0ca05a70fc5d80ab4309d8fb9b7d86eea0de78531cf77eb0c661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVLQofAAoJELp701BxlEWff9sQAJ/vFkRGIeUGDEIlkGb+Fqwa
-w3+5KuZAcb82LoCxnbcwf5iZwnjrl6UEAYPaxQb124M0AquG4TAxP2vydWs8w9lr
-cIWlaum7DyHuyH5szk8Ve77/on5EUbzxX/XfiftvauxuBIhzv2PAZcJUaUCfrg3C
-t1CKxRGzzXkVfNXnlHw7FX4RfOCHeYOnp+lnaxw5X9yUbSOW5/JOpz0ti3tGed8A
-LXCkm4RFRnEQFi6qN6gkeT/NzVqMAGJkAYteYBhdaIl5Okan4gUFSjFxgAjoUlBY
-t/CzIhtSl/9MHjta1gy6Adra9RKEwVjkO9lFJBtj1qVP3LLchc0hx3TZEMbmjsAL
-5TBJEvdsj2rX/nX/h5LyY+8PC4eFzBk5TQKQt75YHGvMpyt9/qJZcx4mcezXwHUK
-qBrwu6ChxleLEClE7xRGpx1/qHrc0WerJt8ZszKWjnvCS40vuLy9WtJE2mBJA90h
-RStPBt8+zV7kapgi1CiAB4VKE9I1wrEs8lCLtU+ynAsfO5BomcwUKegDEtzdzVyC
-pTFZEHwS/Fdk+yvcUflzLgZq+R98TViGEmafBITB+kXRtX2bCmgtmyRhK4xHMbpO
-nLbrdNhM8yCwrUBlq5m1JQmgM2fQnmwEUOkPvGY08IW7hLerYlVwAS2Hwk+zgY/p
-T03E9VzZS6d0pT5zFS1Y
-=PXeg
+iF4EAREIAAYFAlUy7q0ACgkQC77qH+pIQ6QWxAEAmMbS6tH5yzAVPLn1mN1Gnp4g
+CFNBFeKq4F5HpeQ6tkQA/1DRnPWJzBQvwH/HLph3gQZqd+xjSn38oKRkQCFRu8Bf
+=J1yn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-216-r3.ebuild b/sys-apps/systemd/systemd-216-r3.ebuild
index e544e986c168..ea890cfaf72a 100644
--- a/sys-apps/systemd/systemd-216-r3.ebuild
+++ b/sys-apps/systemd/systemd-216-r3.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-216-r3.ebuild,v 1.7 2015/04/14 12:37:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r3.ebuild,v 1.8 2015/04/18 23:54:18 floppym Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ MINKV="3.8"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20: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= )
@@ -62,7 +63,6 @@ RDEPEND="${COMMON_DEPEND}
 		<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)
diff --git a/sys-apps/systemd/systemd-216-r4.ebuild b/sys-apps/systemd/systemd-216-r4.ebuild
index bb18ecba282e..5da0d321b884 100644
--- a/sys-apps/systemd/systemd-216-r4.ebuild
+++ b/sys-apps/systemd/systemd-216-r4.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-216-r4.ebuild,v 1.2 2015/04/08 18:27:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r4.ebuild,v 1.3 2015/04/18 23:54:18 floppym Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ MINKV="3.8"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20: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= )
@@ -62,7 +63,6 @@ RDEPEND="${COMMON_DEPEND}
 		<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)
diff --git a/sys-apps/systemd/systemd-218-r3.ebuild b/sys-apps/systemd/systemd-218-r3.ebuild
index 036ace1dde80..0e0f108d5a35 100644
--- a/sys-apps/systemd/systemd-218-r3.ebuild
+++ b/sys-apps/systemd/systemd-218-r3.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-218-r3.ebuild,v 1.3 2015/04/08 18:27:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r3.ebuild,v 1.4 2015/04/18 23:54:18 floppym Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ 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= )
@@ -61,7 +62,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/baselayout-2.2
 	!sys-auth/nss-myhostname
-	!<sys-libs/glibc-2.14
 	!sys-fs/eudev
 	!sys-fs/udev"
 
diff --git a/sys-apps/systemd/systemd-219-r1.ebuild b/sys-apps/systemd/systemd-219-r1.ebuild
deleted file mode 100644
index e4e41b1e741d..000000000000
--- a/sys-apps/systemd/systemd-219-r1.ebuild
+++ /dev/null
@@ -1,485 +0,0 @@
-# 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-219-r1.ebuild,v 1.2 2015/04/08 18:27:32 mgorny Exp $
-
-EAPI=5
-
-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"
-
-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 gcrypt 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=
-	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-libs/glibc-2.14
-	!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 )
-	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	terminal? ( media-fonts/unifont[utils(+)] )
-	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-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
-
-	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)
-		$(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
-
-		# 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-219-r2.ebuild b/sys-apps/systemd/systemd-219-r2.ebuild
index 3916cb5b1dc7..98cd7773b08e 100644
--- a/sys-apps/systemd/systemd-219-r2.ebuild
+++ b/sys-apps/systemd/systemd-219-r2.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-219-r2.ebuild,v 1.2 2015/04/08 18:27:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-219-r2.ebuild,v 1.3 2015/04/18 23:54:18 floppym Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ 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= )
@@ -68,7 +69,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/baselayout-2.2
 	!sys-auth/nss-myhostname
-	!<sys-libs/glibc-2.14
 	!sys-fs/eudev
 	!sys-fs/udev"
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index edf705430420..16b29ef99ad3 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.163 2015/04/13 06:53:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.164 2015/04/18 23:54:18 floppym Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ 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= )
@@ -75,7 +76,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/baselayout-2.2
 	!sys-auth/nss-myhostname
-	!<sys-libs/glibc-2.14
 	!sys-fs/eudev
 	!sys-fs/udev"
 
-- 
2.26.2