gentoo resync : 10.04.2018

18 files changed, 12 insertions, 292 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0ca74b054568..88e619fd8ac5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index e44c0328f19f..c2ac7ab8e31b 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,5 +1,3 @@
-AUX busybox-1.19.0-bb.patch 908 BLAKE2B fa4db200bcfa7d4a650c98157b02ca119348d2a28503f2538246787783dc0544678f4cb9c369406958a9b0b1ecf9dc838a5e6cf3053aa782de1055df4b586ba2 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c
-AUX busybox-1.25.1-setfiles.patch 1153 BLAKE2B 3f7b2bbbc97e36908ae2045bdebc17fc1ebdefa7e4c134ef35e7e1a56df143eafed69cb0eff5713a41bac88cb09652dc6e39cce96d9d990091de1636397dff52 SHA512 2b3b4aba3be49437b1875ce00887e385abae275cc269ca0e80af797a6a6acfa2f20ea4bcf195e67490d8fe691c1ca7493adbf7e097bd4f6f0e1d7e07e493dca4
 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
 AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f
diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sys-apps/busybox/files/busybox-1.19.0-bb.patch
deleted file mode 100644
index a66b45a5e21d..000000000000
--- a/sys-apps/busybox/files/busybox-1.19.0-bb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -75,6 +75,8 @@
- //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
- //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh))
- //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash))
-+//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
-+//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
- 
- //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
- //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7255,6 +7255,8 @@
- 		}
- 		/* re-exec ourselves with the new arguments */
- 		execve(bb_busybox_exec_path, argv, envp);
-+		execve("/bin/busybox.static", argv, envp);
-+		execve("/bin/busybox", argv, envp);
- 		/* If they called chroot or otherwise made the binary no longer
- 		 * executable, fall through */
- 	}
diff --git a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
deleted file mode 100644
index 3a5f5ed9d3a6..000000000000
--- a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c1704a34745f8e49373eb2cbe1c83199ab2d0091 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 9 Dec 2016 18:14:12 -0500
-Subject: [PATCH] setfiles: fix build failure after common_bufsiz change
-
-Commit 47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 ("*: add most of the
-required setup_common_bufsiz() calls") switched this tool over to use
-the common_bufsiz logic but missed including the header leading to a
-build failure when enabled:
-selinux/setfiles.c:80:30: error: 'bb_common_bufsiz1' undeclared (first use in this function)
-
-URL: https://bugs.gentoo.org/600106
-Reported-by: Jonas Jelten <jj@stusta.net>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-(cherry picked from commit 1cda8790803a6fb072375c8fa53273333d2d4607)
----
- selinux/setfiles.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/selinux/setfiles.c b/selinux/setfiles.c
-index 51a7e63bd741..d8083d4fd580 100644
---- a/selinux/setfiles.c
-+++ b/selinux/setfiles.c
-@@ -46,6 +46,7 @@
- //usage:     "\n		if it has changed"
- 
- #include "libbb.h"
-+#include "common_bufsiz.h"
- #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
- #include <sepol/sepol.h>
- #endif
--- 
-2.11.0.rc2
-
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4d1c87826a06..8a79bb306873 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,7 +6,7 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
 EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
-EBUILD dbus-1.10.24.ebuild 7391 BLAKE2B 237466089757fac53d7ecde2b9b59da724de97f52212c0c26fc56480fd82b75000e081a4d1c75023fbc0ed852f82770b8c8139a80fba674f5529e3df88bd06f8 SHA512 a5f6e53e3f5e0115efae2189194dd26e8259290ca27e47f34c5c4cb11efaa7e47cc7ce5fe54c8bf1d9638cf46157182ef39b9ed2f10f3d456e93777c8113b65e
+EBUILD dbus-1.10.24.ebuild 7390 BLAKE2B 70fb7ff68fb36d370fb47c3d6fa20e569b085ac0a845e60ff73fef7c25bd01602d6a4df884ef704d07516822b694f9792a2a1a77e10f4b03f49c3c24df13f6db SHA512 be83ab3778c77c7ca61d82a03f660e75ef512993f80437a455820cb93113ab46bac0c13ba07463a2ca6d68531d5868c276f9fef9f5ba72f8831056faf35f7d82
 EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index 52f0e9e46ae9..7a299357cfe7 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 #RESTRICT="test"
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index c730d080d507..7a32a4482098 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,6 +13,6 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 4083 BLAKE2B b26320ec505c5fc1b276587e6a0daf60b2a69bbcf74766b05b14085c53d412a450f19ef38cadb5d1f492512ed6c8b785156c4a64eb1150a00e6455f96e5ad84d SHA512 4328d4644c9e6d4ef6737ef590183338bf9cd8b0c04e7d537338335bb51b700211239d85fa72b042dd70c40a9d3a83f7dbae3e3813dbdadccd636db41125235b
+EBUILD man-1.6g-r1.ebuild 4082 BLAKE2B 0dceb9ace2bff5ffacb2f228dd0dc3acffcca45d94ef378c0a9b815470ddd9888a035bf40393685aa14f451ff514b1e2784c15ccc2df85be0ccde2766ddf5d23 SHA512 8361230bf3af75ed8f18885c31e2eb560e555607bbceeaaaed997df1d8cb85ac86cabfd7848a322871d6e06e7872e02fe08da8af2d111c35b124e54357c36ab3
 EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index 1a296cf7f7f5..0a36b29819f2 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index 4c818651899b..ec64f9625461 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -3,6 +3,6 @@ AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789e
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
 EBUILD rename-1.3-r1.ebuild 909 BLAKE2B f19745cd4b9de20bd1cb205c85931fba29c41cf8045acb6891769bb2a723bb0a2cd96e0ed96ebe5c77ef31ba6265716ec47b5c567b96c2b77f48c37309b6f45d SHA512 cf894e062fb1d57cd665a688e89dcc9c8d18e67c1eea970137399e9926d43dc61731b48acd930cb9f0f54979fc0ccb52c4a55839bb861dfe83f793bc6529e3a7
-EBUILD rename-1.3-r2.ebuild 905 BLAKE2B 276d71be1ab6b177e5e662c4106bd33a671580394a131b15a42d06fb37aedf1ea910c52e7a6d9a20e87aea79377ba780e58a3be130f89b93e5fbb536344270cf SHA512 e2024c90996ee49fd1aaa88969eaefe66cbd5c886c554e6d6fd2b78f5ae0a2c8e1fe7d178333e08a6c45b9f51c272e9a3cdd960e0dcea6236a147922c39db63f
+EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
 EBUILD rename-1.3.ebuild 901 BLAKE2B eae1572c51512e69f94795274c6502b57fa620f9eb91f85ff7eed79180021150e31278b53f4591d42ca6e2c23d0e45757401db8d11c345c6b1223f9921461c99 SHA512 494884b7cd285c34c5ae6139b3c93a3a6e42051a9431be5437a46d06ecc4ab9605f2752e6003f10c9103859edfa2e89d8bdc8266862b485ce890f608f1b6e269
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index d988da6c61ad..fc964811bd6b 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 MY_PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 919048d8c285..c069b1c6a9ce 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -3,6 +3,6 @@ DIST rescan-scsi-bus.sh-1.56 22469 BLAKE2B 132ce0990f742ad3f25bf7c30cb9ce1b8392a
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
 EBUILD rescan-scsi-bus-1.29.ebuild 966 BLAKE2B 71850e34810b2bdd6c79111b2ec0cdf650b31f00558733374e4154a9f4be5c8c0fce95d0835c24c221615bc69d2dc2eef60c0f1acd97b7ebb61f86cf3b2838fe SHA512 6e6248190eee9883982498adcec9fd3a9cdda60a4197f98dff774d2ae6e4803f480cbda05d76e18de72fd1d843c74f086bb367c46ee825d0e281d821366b8be4
 EBUILD rescan-scsi-bus-1.56.ebuild 982 BLAKE2B 4d47db4dc6feee760a17e1e0a77c1da67431155ce23040e0101658978a043632c0c6fb22d268eb0c52ebf2dabaf514cb3d3a71079ddbfb77cbfdcae8a0573046 SHA512 1637009072361ca505628049144bd36e017e18aa48da739e42b518a09435d5e4283a9a35b226c07c02552441dd1568cfb820ca82d1dd793b88bd33dc5da6e03f
-EBUILD rescan-scsi-bus-1.57-r1.ebuild 871 BLAKE2B eded0ae52c898b5ed74b404d91a6a969b433c3fccd53e3f73086e3f3c8ef38aeb7c5a85cb0f42f8d0b76e848314f940cf170a94f5c7d5ad2e05492fa2441f116 SHA512 52d9d151e605f26f322a4250f39b10bff29b68e49432e527717ace3718d91237c8fb8e0a6632f97394f08376bf6dbf766cae0250259730ac978d311da6ccef99
+EBUILD rescan-scsi-bus-1.57-r1.ebuild 846 BLAKE2B 1db18aaa70ad4d3e8c1b21d2a1e39beee2467c1e8390cea17fb9e27c9b20f187b600460d88f3d770cdcdacca0160763c4744ac222a0c34584b34da5195b6ecb4 SHA512 12cdf6f4b80bb3e41ded7ef9c8ec33ce0fd11a6034ee6b47a2f929440c8d172ecc8c8bf9a70e96aac12d2ffb5ecc6eab8469af2115a135092b7deedec7f408b4
 EBUILD rescan-scsi-bus-1.57.ebuild 828 BLAKE2B 55753ce796f8bdc714a8c11cf7116ab9d5941234b0cd45d85e5d4318b3d0c5b7d3fb2feadb40e2a811a32d78a0637f62c9657540f69b23c6acfb929c59afd682 SHA512 52e3b43135892e7ec92e94b35704b99b53843c18e113ed326e8aee782ce7a44a65db58693d09983ec74498b7072cfe77d8031c91b172ef609826e93a56a7d1d9
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
index 3f2cfb522833..e6a7cbf09cea 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" # alpha hppa ppc64 sparc
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=">=sys-apps/sg3_utils-1.24
 	app-admin/killproc
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 111dffde39cc..eb0234a5fa5e 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -7,5 +7,5 @@ AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2ad
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
 EBUILD setserial-2.17-r4.ebuild 1075 BLAKE2B 2472d28473658c27440e6535b294d5365be0549c34297bd61722289925ab8ea91d8c5208d7ffd251fdff024a50a2b76c865bd69109108a4c14443b62b5463425 SHA512 358e3802389eab9aa24edd99ca22cfa7c1e16dcd7ffeb8251d56c70a1b36993eb31c067edd9d669b5b8ce74c5786e53e5de6da76592a32c721a181d825123b14
-EBUILD setserial-2.17-r5.ebuild 951 BLAKE2B a6529756d8baa8977bbc666bb7a4ac94573018143fc07bd8f6a43b5baac655ec1fea996f4f91c464f94f3046419553d2622358cc1b33516e7289bede74e84f69 SHA512 a8abd5ae98440967244a3ab9e19325f5d733feb56e0b75ddbfb2df4cb8bda1a559eb33bca8dd59c62597a7cbf48ae153a0dcd8561a29a4e61d951c5bdae753e0
+EBUILD setserial-2.17-r5.ebuild 950 BLAKE2B 05476fa9e1c88f2804f87b47544d2a26b41add3c5ca0364970d4a299ceff5af684aab45cfebc8a389ed616298e0833895eee7d83e77daa06fb7780c3e4ae7cf1 SHA512 262e77337e085578c742cc7548e971aed5aac4c0188c29c78d8c6591a7d09025a1c35b0e6e9422b2c80b0a93e3a9df04bd89cd2287c31473944a91cf4f1d5d0a
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 972b31c332b2..2c6f9afc8f4e 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 81fd44b74c7d..ad8f03165658 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,9 +7,7 @@ AUX shadow-4.4-load_defaults.patch 1027 BLAKE2B 632c18631d1218bed95a043e89a2599f
 AUX shadow-4.4-prototypes.patch 1232 BLAKE2B 757a6db113b6873994dcacfd6867a14e7d35def2d4ba6749b887f28cf7278117722bda2c8b981e23694dafcc25d6f2d7cd9531aeb3d3eb597c9b822729678dc2 SHA512 970f79efaf77e91baa22049230f2a97e6a045f2f03ef846f4c35dc4f5702941e61db5b6544c24d112faafd6d516fc5054725039f28fe81e17926a5e8ef6f0432
 AUX shadow-4.4-su-snprintf.patch 849 BLAKE2B 62cb1498bd79991373b1bc8241a07dfcd731ebba7a39406958b30bd0287c8acab65a9a22bcee8ba95073e36c7a8d0b1931b988b4b5963041f61db9ef4c5dbdeb SHA512 2aaa1c847ec34002c6e63af66fb36664e0fc5dc0b719ab38959043f990e84191f5e2f85c2dc44e324abcfe67691c9a9b8181da49077031e2eaaf979dde95b2d9
 AUX shadow-4.5-CVE-2018-7169.patch 5778 BLAKE2B 59e06cda2d3b48d77548c22073f9c4ce018c16bdd128089ce6ae6d8eebe1ad9b73438530fb32b628bc5e72201852b7c452264a13707bcbfa826777b778a7b90b SHA512 fef082516e47ee4e3d9627916c47ffb8e1987580586639374d461b7b9d041370abe5b80dbbfacd4fd256a1bc2f9d23e0e71497298dd60ccd96d795811a13cd58
-DIST shadow-4.4.tar.gz 3706812 BLAKE2B b4dc056643ea507af975df68a1775193c942227aef4ff0d19fcc70392e5410da076d3cc9ad1c58082ec992f2aaa35037dd7de9e6563f783aaed96b2007055ab1 SHA512 c1e0f65a4fbd0f9d8de38e488b4a374cac5c476180e233269fc666988d9201c0dcc694605c5e54d54f81039c2e30c95b14c12f10adef749a45cc31f0b4b5d5a6
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
-EBUILD shadow-4.4-r2.ebuild 5484 BLAKE2B 988704357c01c35a2808b48c921c6de6ac6eb06429e6a35945263fba094caf8bddb0d4fed6ef236845f7983671dbee109d95a01f84703e7b4fc59a7fe26ce569 SHA512 8584c5805f4729a4ab42ccac22a558b0899258f9408cae4a9c5570f6b4ea7f9a969da92393ce456f1d5e2a5199bacbb5317f3433a7d41afb5b52e280493b0f56
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
 EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.4-r2.ebuild b/sys-apps/shadow/shadow-4.4-r2.ebuild
deleted file mode 100644
index 8226ece43369..000000000000
--- a/sys-apps/shadow/shadow-4.4-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils libtool pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-RDEPEND="acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	pam? ( virtual/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch
-	"${FILESDIR}"/${P}-su-snprintf.patch
-	"${FILESDIR}"/${P}-prototypes.patch
-	"${FILESDIR}"/${P}-load_defaults.patch
-	"${FILESDIR}"/${P}-CVE-2017-2616.patch #610804
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-	#eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-group-name-max-length \
-		--without-tcb \
-		--enable-shared=no \
-		--enable-static=yes \
-		$(use_with acl) \
-		$(use_with audit) \
-		$(use_with cracklib libcrack) \
-		$(use_with pam libpam) \
-		$(use_with skey) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		$(use_with elibc_glibc nscd) \
-		$(use_with xattr attr)
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=$1 val=$2
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	# move passwd to / to help recover broke systems #64441
-	mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-	dosym /bin/passwd /usr/bin/passwd
-
-	cd "${S}"
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chpasswd chgpasswd newusers; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chage chsh chfn \
-				 user{add,del,mod} group{add,del,mod} ; do
-			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
-		done
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}"
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 0c2c3bc0d950..e7173c147e70 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -6,4 +6,4 @@ DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c49506617
 EBUILD udevil-0.4.4-r1.ebuild 1922 BLAKE2B fdecab7535d5e4abce85d8ff584f825ba19879dd5470261f8954b311df119cfeb247760e4c5b3d7cf5195a4241ca6310b926af780e585ca3240df14093190bb0 SHA512 9ccb1b2e9fd377c02cedea8ee3e8bc7ee0b0ccf1647b733d34122969d24a284e40d251c3d0e294aeab1b830589d60621e793071e46d523bfe34ef12b5deacad9
 EBUILD udevil-0.4.4-r2.ebuild 1988 BLAKE2B 6e2cfb15a2a7d80fb125aae5577b166295f54aa770f7149b4153f34bd55b7b3f4577c91368de493265caea0df8fa4f935a7790210e013cd74d8ef72093552643 SHA512 6802bb465b172e4a42fad2366bcb4ae1ae05b0c48f772e0ca545df5ef8409ad21c1dad721a9838fea188e6ba4bb7e693d03f18fa73895d60074641ca1050ab8a
 EBUILD udevil-0.4.4-r3.ebuild 1989 BLAKE2B 4f021d1b6e6c63d3f3b2b66273116f1dee686116cc36018228976ae8e007dea465ebea76403eff70c584680b74539e57abcf6c76cf7b4a302bdaf76db68144e4 SHA512 dc1d1d46004a1633ecab5096383caa64e12df393ca79cc0688dbbbfbdb6bb55712435e3703d0970e387c494157bfe6085dc50b73f5ae7f440629f553d348c797
-MISC metadata.xml 464 BLAKE2B 0de226849a44b40e604638931073efd8ee15bacee1cb6c1d846f1653d945148ec4741e4c6272490de3fccfad802cffda0698d57ec430cb205a06413c4a1e362f SHA512 2ccec02caaa19626537a34923d6e9d87541c9f33cdd53b138a791025613b5d27ff2f3d3e05eeae23e5e4bc60c040d31c4e776171cdb82d9312de01d562e7cb90
+MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/metadata.xml b/sys-apps/udevil/metadata.xml
index 9fe353059626..b858b9360d90 100644
--- a/sys-apps/udevil/metadata.xml
+++ b/sys-apps/udevil/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ThyArmageddon+Gentoo@Gmail.com</email>
-		<name>Elijah El Lazkani</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">IgnorantGuru/udevil</remote-id>
 	</upstream>