gentoo resync : 19.07.2019

5 files changed, 8 insertions, 9 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 71f2d463071b..450fe874dbe2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -16,7 +16,7 @@ AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-EBUILD systemd-241-r4.ebuild 14022 BLAKE2B 673468293f5e17f4342b328f04328cbeff4e0a36c6c72c20a279c2cdd14f31c02d6488d0ad3e92cd95a48d0525c56e0c886522ff1ff8f4d6f2603ec5cd5f178d SHA512 1c92a1c62a282258be1bbb1086cd67a2c01c2b7793239a8bc6c5f01886984eaa65b84a9802efa76548b7cead099808f63168aebc85a4d7a941da9284bc86edd6
-EBUILD systemd-242-r6.ebuild 13934 BLAKE2B 49b1d29b1db73e622d25f3b3e451da57cca6abdb8e9a9c6afb24defd660c30d1842d6c61a86a844c9db7d5e17bb20de1a6c98b9f422efebf51b800b5202223e3 SHA512 caaad0318cab70e09eaf0bceb1aef00641ac721c8494aa756653fe8b50c4888d1407b182dd9ab98159dbd7b2d1a45b4165bd8f35768fae91b683cad20ea93016
-EBUILD systemd-9999.ebuild 13643 BLAKE2B 1651cf9850198e9b5222da34d5bbedbee838fe318bfc3eb752deed3164f10e6a8c4165d77458bef6c24234232d4bccccad44670b597e2c4e0ab30bdeac92df08 SHA512 5cac3833cbb0437878250df43050b2db5ddbd7792b75ff5cb79288f4d67d404df2ad66d7320d153ee056e4c730ec68a232b3b3ba720fc66cdae57798b2a7fa14
-MISC metadata.xml 2125 BLAKE2B fed24f3b56a79016c4df8554626c7ae67ff50f97adb9af809a726b226c52690642f9df71b22eab320d3964d764dec1439009d8b8bf6979e407a5704e843829d2 SHA512 414d069185451f72eb1e803da7019da8800b08eade46824620632d795007bdec0e9201af93bb895674e3c48907593062610eb2f22f20ac15d099a593b450b8de
+EBUILD systemd-241-r4.ebuild 14021 BLAKE2B 7a0014e7f02b50ceb4f9f415151d0b08e1ede30198878e5cacd53e7bf92004e91e1a2cda881c54b6ae2be01a461e6e4dea466981e0a936c485e222b84a562ece SHA512 d9fabf0ec0241798a68b8dbed4c3d228fa856f5f911e4b66aaa7fa7fa0e1a8576c36f55fd2adff11a97cb3e73ea9859d3e91a1562cb32e15c9c4bbc884b95256
+EBUILD systemd-242-r6.ebuild 13930 BLAKE2B 501db4acaa27994de0b9f2a6f426b9504182c55e63e7c23357a37c347fdfbda6198de5031fc8d9a0c4a4f97cc6ffb6eee2739fbf08b3f505d48337d6ac78d5b6 SHA512 b6d503bde38f2ea5f508a67cd7e004df49f09fa90f231d21eda13aad5f1ffcee5f4f7c17f8b7592c11266758a6c25a8e96d28448d9a3c83f9a18359921d36559
+EBUILD systemd-9999.ebuild 13642 BLAKE2B a9118840d6af75bb76094c91ae8ad93ed29ed516daf4a9bd34894a349dad5b3bd70fa5f4e670fb8267a263add1cf9e77d6f21bb5ea66caa69f455bf3e84f9bed SHA512 2c94c375ae8c765707f1e310dc7c984da60c615f0bc5ab84edb8edde4a558ae80be53f118c6ab7e18df94d02d4d76daedb35345263630e4af7cf3e97729c96e9
+MISC metadata.xml 2035 BLAKE2B e38c5ee2b2db699ff926aab596d880804b57650ca3fc8627d92f0188249070b445263c3fa82b8a08b0aafa9d7a295790299928e34ae87e327f1f5665a2380beb SHA512 73083a03ae004e5c6d85747a122d715e14a2e81776a2e5d12e82621d10a51ece1d183f302df8eab3cf3a0192e5348a79145aebf56f4eec1e5b2ca82f4a6ebd00
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index cdd607306209..05423b63bbdc 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -26,7 +26,6 @@
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
-		<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
 		<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
 		<flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag>
 	</use>
diff --git a/sys-apps/systemd/systemd-241-r4.ebuild b/sys-apps/systemd/systemd-241-r4.ebuild
index 9ea26e0dc874..1ace2cf3dc3b 100644
--- a/sys-apps/systemd/systemd-241-r4.ebuild
+++ b/sys-apps/systemd/systemd-241-r4.ebuild
@@ -23,7 +23,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 pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr ssl +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
index ee5c06d520ae..9ac1d4cb4722 100644
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ b/sys-apps/systemd/systemd-242-r6.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
@@ -23,7 +23,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 dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 27de1bc2e194..e0fd800a5e9c 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -23,7 +23,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 dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"