gentoo resync : 21.12.2017

21 files changed, 24 insertions, 217 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e2c2043cdb82..76556be82ab1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index dc52eedb1ceb..8aa989273b74 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -14,6 +14,6 @@ DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0
 EBUILD coreutils-8.25.ebuild 5839 BLAKE2B 118fc33f8b2ce4dcb1b797af0630e3aa6ba45f491d220a700841f53201578afabb3088ad06552080a42137db7ff9d930c25d232d4c71b082c0e1e16f5d732348 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816
 EBUILD coreutils-8.26.ebuild 5858 BLAKE2B 9247499208fc8e9155b0b107dea5cd99b7e1da3ebc55c2cac9c25c4939d7a522afb8de33398169635c678fae8a0f58ee981d9542074e47aa0a6fe56041ae478e SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14
 EBUILD coreutils-8.27.ebuild 5901 BLAKE2B e15c043848f33eb817f0237b1428928feb5063b2b2e553667aff0b7ed5b81062fcb8e078d4419da2c6196de56d5dfeab7a849ee25afa4bdc80109f90d43c508a SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd
-EBUILD coreutils-8.28-r1.ebuild 6508 BLAKE2B 30c3d10da690ce5eb0897a1059d78b458fd56aeaea28eb6e201f4692f8196f2938686a6a42d4d21cb04e0d4f41a9516e260663d3f296af0ab767185da965ef0c SHA512 89adbeec0763f0367fe1bf80ebf209e9aa43c42653e32be0ba15e4082f3353b5e4cb5c0f1c1f071e4f37e129298058419f0b47913b4a95ff94c68ed6c02a2961
+EBUILD coreutils-8.28-r1.ebuild 6515 BLAKE2B 3606829ba8114acc46846d88afe3d920f8d8d03e0f0c6b593fecefe16c52315b1b70d8f15f53b32261c2a982ba0547d9ef7d1ea3c7b50d82c94bb817676a41a9 SHA512 711c49a01e6bee174343c386b8ebc1683ce83b79ee174307f2aefe4ccf3db70995135abeddbb9804105d2c9f86346ba12f472f337f43be48d03cfd94ddfd5973
 EBUILD coreutils-8.28.ebuild 5871 BLAKE2B de4df961f1615d7acec165054e2118b81eb091d09ba7bdb773bb6592234643312713d78d09ad9def4cea37e0f41618426b089e4b5f4e9f14f95d751f1f90cc4b SHA512 e3f725bf850b21e6881465b29dca4984dc61a6cf0efc24f7c5ae970142cee83cdfd3fd1a8a8ab8801a66d99e40acffe655c6739c4c026c5c2deebdc19abd58bf
 MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
index 8d2c94faa377..f573676eb9c4 100644
--- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 7a77dfbb9cc9..8f90140ee0dd 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -3,4 +3,4 @@ DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e5223
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 EBUILD i2c-tools-3.1.1-r1.ebuild 1431 BLAKE2B 9e345a8bcc8122c6e5dc1dc08ce5e3278c682d35725d03ed92d1ca5650f92e6d24e9fc7b8419271f155ca440b538838969a3ed7b038cbd9d6616f1ab736b1343 SHA512 03b8a80f90970877019cc27d519e535fb7478d636603b937a63f375b3c7ed8264bf975bc3640541afbe02ca7f0de7e226940f6a0f6ab4a7f9d54f2fc02efc564
 EBUILD i2c-tools-4.0.ebuild 1400 BLAKE2B 3e8316aec0396172e0b3626f888fb4789eb36916592f085fb23148d893efdea13b2d82bd28ba0682390718c7a17e3ca2d1a16cbcb89e0118602a5b4e2e61581c SHA512 9cc0e3bf449c75a7502e384337912390cb66af15bb1ee51b64a76deffd7fa5b596c040eca9d6c88275e961a2862760d8531ecc268c6174ba082ad3646042da9d
-MISC metadata.xml 214 BLAKE2B d6d548e131d54a9e13f05d269df0bf13b142967950b365aa52a37bec3a03ed97774f1ec27bf59d54457cd1903475f4f84c144256f5a96643a0bbd1c20714930a SHA512 ae2a716aa849a3e9bd264007acc830ed4ee3c3acd1fc76ed1a60c683e248bded6aeefa174f04d70f0a7705c57bbd1e1ca44fd975f140c12de415381702d8df43
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/i2c-tools/metadata.xml b/sys-apps/i2c-tools/metadata.xml
index 65aa159cc0c9..6f49eba8f496 100644
--- a/sys-apps/i2c-tools/metadata.xml
+++ b/sys-apps/i2c-tools/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-	<email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/iotools/Manifest b/sys-apps/iotools/Manifest
index f701c41bd3fe..712cfdc16ae4 100644
--- a/sys-apps/iotools/Manifest
+++ b/sys-apps/iotools/Manifest
@@ -1,7 +1,5 @@
 AUX iotools-1.4-cpuid-pic.patch 617 BLAKE2B 535b1d1e9f012fbc7800af8480e95659cfe777debcb9995a2ede15e5cccf011c701e6625cac15669018bab9e9487bcc25f199233a8745c3d7ab756e603fcb375 SHA512 81c9f1d20fa87b847e5c49909639d35b604a991f7a87077a1b8e5fe36707d9e24289f861d6ce9468de5621e84adedc60f76086cacafc67aa2d1b9aa5f52ba364
 AUX iotools-1.4-ldflags.patch 302 BLAKE2B 73878bce4f26010b3c09bdf57c253edd032536d4baab86590d50fd8ac2741a3b2a31fd8eb4ffc76882f666039c6ebc7acc93b55df0e09486d02134b1d3892d00 SHA512 bc20c64b46f5e6fd6526e4a3fb9ce4e6817b6f4c66330d5c5ea721a5be55410603c16898162b9be41ed607cd4287e6bc187deadb83aeb1a813aeceaf88258ce0
-DIST iotools-1.4.tar.gz 22217 BLAKE2B 71edca870ccdd645a39d385790e0adffe8b1da6d1f09c9c4d2e7169b6bfb9bde2d9554b3b3b789cac1749b93e9468fe430a983005e28862c6636c86d2b0c953a SHA512 10b5f5c4183fb78900c254359b1d40d681519d4b0a79d10795c44d6f1691d73b93d02ede57cf84b5bac67e6083bc5a0de45c464caccbad8b2127a2c53cd7e94b
 DIST iotools-1.5.tar.gz 23422 BLAKE2B 7d647a32e0289e6b85055252eb6ccf9bdb71b99ebdec7e0c1de0d60157c7401e462a07422e0dd25fb3aec42744be981cd927a4c359b577a764acef331bd42bbe SHA512 d298343ee814c8b7d8404bc6af4050df730e89963a7c53798b3d251e94fd2b13e04c36e6da7ec5fd4126ea3a961be26a937910f791844e1b1d5b7dc5aa638c44
-EBUILD iotools-1.4.ebuild 1743 BLAKE2B 667974deeeba25b00e8a1b457f1da66b690a5860ed3594869b37e0fc35b01a4c6a0b583e74ef1007133f9595cf75f225b50f493adf2e8a3bb639a30b04999ec1 SHA512 df07fb30bff57c4e445cba8d08b308dd88cdeb5a0e66a862a6e667b4b037953773ab194edf7c2e663e61cb255107cd294224fc67c37282f6d34adf5af3b6f4d2
 EBUILD iotools-1.5.ebuild 1896 BLAKE2B 74f6f32431484f95a5fcb3647f16bdd472d22cd124fa18838bfa3a66c0b3b9972bbc0a916760088c4ccf33273e3ae7f150dfdeac47dcfa832e28136c83acaf18 SHA512 befe48aa95a4d6d177d0fd2ea8a3e967bb37ae1f39bf4f46d5977304119ea35e3346d79c73ee1a475b48089b71e6b43d96e33eb78c79ab17921cef913657bdef
-MISC metadata.xml 344 BLAKE2B 6ca1345cfd9846d23d5f08b9e434734b3005b4f0b729aa9fca4ff61bcb03745b1eb91131b818afb4ad81c96743f569ee4be92c8556c07b6f3b7a20d347850490 SHA512 0049857d3084683775560f15a40b51ec3dfec0cbec0918b3eb305b1b6c6ae07114eee1f1bee9fcffd2ed3aed5c329ced039ac3a41da8ecb16a3a627f9588eff8
+MISC metadata.xml 296 BLAKE2B dd62d3a71a69f58d9c971d17dcc8f3859665b2ad03a6adcb2242c7c58ecd39924478d40f86c8727aa617d2a7957fb5991679d585c4f3ed24278925116789ef91 SHA512 97eee413fc6356dd0c9a7f0eb32bd9a6c9593a0632dc9975ee70b0ef903dfbc2f75538144c0914b70f2a74bcf1ab6ecfd08fb505403a9c5745c243feaf831c73
diff --git a/sys-apps/iotools/iotools-1.4.ebuild b/sys-apps/iotools/iotools-1.4.ebuild
deleted file mode 100644
index 4b470a70670e..000000000000
--- a/sys-apps/iotools/iotools-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Simple commands to access hardware device registers"
-HOMEPAGE="https://code.google.com/p/iotools/"
-SRC_URI="https://iotools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static make-symlinks"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cpuid-pic.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	sed -i 's:-Werror::' Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		STATIC=$(usex static 1 0) \
-		IOTOOLS_DEBUG="${CFLAGS}"
-}
-
-src_install() {
-	dosbin iotools
-
-	# Note: This is done manually because invoking the iotools binary
-	# when cross-compiling will likely fail.
-	local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 rdmsr rdtsc runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock wrmsr xor"
-	if ! tc-is-cross-compiler ; then
-		local check_cmds=$(echo $(./iotools --list-cmds 2>/dev/null | grep '^  ' | LC_ALL=C sort))
-		if [[ ${known_cmds} != "${check_cmds:-${known_cmds}}" ]] ; then
-			eerror "known_cmds = ${known_cmds}"
-			eerror "check_cmds = ${check_cmds}"
-			die "need to update known_cmds cache in the ebuild"
-		fi
-	fi
-
-	if use make-symlinks ; then
-		local cmd
-		for cmd in ${known_cmds} ; do
-			dosym iotools /usr/sbin/${cmd}
-		done
-	fi
-}
diff --git a/sys-apps/iotools/metadata.xml b/sys-apps/iotools/metadata.xml
index dde53cf2f5ed..c4098c5336c7 100644
--- a/sys-apps/iotools/metadata.xml
+++ b/sys-apps/iotools/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
  <flag name="make-symlinks">Generate sub-command symlinks to iotools -- note that a lot are simple like "xor"</flag>
 </use>
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index ea427960a347..e05923da612e 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,11 +1,10 @@
-AUX nix-1.11.14-glibc-2.26.patch 730 BLAKE2B 8c1cf99c8606553800c5d30971919e97d9d951ceaf6b3e710d32bca68db6103bbfc734eb0e9f8179c7347f929d1c67a1a6e116d71545d9de3dd8230489186789 SHA512 2caae0b32f4be3a8b535e784628d4fc878645198adaa0d5440d768dc01cd3a7e43b11323eb75244d719b2eba0256c80415dcf081cbb05dcbb8250021106e95db
 AUX nix-1.11.6-per-user.patch 554 BLAKE2B c56fcbc5154a315cdb87827a4f0aaa2991903f149608ef5168e2b26932802a9d466e41ee673ffbaf23d3ccd0292fce6a8a3d5fe91d4c4aa891cd8a750725ac17 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a
 AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655dcc5ad9e342618f9c79dc1feccd1caae594fec82a5ec50a000d0ae57236c8d6bd5fde4baf45f3bdf48f717599b987fd3d6b SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6
 AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf447dce57677e1fbe7d4abc40a506397c3962fbbdb38e0e01342380115d011ace02cb10f97219a7ccd3cb92da993a79fc25 SHA512 aefc9b045794038b6513211ecaf18c469b7aa52110fcaa5168a1ca9f9af9b663aa6e90fe27c3c500bf9adc2714a8f73fc5243f3096fabe6bbb7e855e0ae7aa87
 AUX nix-1.11.6-systemd.patch 394 BLAKE2B 9ea08e8edf9833354d33d8f857d0def1f062d3ae4f9baeda03802f4b8c7c99d6a07002137d6674c72eed0337b35be354af83b03a4ee5fff36d2fbb62f5647b3f SHA512 a5f39652c7fd829f11e75b1e3640a218129cac8a47c15a34b0390f51234fda45b7841e43ec6ed441803405483750ee6b82e7c3f918d22222d1e08a79e359c5dd
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
-DIST nix-1.11.14.tar.xz 632260 BLAKE2B 5ee239aca547a8918c574dbdc6f1276dff1b66f83c89f85c23f242551a6e6784e2bdc4fcfce327395df7628148409ab13954b6eb78710325bc04c370d401ea82 SHA512 48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca SHA512 449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
-EBUILD nix-1.11.14.ebuild 3143 BLAKE2B 9c10286b24d60693a4f09917d13752362bb887e4d949ce67b5d2348f0f3ffeb097b02e2f171cddae76842834c72f936ff4cb4250be9f77cc7d7bb98e2dd84eb3 SHA512 f7921c26693cacc9c049013592f048fe4d48f2b728b5cee4db91344e4d7057dc5e66194570059ac5cfc7610678b1012bde9eb82ac18d26e78a8189cb22421dee
+DIST nix-1.11.16.tar.xz 632440 BLAKE2B 0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834 SHA512 164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
 EBUILD nix-1.11.15.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
+EBUILD nix-1.11.16.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
deleted file mode 100644
index 44c995e3239e..000000000000
--- a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-'context' is no more after:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
-
-'ucontext_t' is the new name.
-diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc
-index 41b617d..695aaad 100644
---- a/src/libmain/stack.cc
-+++ b/src/libmain/stack.cc
-@@ -22,5 +22,5 @@ static void sigsegvHandler(int signo, siginfo_t * info, void * ctx)
- #if defined(__x86_64__) && defined(REG_RSP)
--    sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
-+    sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_RSP];
- #elif defined(REG_ESP)
--    sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_ESP];
-+    sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_ESP];
- #else
diff --git a/sys-apps/nix/nix-1.11.14.ebuild b/sys-apps/nix/nix-1.11.16.ebuild
index 55f0dba8e525..d4e616516f72 100644
--- a/sys-apps/nix/nix-1.11.14.ebuild
+++ b/sys-apps/nix/nix-1.11.16.ebuild
@@ -44,7 +44,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.6-per-user.patch
 	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.14-glibc-2.26.patch
 )
 
 DISABLE_AUTOFORMATTING=yes
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 48bfd8dacc91..e65d0ff94cbb 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,5 +1,3 @@
-AUX openrc-9999-msg-style.patch 2775 BLAKE2B 2334a7937f4876575bad5ad452bcbe3627b5283650f5b54ff35acf87daddb5811cdcd70286246a516b89cb4a1a2e67e02eda83e508021bc59ca31714e46f8683 SHA512 ffeaba677106929ed842d38b161a865a6b3bd26e4ed804bf922d7a1e3c749adbf23348a20ca1be44f41cc0abd7d113172f1865d29865f322e30fbac9f9b34cba
-AUX openrc-9999-pause.patch 825 BLAKE2B 569aa4e0d8c4aa043658625eb88f3c3afbaf8033e3dbf1575faf1302b56bf64768b6aac824ed0e980f6f4dbc5817c02a9ca8e4f925de63574c4d9a21b9bb43a7 SHA512 ebab7434c5e1b76b882d99d45069de33da07230c9fa9bf28212b18c2742d726aff7be62907964cad9c37b483c25d805dc07d0c5927349f8104fef2f957e69943
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93
diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch
deleted file mode 100644
index ac325bb79bcf..000000000000
--- a/sys-apps/openrc/files/openrc-9999-msg-style.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 01:48:19 -0400
-Subject: [PATCH] restore old e* func output
-
-Gentoo has always used the sytle:
- * moo ...                [ ok ]
-Latest openrc now does:
-* moo...                    [ok]
-
-Realistically, 4 spaces out of 80 on reduced terminals doesn't make any
-sort of realistic difference and it's been just fine for the last 10
-years, so keep the default behavior.
----
- src/libeinfo/libeinfo.c |   15 ++++++---------
- 1 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
-index 8a7613c..234b1af 100644
---- a/src/libeinfo/libeinfo.c
-+++ b/src/libeinfo/libeinfo.c
-@@ -643,7 +643,7 @@ static int EINFO_PRINTF(3, 0)
- 		fprintf(f, "\n");
- 	if (_eprefix)
- 		fprintf(f, "%s%s%s|", _ecolor(f, color), _eprefix, _ecolor(f, ECOLOR_NORMAL));
--	fprintf(f, "%s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
-+	fprintf(f, " %s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL));
- 	retval += _eindent(f);
- 	va_copy(ap, va);
- 	retval += vfprintf(f, fmt, ap) + 3;
-@@ -800,7 +800,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
- 	va_start(ap, fmt);
- 	retval = _einfovn(fmt, ap);
- 	va_end(ap);
--	retval += printf("...");
-+	retval += printf(" ...");
- 	if (colour_terminal(stdout))
- 		retval += printf("\n");
- 	LASTCMD("ebegin");
-@@ -817,7 +817,7 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
- 	if (!msg)
- 		return;
- 
--	cols = get_term_columns(fp) - (strlen(msg) + 3);
-+	cols = get_term_columns(fp) - (strlen(msg) + 5);
- 
- 	/* cons25 is special - we need to remove one char, otherwise things
- 	 * do not align properly at all. */
-@@ -831,18 +831,15 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
- 	if (term_is_cons25)
- 		cols--;
- 
--	/* If extra spacing is required around msg, then please change
--	 * via a runtime knob and leave this default as is as it saves 2 
--	 * valuable columns when running on 80 column screens. */
- 	if (cols > 0 && colour_terminal(fp)) {
--		fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
-+		fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
- 		    ecolor(ECOLOR_BRACKET), ecolor(color), msg,
- 		    ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
- 	} else {
- 		if (col > 0)
- 			for (i = 0; i < cols - col; i++)
- 				fprintf(fp, " ");
--		fprintf(fp, " [%s]\n", msg);
-+		fprintf(fp, " [ %s ]\n", msg);
- 	}
- }
- 
-@@ -1030,7 +1027,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
- 
- 	va_start(ap, fmt);
- 	retval = _einfovn(fmt, ap);
--	retval += printf("...");
-+	retval += printf(" ...");
- 	if (colour_terminal(stdout))
- 		retval += printf("\n");
- 	va_end(ap);
--- 
-1.6.6.rc3
-
diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch
deleted file mode 100644
index bf2c94f8dbec..000000000000
--- a/sys-apps/openrc/files/openrc-9999-pause.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 21 Dec 2009 09:02:35 -0500
-Subject: [PATCH] restore init.d pause option
-
----
- src/rc/runscript.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/rc/runscript.c b/src/rc/runscript.c
-index 5939dae..7147902 100644
---- a/src/rc/runscript.c
-+++ b/src/rc/runscript.c
-@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv)
- 			prefix = NULL;
- 			retval = svc_exec("status", NULL);
- 		} else {
-+			if (strcmp(optarg, "pause") == 0) {
-+				ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
-+				deps = false;
-+				optarg = "stop";
-+			}
-+
- 			if (strcmp(optarg, "conditionalrestart") == 0 ||
- 			    strcmp(optarg, "condrestart") == 0)
- 			{
--- 
-1.6.6.rc3
-
diff --git a/sys-apps/superiotool/Manifest b/sys-apps/superiotool/Manifest
index 36dc0d078e55..384b5e481b44 100644
--- a/sys-apps/superiotool/Manifest
+++ b/sys-apps/superiotool/Manifest
@@ -2,4 +2,4 @@ AUX make-tarball.sh 671 BLAKE2B c293d0c6fff141bf6b82f15772b6dfe2faf15189ee95618c
 DIST superiotool-6637.tar.xz 27364 BLAKE2B be0fd054f1385c20ca1d3da04052f7155da77211c1a4253c58c0ee272944e4134b1df6213934ea0ab6c297da9ab09ceab1cc00dcd775633d7ba50f46cba8ffb8 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd
 EBUILD superiotool-6637.ebuild 870 BLAKE2B 42c4c647cb2c5da453b5ea74aa0e07362e6fe88303f11ba5fa3a6bf425fc567c3d9e8767ede790f7e872693b1c3826109565713dcf2fa5fe5ce03684368b4d31 SHA512 d925d93c6022d78c9784fb8aa42abf8213cb1196d1fa044ee2949fb1abb5b0a6981ee63ef23cf2760202ed1272e1a55ae81f0bb6111d59139b34278e4664369e
 EBUILD superiotool-99999999.ebuild 870 BLAKE2B 42c4c647cb2c5da453b5ea74aa0e07362e6fe88303f11ba5fa3a6bf425fc567c3d9e8767ede790f7e872693b1c3826109565713dcf2fa5fe5ce03684368b4d31 SHA512 d925d93c6022d78c9784fb8aa42abf8213cb1196d1fa044ee2949fb1abb5b0a6981ee63ef23cf2760202ed1272e1a55ae81f0bb6111d59139b34278e4664369e
-MISC metadata.xml 322 BLAKE2B 7db639cd43d36f1d29c872b19955ce7496eca2ceed7cd62525bb92b13e110b594d4906036830dec86ea4b3a74bb79b69f6a89177514a514114f5d698f41f3b69 SHA512 b10b11adf9b11f1a01a62a9968a99ced6a5b5744ca65967e0d0cea6d30ff0b84a8b84c720eb0362f4963d42daebc9fbe6e2540d9c972f48561a29f3efb27ca43
+MISC metadata.xml 272 BLAKE2B b1f1373c890209182d778d37db138a8a3339291ea771b0c43fb0e8a5132be8ae5a1ce2c568a0c1681b1db3552171f245349f2ef8a444baa0a94665b43c3a977b SHA512 15fd97d4decf5c3eab9627fd4bcee131349a22194aef6670e398c1eb0876504284531257de990f36b86c3a046454fe7eedc2f2698aea522ad30451337367c18a
diff --git a/sys-apps/superiotool/metadata.xml b/sys-apps/superiotool/metadata.xml
index 27a49c3348c6..3d1af92d107c 100644
--- a/sys-apps/superiotool/metadata.xml
+++ b/sys-apps/superiotool/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="pci">Support for PCI-attached "Super I/Os" (e.g. in VIA VT82686A/B).</flag>
 	</use>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index f2542013df03..cb420409d8b6 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,8 +14,8 @@ DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c8
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
-EBUILD systemd-233-r6.ebuild 13389 BLAKE2B e0a359f8ca505fc1033951ed7905ac52877ebdf162d27dc15f7c307b2b55471f76bfd97aab92fe5b67a6f1fe55f34c8b14a76057ede2b6e9e5cfa65bda847cd5 SHA512 ad74871cfb5a6f91630ea8018598d5470f881bfcd58baf955c376134c9b5b9321766f749fbbdd58c9438f6ccead3806e3bb243abaa18b53533b5a5bd68eaafe9
-EBUILD systemd-235-r1.ebuild 13481 BLAKE2B be0a0674aa5a9c151e03311a5e0ea50f6c879cf3ae9bbbbf49eb6a2f9ad8bea5fe65c113583006d69c60b703311881d5038ff79ede1bf91dff3fbd4c856714a3 SHA512 11245b058f3dea86cef8cd852b5cc59ede421c552e4a7e0d22a2666e87bc33e14df68e0029d169dc3f4189d3d25d8e0147eec20d48d9a2f3cc0b9c3c96ab8e99
-EBUILD systemd-236-r1.ebuild 12901 BLAKE2B 844d54ebf0433be199fa6256d44d824b0441492e4a389f38b3258bcd771822ff9da5a44505a62500141e15c4af00cbaa8c8e79f118327fc9764bcb318ca45f10 SHA512 a48be5f69543f34babf5ec2126b0f1426c2a95429779155841d374c9d298b6f74333fe222aacd2b93ead37ef9092b3f95542fe1de8285c353cbbf36f7a528cd4
-EBUILD systemd-9999.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c
+EBUILD systemd-233-r6.ebuild 13392 BLAKE2B 32479fa5e8efd68aeb4bad5fc969fcd3cc2932d6c6e8f878794849e9416f5fe6b1b5cd077eee0e2feed22ebda8b82a2bdc2cf2f7622ef621f74450aa6653cb1f SHA512 92f451967acfd228c6262f32419b7d0d171928c11ec96aa551b5340445641ac4760a7608cd1741e18a624ef182674740273d14d071e3302dd00f07fca0812c59
+EBUILD systemd-235-r1.ebuild 13484 BLAKE2B 9a037516042b6d8527b1eb4fd248883112b605563ef01492a3ffd98b39d0e51092656824677d46d13e48c4f36ddf5f1d30e3866821bc93ee2b581caa52b71cdc SHA512 76d568a6a97965d9bf38c5e5409da1db6fedde7186f3cebca5a19cfc5b27ce2d711d99cdadefd92630887d4254e87b0355310bb865c122e958b817dc52d8df37
+EBUILD systemd-236-r1.ebuild 12905 BLAKE2B 1399a68779188d424f1f1232ac530f04ecc0c65e94d8e859418a8819c4c91fae800582d71624a24deecb1dc5733776eba67de5f2536306e11bfc2d3fd58b3c06 SHA512 e2ff9d00e3940d24761363c67a83f83264fc0fd3a3ff0e64940932f64c4f996b00cf5f6f9c16765d5eec0afd8d3096619212e6a30547d5a560da3721ddc9123f
+EBUILD systemd-9999.ebuild 12821 BLAKE2B 20927186d7ea6bc4a734e9e15d2536ed13a07ab76d95a6e38ad31d366ff78de1c6a7e84b7082af311392e4b38fc0d9e53ec1e5ea225647d3f5e4b18d4bfa868e SHA512 7b1b08bda5299f584db913893a2d90e66aa08bc9df19343202c8847399813e89782de78ea208a9082155a07194da9c9e360cf24243f0459c13c16680dc3142ec
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index de147be79bd2..697bda043aac 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -57,9 +57,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
 	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(-)] )"
diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index a83897f709fe..1175508fe8db 100644
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -59,9 +59,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
 	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(-)] )"
diff --git a/sys-apps/systemd/systemd-236-r1.ebuild b/sys-apps/systemd/systemd-236-r1.ebuild
index e70e61f3fc5f..d0d9d387688a 100644
--- a/sys-apps/systemd/systemd-236-r1.ebuild
+++ b/sys-apps/systemd/systemd-236-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -57,9 +57,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
 	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(-)] )"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8142a96390ba..f8eb096a861c 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -57,9 +57,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
 	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(-)] )"