gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /sys-apps
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
157 files changed, 1477 insertions, 1165 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 669b6fdfb58d..d87ffda521e6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 97e307acdcf1..4df02dca42ab 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,5 @@
 DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-EBUILD acl-2.2.52-r1.ebuild 1377 BLAKE2B 8c134c96e96ea7970deb77a16edcc73d9171fcc71b6ddc417125062bb803c3e1064b23bcb31773d5536cfa2ba750765855fcb50531e91a6071c9fea9953b240c SHA512 d807c7634485af07d7255cce0ac3d876dc0df17e3b1e973e55d8ec3239d80851a622a3ec2c6c8e70caa648acb89c6fe0fd45c882289477346f11f48f282a1b99
-EBUILD acl-2.2.53.ebuild 1074 BLAKE2B 28a51d83257e314535b576b8c5b9d5c1764f7f4f3a6ce3a5f695df5625884d2a8252195425edaa1eb0a78946a82b51d627fef0123eaa6022636dd5521e963985 SHA512 64c946db86fd5d7eb9a9b5c50cef290407a535266dfdb31665e672b7b8af1c416d427fa304bfa68cdf60fa97ed75f79c1dabf814f88a9b530721799f0f3e2f6f
+EBUILD acl-2.2.52-r1.ebuild 1366 BLAKE2B 0dbd7ce9295161b38f7fddd2a51b65655ff6d1cc6b74cd54cd89fd718e1b341cb2203d6d0a2b70da113521e06c4129c643e183b91f16dc5c05502bf277f748fc SHA512 e4875dc5a44c5b0cd3b89fd93e0586630bc096c34cd340931ab18ff79d167490db44e10d104c16ef58af4e65699f34a828a3b064fa412f578ed7b37b6a68680e
+EBUILD acl-2.2.53.ebuild 1063 BLAKE2B 2740f8a727ac1976d693140b4efc5aa0a9875d6c96ab8bbcc01962d40a933e4361b8a88797d4716f4e4ef4f4b12d2feb19d3dc61807aa138876fd8083e2d637a SHA512 4416b3d2c2b6754c1229a7b902d38b17aa9fff95b1fb1f841e3f669f40cb7bcbe13a0fc812626658341288ebf00f470e124c1e6ccf451c61a0ce0da18b1f5d57
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 64fd600c0cc1..29c1de8c4242 100644
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 11b1ee043a3e..a9f1955a202f 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 8b7868d02745..0d72721a4b1a 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,7 +1,9 @@
 AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552004c7b7ce224898ffd8a362342703225e7015f896d2c97013194ea3a8e61768174265b42d6dc565187aaf1712062 SHA512 af131267a4cc22322df8234ce4abf8a27f917aeb801a423696a51f935ee40bf155206cf40b7f510849e1a276808502ab48ade0a520b3f06969c5df2415055fe1
+AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.47-r2.ebuild 1721 BLAKE2B 59cb46b36bdb2ad79feb1fb4249940f05fd9020580db49778cb7c64e3358b7f7480473e17c8527c1c22f4a191a217073393bba98901cf1a8a6f71b401abde6b2 SHA512 8c6415eaf04fc1e2fcc42fef529db9db3536b6e71ac1acb652ca4e2b1b053e1a1f6e7061dd903071ed28e433a21c4939eeda087a5c97d9b490419ac4667b3d9d
-EBUILD attr-2.4.48-r2.ebuild 2107 BLAKE2B 30edbd1e955c03f5d4423da4fb81120ac82d0071d92c72b97f2468dd0a4bdd5bea2561412c7d38d1fe3cab49a3fbd3b0c9e53fbc1cb2e92ee6c6dd6f4c7a16da SHA512 1541b465d7a55e730cb81d059fe507df05d3ead02c1322643f22966a844469a2727da1c475ea1f295228bea4bd7e45f1a3bf2480b717eb1cf904e09f2569d82d
+EBUILD attr-2.4.47-r2.ebuild 1710 BLAKE2B 04a1f431ddf913001b4a36971331819868e7056827be436fe1ac4a22c1bbf003a6c7c4f32df2b9687fd9214f3dc5c5f2bc05761c642cdc17e9958e6e719781a1 SHA512 53789d95f0059212e8a8cf73a9afe6dc6d370cc1d6b038ec878759bdaee366cd5d9d88889cb8ee459309140ed8b5f81399c299916555def44842a1df293a5457
+EBUILD attr-2.4.48-r2.ebuild 2096 BLAKE2B 49b01346b3280dc9742fcc799084059cbafffb34f8b98fd7fe2d44d17eceaeee240c941e47916cc7084b99d6afe9b031dc1cc60222f28f5de5b8074479d5525b SHA512 8e9690c9cd28c1a62572900ff8f5bc6044359d4afe6546fc8d49dccf19033da3239f00161a40231867de3e74dc048d5fdeaff5299986c8d762252f13bd7266c8
+EBUILD attr-2.4.48-r3.ebuild 2177 BLAKE2B 5cb3bdf9062b9541f798ff8e53b3c54632c743a04883bad83118d5e88e475791aa3b63d691f5b3618b134d86c60f57271b9c2404c681dff860a47a6d38141f44 SHA512 6553b31ae8cfdbde8e27e90681c1b4355ef54339d9387f63667885f7e809ef05f1eb3ab4d32195319ea1dd6e2dee5e6d5bc4c51e952511ae9b5c256ff98a9bb2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/attr/attr-2.4.47-r2.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild
index 76ba3d7e08df..73a66e95a563 100644
--- a/sys-apps/attr/attr-2.4.47-r2.ebuild
+++ b/sys-apps/attr/attr-2.4.47-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-apps/attr/attr-2.4.48-r2.ebuild b/sys-apps/attr/attr-2.4.48-r2.ebuild
index 0b5b137eba15..cddd683796bf 100644
--- a/sys-apps/attr/attr-2.4.48-r2.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
new file mode 100644
index 000000000000..2e011e44eea1
--- /dev/null
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls static-libs"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-perl-5.26.patch"
+	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
+)
+
+src_prepare() {
+	default
+	elibtoolize #580792
+}
+
+multilib_src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	tc-ld-disable-gold #644048
+
+	local myeconfargs=(
+		--bindir="${EPREFIX%/}"/bin
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D%/}" install
+
+	# Sanity check until we track down why this is happening. #644048
+	local lib="${ED%/}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$(readelf -V "${lib}")
+		local symbols=$(readelf -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
+	if multilib_is_native_abi; then
+		# we install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED%/}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
new file mode 100644
index 000000000000..5691b15420ce
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
@@ -0,0 +1,123 @@
+From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruenba@redhat.com>
+Date: Fri, 17 Aug 2018 14:07:31 +0200
+Subject: Switch back to syscall()
+
+Switch back to syscall() for the *xattr system calls.  The current
+mechanism of forwarding those calls to glibc breaks libraries like
+libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
+-fsanitize=address).
+
+Those libraries provide wrappers for functions defined in other shared
+libraries, usually glibc, do their own processing, and forward calls to
+the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name").  In
+our case, dlsym returns the libattr_*xattr wrappers.  However, when our
+wrappers try calling glibc, they end up calling the libfakeroot /
+libasan wrappers instead because those override the original symbols =>
+recursion.
+
+The libattr_*xattr wrappers will only be used when symbols are looked up
+at runtime (dlopen / dlsym).  Programs linking against libattr will
+directly use the glibc provided symbols.  Therefore, the slightly worse
+performance of syscall() won't affect any of the "normal" users of
+libattr.
+---
+ libattr/syscalls.c | 26 ++++++++++++++------------
+ 1 file changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/libattr/syscalls.c b/libattr/syscalls.c
+index 3013aa0..721ad7f 100644
+--- a/libattr/syscalls.c
++++ b/libattr/syscalls.c
+@@ -22,6 +22,8 @@
+ 
+ #include "config.h"
+ 
++#include <unistd.h>
++#include <sys/syscall.h>
+ #include <sys/xattr.h>
+ 
+ #ifdef HAVE_VISIBILITY_ATTRIBUTE
+@@ -31,67 +33,67 @@
+ int libattr_setxattr(const char *path, const char *name,
+ 		     void *value, size_t size, int flags)
+ {
+-	return setxattr(path, name, value, size, flags);
++	return syscall(__NR_setxattr, path, name, value, size, flags);
+ }
+ 
+ int libattr_lsetxattr(const char *path, const char *name,
+ 		      void *value, size_t size, int flags)
+ {
+-	return lsetxattr(path, name, value, size, flags);
++	return syscall(__NR_lsetxattr, path, name, value, size, flags);
+ }
+ 
+ int libattr_fsetxattr(int filedes, const char *name,
+ 		      void *value, size_t size, int flags)
+ {
+-	return fsetxattr(filedes, name, value, size, flags);
++	return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
+ }
+ 
+ ssize_t libattr_getxattr(const char *path, const char *name,
+ 			 void *value, size_t size)
+ {
+-	return getxattr(path, name, value, size);
++	return syscall(__NR_getxattr, path, name, value, size);
+ }
+ 
+ ssize_t libattr_lgetxattr(const char *path, const char *name,
+ 			  void *value, size_t size)
+ {
+-	return lgetxattr(path, name, value, size);
++	return syscall(__NR_lgetxattr, path, name, value, size);
+ }
+ 
+ ssize_t libattr_fgetxattr(int filedes, const char *name,
+ 			  void *value, size_t size)
+ {
+-	return fgetxattr(filedes, name, value, size);
++	return syscall(__NR_fgetxattr, filedes, name, value, size);
+ }
+ 
+ ssize_t libattr_listxattr(const char *path, char *list, size_t size)
+ {
+-	return listxattr(path, list, size);
++	return syscall(__NR_listxattr, path, list, size);
+ }
+ 
+ ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
+ {
+-	return llistxattr(path, list, size);
++	return syscall(__NR_llistxattr, path, list, size);
+ }
+ 
+ ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
+ {
+-	return flistxattr(filedes, list, size);
++	return syscall(__NR_flistxattr, filedes, list, size);
+ }
+ 
+ int libattr_removexattr(const char *path, const char *name)
+ {
+-	return removexattr(path, name);
++	return syscall(__NR_removexattr, path, name);
+ }
+ 
+ int libattr_lremovexattr(const char *path, const char *name)
+ {
+-	return lremovexattr(path, name);
++	return syscall(__NR_lremovexattr, path, name);
+ }
+ 
+ int libattr_fremovexattr(int filedes, const char *name)
+ {
+-	return fremovexattr(filedes, name);
++	return syscall(__NR_fremovexattr, filedes, name);
+ }
+ 
+ #ifdef HAVE_VISIBILITY_ATTRIBUTE
+-- 
+cgit v1.0-41-gc330
+
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 57b9f0697fe3..16eddbf03cf5 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1,4 @@
 AUX baselayout-2.2-prefix-chaining.patch 1957 BLAKE2B 7bcbe1eeaae4f75b03da92463a3852042d7366beaf141d6dbcd8589e9e83a09d5ea55e301831989ff37a5b07ecb3fcfd06c4516336ccc30859ed05deddb4e7cb SHA512 bb29ff88a7380094653adf9def87566123e3108a43d886560016d56df5f96b9b161270867fd9591012cb12175d78f9660a35f354fc5b3e05e526c5bb4711d90e
 DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36
-EBUILD baselayout-prefix-2.2-r5.ebuild 3564 BLAKE2B bb41d59ab1d88ede2e9bb5e247cbee5fca7cb43965a1502c157760595edfd815c7bfa6a38ae0019374afe7bf94c1ccacad2cfb0ec9ee29ce88a5dd25d4c05612 SHA512 76aa9f37a2002e527d79695ce8d8a854ce9acef2b4bba395bbc6698331532666600a0897e45b43ebcd889c05227cb3423f4179d01a43820587dbd51e6b1ade9d
+EBUILD baselayout-prefix-2.2-r5.ebuild 3553 BLAKE2B 82b726d4bafeeb0ac5916df8e594e45f52182c5453d31aa9199a49ac4b430b1c7d592c66506fc416e59eddf1e0f15a1a8cb470ff6c52a5476f7d86077cf34dfd SHA512 a25e275a28a3bb8278c108db743aacca74284f287f343a1a277cb47deb8418c55f4c740838b516cc9774f93df04d697f4ce10ba061dab0ae962c3fea77290de4
 MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index e9fc5ebd5256..598159ce7569 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 98ea442c5f59..d669c62c9c10 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -13,13 +13,11 @@ AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe7
 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
-DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
 DIST busybox-1.29.0.tar.bz2 2303680 BLAKE2B 2b3082952a3dc17c4a65ee6de24276d0c9dca9082bc75df23e67855d9667508ba146ff2210f6c548628341fae7bbd1ff16f4ef445b4297cd2a1a05be2b4fb591 SHA512 49afcb0bfcea881b37cb740cd17b144cb46596d456e72702884a835eee5e4b0b681c3a21ee7095a927a2fe4cd2bb691890aa8f3f32dbd98c4da20c2fa4e7edf9
 DIST busybox-1.29.1.tar.bz2 2304866 BLAKE2B b8fb576507b952c241f733b76980a246fc0fad0bb5c97fe39a63d7e780e9934fae325d27e997641250248d1c7dc9f480ed42a09fdfc9b0bedc9eb909137c6ca9 SHA512 4506c149abb9ce0d98c75ee1f73d2915b124b8d1975cd9d20b9cd894b47226ea492c4fa802b28cfaae3082991fb7ab127f2376713401545ce4aea8810c36da76
 DIST busybox-1.29.2.tar.bz2 2305093 BLAKE2B 04344bab3dbce6ff01746ce60c7966a883af42987cbc3ef43c9a4c831872aaf5c2727e3ed89e2c8f71f547a7f2cb87b31a302367546cb5149c6f65cd9023a663 SHA512 16191a0773f51fb53ba54765813754982621e0ab391a1d07f66a3fb52d28c567ebff019e39f151cdf29f3c878d691f0fb7cdb4cb67e29b732d45224953c5d70f
-EBUILD busybox-1.28.0.ebuild 9290 BLAKE2B bb09b1b547fcdefed76ef91c549a4865a807707376f8d100f97585661b4d57a25b628cd62d572b509495be61b787cdc40192ec11152979318a4e78a7a93497f8 SHA512 9b59a7ae3585432c9ac89eedd0fbcfdd9782f429d171eca6c8856a6181f4976a2733b4128e02b9fb3b81cf69582483bb1eecc4184f23679236c437df3a3be8ff
-EBUILD busybox-1.29.0.ebuild 9294 BLAKE2B 5718003244b0d4b4a6fb4cb357c607406ac1549d8fcb7020defd274570ed23204196b75223eb2034d0f44e098fdfb1a8b84bf55ed928cfd772f20bba02b3ee9b SHA512 dc614c110c37a32d5baa39610d2d805982b412dcb9cc6c7a77dd671b3207a256e523b08b3364bdee4220fd9c38d2e13f139134f6dd04ef21b3b6fae5a495c834
-EBUILD busybox-1.29.1.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
-EBUILD busybox-1.29.2.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
-EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
+EBUILD busybox-1.29.0.ebuild 9283 BLAKE2B 3be1ae9bfc0a48820d9c10dbb860f89a6820705ecf5e72bb90293fd92030f1a6b5db5a53f2b88e0659598584b0368208b18c25a7c4e6db4d4847cc537aba9d02 SHA512 92e340e82758fd35734efa042d65ea3b0214aab6565eb7c54f2ad33c56738ae297741dc5c4f6083926c1bd348fd767675401cd58f1ac37b059fc45e652a21595
+EBUILD busybox-1.29.1.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
+EBUILD busybox-1.29.2.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
+EBUILD busybox-9999.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
deleted file mode 100644
index 22dbcd657e39..000000000000
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
-#	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.29.0.ebuild b/sys-apps/busybox/busybox-1.29.0.ebuild
index 0a9ed10874c1..216ef19212c8 100644
--- a/sys-apps/busybox/busybox-1.29.0.ebuild
+++ b/sys-apps/busybox/busybox-1.29.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-1.29.1.ebuild b/sys-apps/busybox/busybox-1.29.1.ebuild
index ea0b4ce81fb0..4d493a7ed4f5 100644
--- a/sys-apps/busybox/busybox-1.29.1.ebuild
+++ b/sys-apps/busybox/busybox-1.29.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-1.29.2.ebuild b/sys-apps/busybox/busybox-1.29.2.ebuild
index ea0b4ce81fb0..4d493a7ed4f5 100644
--- a/sys-apps/busybox/busybox-1.29.2.ebuild
+++ b/sys-apps/busybox/busybox-1.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index ea0b4ce81fb0..4d493a7ed4f5 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 3ae86920569b..7758a1816ff6 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -5,7 +5,7 @@ DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b
 DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
-EBUILD coreutils-8.28-r1.ebuild 6513 BLAKE2B 7202dde224d53d23d69d07b6f0db38eb52c17bc9cdfbe32e6e223bcf2e5823b81e819794f4088bfbb7ba7e060750a68d5c33156ebb4da010ffa947b25cca0528 SHA512 79fc8c2d6fc9e1c97317a8470166ee7fbf3e03a58ffcfbde3b7fdc172c571299bdd484f91039d79c3d1a0a2b1dc4113c8ec6d40c884fa52f469c8b68713f53ed
-EBUILD coreutils-8.29-r1.ebuild 6164 BLAKE2B fb7ae2a88d674c4bed7252fbd8c7529f3ae488010e264203fd92e55e0ed44d159f022e0a32e40bfb8628975be90e8f31013bb795f103013d871bb410fa2d7171 SHA512 836ca3474d2d2868c3b9bc1ba54fa66a7e340cef01d3bca6263fa1aafbd0357656f00785255e714c17fbd4e951fb14639beb697bd902c7cca286f7411c9317b9
-EBUILD coreutils-8.30.ebuild 6171 BLAKE2B d695f8f24e64e3c35ac6ef58143c31598b1877a05abeaebafa733962804e7bcd2b6cd301bcd22a8043d80085f75b4098b2d00d56e7f2508f79737d56c8655c84 SHA512 b25eba145100bbf5f4963c93706ca09318a2ac0654fa57a5aaabcc1f3dfbe537527c639c9da7ee7e74f26592fe75d7e123065cea0904f98648e0dfbd24366f4e
+EBUILD coreutils-8.28-r1.ebuild 6502 BLAKE2B ed8697eed803159031c3a27bf22b299645742ae31cd0368930013ce8b58520c5d0e2ba4ec8435e05d7418c5e02046ff87c8b50f3ffa6bb7fa350338321063c6d SHA512 5478466f2dfe3060a660eefb1d307025c5bcd14eff5d0f248c5d6c9630d32411c2a45843d5d53f4c28a5e583e031a7a2d0f6b7a45cd11670e95c4dd9a6786885
+EBUILD coreutils-8.29-r1.ebuild 6153 BLAKE2B 125788d3d3cb41636151e255e8e7295303289c282870137ed0e963f40bc6865f7eff61a6bf78766a3d2fed07f889f7d347b923fe8966cfc473aa579d477aec0e SHA512 a7e217e4d099dd26bc99e2d07b9c7ea74fbc482a4a1109887c6b9e2519d55a1785a19789d077b6aa22e71e1a26d6f7cf01c4d7c64eab33c36e4bf3257955c2ca
+EBUILD coreutils-8.30.ebuild 6160 BLAKE2B e9b78b70c7af69174282ceab08462b7a1b482d45a927f5653f35a5487508b290a595b732e5ca7ede24bcc553b1c082d9a8edd66adbf4d48de6e6cf84ee9d30a2 SHA512 5edf497f202518748f411c8e0a4a32a0cb4870f5a2f26dae04fcb42a205f18c218d19e4cc39cde34d2f79bda0d788d8f543252712d207d95cf146681265bd2a8
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
index bde20a7a599d..03a283677da0 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 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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/coreutils/coreutils-8.29-r1.ebuild b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
index 0d5a5a7ce7a4..c13803d277f1 100644
--- a/sys-apps/coreutils/coreutils-8.29-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 417a9b7195a1..f77dd6933f3a 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index ed02763c349f..07a3ae9be65f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,8 +5,8 @@ DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.10.tar.gz 2073510 BLAKE2B 27ecd31e2535666a06cb77ab8df4f4a0990e21d43bc9e18e62f2385b9c05515a2f7ea452d4a376ecb4f764379c05235c908cd6392303300b1ff14d9cfeb25554 SHA512 36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76
 DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
-EBUILD dbus-1.10.18.ebuild 7377 BLAKE2B f52e7c26449cd69956b0c23288b620d17ba1c5f916ff47762045ae793761a8883366fd80c5648b147aa1195d5c7acba1743ae01f0c69d025329ea87cbb1b8ebc SHA512 4e1be287542458b080f67e442a47fad1bc2dd8fab0d28d90c516703a4b4a42f7161b06af7dc990913f3a2fb6edb874c620a7cd745f4186555dcf5e407c2c5a61
-EBUILD dbus-1.10.24.ebuild 7385 BLAKE2B 5061ed488e5da35a5c82c1ac023671916fb5a6e68b9fb7eed26d4b74264d4c2e9e04a56a0b64c39d926a078f7e8ba1fa4d9c90fd37a42169f14b455b6c2632cc SHA512 9a39c78efa3ad1b198c0a2c95b39a761fcb1868226dffcf4fb5eb0f14a4412a62e55c0703e35f0ab7de5e14ee0ed9b70e09c46a12cc3282b7e8d30b86c825f5a
-EBUILD dbus-1.12.10.ebuild 7450 BLAKE2B 7d0512a5a88b2517250b5dacde920c261a66e6151963a64d80d0e81a4f4e0907d32a514432b3f06aebdad3774982c542e237e7994a51a994548bba97f6f56294 SHA512 9a7de44b70956441f983f05f4e1c52f59b808f4ebffce447e23f1600c469811b212e229be78d5544c1fe070968a52960d2a422f67c2228076f9d60eeb758d540
-EBUILD dbus-1.12.8.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5
+EBUILD dbus-1.10.24.ebuild 7374 BLAKE2B b7c3b1c448ef971dd22b644eefc372c979bc5bda6fe9d8b70d263ef86c3c5be98e991ea9b659a771088a07259950f5fe81575b721929e2f7600a95e993fdfcac SHA512 02ff52d8af4828237eb099cf0bf8e486362d660737ee6f34d0c356038678eba7aa839500b6ef1e797ca5b44c693cae8939c4a86690a869bb5252b10bf803007b
+EBUILD dbus-1.12.10.ebuild 7439 BLAKE2B 16efc9593e81017f0240d83353a5c5ddfa164ac2025bede136db78fc01018a598ebb935489cad5a58b4d12b1c6e2db7937968eba891034a327a4a8db33023dcc SHA512 69e05a16ad00c4abd3ea535ce0b9c39ce9269285f859a782d30019a847293dcaed666a48ce0068e33d593b6ffc75bd90880a6c9cf487ec7727e239d46cf55a47
+EBUILD dbus-1.12.8.ebuild 7430 BLAKE2B 53a94a457042bbb44fa1f7838c73d51c5c806c8c54fe1bc4d00b28a5fca40b5c0e5a0fe92e22862435c242897ca3883f16d5bb5e0376da27f0def4a595d8aa2a SHA512 f8ceea6cbcfbcbc91940e01b15969a5d0095171ec92a9154c88d27712b91f2f4ff6bcbf19cffa45280824300cc3cfb7d59d8db9da4de590e35c695230ad68917
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
index 5845b8649188..ee0bb0f2fc77 100644
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ b/sys-apps/dbus/dbus-1.10.18.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 ~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/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index 2221ea22ced4..bfad70528306 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 ~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/dbus/dbus-1.12.10.ebuild b/sys-apps/dbus/dbus-1.12.10.ebuild
index 7691f4d1a92c..c3168de14875 100644
--- a/sys-apps/dbus/dbus-1.12.10.ebuild
+++ b/sys-apps/dbus/dbus-1.12.10.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 ~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/dbus/dbus-1.12.8.ebuild b/sys-apps/dbus/dbus-1.12.8.ebuild
index d53c2a80ec6f..e1fbd7884034 100644
--- a/sys-apps/dbus/dbus-1.12.8.ebuild
+++ b/sys-apps/dbus/dbus-1.12.8.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 ~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/debianutils/Manifest b/sys-apps/debianutils/Manifest
index aed96880abaf..11fe4f0c56f1 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,8 +3,8 @@ DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
 DIST debianutils_4.8.6.tar.xz 156532 BLAKE2B 2add390a0e38aa3d7103e09b3b65fa2b88c3965ca411c5789409454519791bccdb12d89b1bea4d07417f733d23d0662d4f510750ab404d7a4e8f20c2bd3d7ef4 SHA512 5913729cc3c56962e8939b71803258952df0d7204df8090a7504fbefc7f5d1da8e749d606fe23148ea3294909ef172bc1f4f821690169e861729caab70921a2f
-EBUILD debianutils-4.7.ebuild 943 BLAKE2B bfa2506c83becb7dbf47bf311f00ac931107679446551ab4f38938f957377997d5340009bf8947036f2b6c0fd9a8b4ab265cc8ac5b28c0ed5784938ee0ae906c SHA512 f45eada04cddfefbe2961d7c2a7ff5ddf3a742947d9ffa1dd66b37ca33b99dc06d5d811b24fd660e972b0650569483eba78b4d7e4d97fe957f9e0db297227dea
-EBUILD debianutils-4.8.3.ebuild 946 BLAKE2B 91e2ce2423ce3c2314eff13866e6436c221ac87a97fe08daa804f7a3ea798bca0bb8ca8c224d46d8ea6912d6ca827cb3a9986b4b50581d2451291459f79bd1d8 SHA512 a59a6eae24697d99ee40c31ff6fa84e50a45a0df787552d9241b2276af069af982adcb96652f30be25e39bf9bc9fa293400662543a688495e3df1fa693572786
-EBUILD debianutils-4.8.4.ebuild 963 BLAKE2B 32705ce1d6aef1a96bdb597ef36e3ca0465611f53b975dce303842ad3abf51984c719c5f68187cb1cd7d433d0e5be6738bba62a6369d9efa83571130c168ea50 SHA512 df8c91246658fb77f1e126a37479814e28d3c1dd8f8c532197689f5150088ebefe56d4296cd6674215e1eafadcf226e925d08a3c85d8553208faeaf6ea7a1071
-EBUILD debianutils-4.8.6.ebuild 941 BLAKE2B 16b7eb5345bc77b92220d10064f8220d66d29907c78a13385fec3a4f750c4dc2324373b4ffce30d3a94ba45f195b64d5e924eff86a25021faa46466a5a834be8 SHA512 c873a3815d2405c7ef0f9ec379483d01e3e65c535da4dcd13b4d741fe5c07dc664fff53dac71f1e13176a9ec0abe52e4d89d57907293002360c3ca2332c32a25
+EBUILD debianutils-4.7.ebuild 932 BLAKE2B 64722a43e03f4c32f0a56a8bdf22cf29588f4e73878fa9276b3348b023a96a0c63ea4d3e07e251cdd97da4fc92deb8d4753a44bc095dcb3df0964aef3ff11612 SHA512 4b40247c65606a8f8be1448ac7018ef7e5c9f4be31f7ef4473f34fe5cd848881cf18b41f29c4467f4ef024bc1d140109db22444b3d9af94d6edea8433f6f03b4
+EBUILD debianutils-4.8.3.ebuild 935 BLAKE2B 19d3779d81f7e10dd3a034ff3e1f4a4c1b15210c923796afa0535a062d7006418e4ef69d5a46577a916605979c15124607bfc68569b7e1bfe137612c3b20098b SHA512 24cbab98f62055e1298a3dfa1f6de6e9f766e593713f496fae07b2351bac6f70aed1643c1c0bcf07747d034d35538c4ca324bd41efef2bc97dcafc6f795dd4ba
+EBUILD debianutils-4.8.4.ebuild 952 BLAKE2B 64f141755102fb12185391882622e3d03fd0d84ed57fff2b919afd8fbac284876dcd31b16e88410580af38dc690bb411e7a94d200d55c78e548768f847c0dd27 SHA512 ad554fb4e84eac5694dced450b2c127c2e634e8390292f94478c4c8b0cbc908fbe52244d9cbc7f6ea838ca3a2c0350ac0e0efedbdb412ac4dcdba112abfbe25f
+EBUILD debianutils-4.8.6.ebuild 930 BLAKE2B bd761c4be9ae3d008d661935c3343c3272ee77ebebd9b614b17fe4142f1f090f5148b40ccce5da437a7daf1b23be4c9882467e8f98ef1c49c0599d57ce71a247 SHA512 61a2f7e81b6a0262744a131a9aeb74e1f6e520658743f076eb73d048d553492d9b144b1c73a0f36cec80554f3371f1cfc9ad396297f603eb47b0eafc67dda3a4
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.7.ebuild b/sys-apps/debianutils/debianutils-4.7.ebuild
index d2e7bb775738..41d11fcdaef1 100644
--- a/sys-apps/debianutils/debianutils-4.7.ebuild
+++ b/sys-apps/debianutils/debianutils-4.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="kernel_linux static"
 
 src_prepare() {
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index c9ba8f106406..df977e2c9782 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.8.4.ebuild b/sys-apps/debianutils/debianutils-4.8.4.ebuild
index b4860c091b15..7e8e9b8ca458 100644
--- a/sys-apps/debianutils/debianutils-4.8.4.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.8.6.ebuild b/sys-apps/debianutils/debianutils-4.8.6.ebuild
index f454a8bd5fda..789bd904848c 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index ea120b36193e..a2549ec38686 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,6 +1,6 @@
 AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d255571377d7c711bd90cd0ed710016929d7b9a68934d852fc9c9410b73e144259a2cc2264b2751ca444403b9ae37c065 SHA512 ad0cff0aea2ac560b3c0171141b6d1975d2ffb8684a20697464471355cdb161dea5967b72732b4de5ff9375a2ba2f29aae532967abe5311820de817afaf354ba
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-EBUILD diffutils-3.5.ebuild 1246 BLAKE2B a0fbe671325f6a5593ebf54a84a97115464167f6279290baaa4582b8c7232defe0224c98ab44c3e12c6c67cdd19306ead9be32c89a3081c6721dfcd07f6eb73f SHA512 8b9f2c83ad6d6c2b2ac005396127d9f1bea5962c9455aa4bf7b962ce76cf36d05d3c08764dcf3b89c4863b3b9bd352fac04c7fb0bf54d098d46b84045a389d8b
-EBUILD diffutils-3.6-r1.ebuild 1249 BLAKE2B 3fea1f80ead5619324d678dfa1ff9b1be000718870e5c369ccccf93a6ec25783b29426fc6c31c961e4b1059f34058652cdc598ff68f93251936cbdc81a6ac5a8 SHA512 564c30fef19ffeb10a0b3088ed07521702131e5d31877fb2409cb902f4bd72e0197138d50b4b8ed04dd36f7cdad3e3dd2c7d76a3438654b567d9b6eab7103a19
+EBUILD diffutils-3.5.ebuild 1235 BLAKE2B 6e589b0b76bdab58c8b191ec57d1a2bf18910fe9b6d40a88b28c7c5d08f0d4da33f07cc88e0a762972633746081c3bc3b524c7927ef274643c7369d7d34956db SHA512 4acf859ee8bb1c1500ed6be9bbdc05ac66bfc7d710dd4100ce6e417e358101cb81d266922028abf6e4ce5c5f9b7a1e301e241d66e5c2f0cb5dca7cf5b58a5b64
+EBUILD diffutils-3.6-r1.ebuild 1238 BLAKE2B 346154ef13cb04dc0007980ba09be2414b8cae8b03d8a3bbb14c7b1313caa2fcd48e4f313cc3671485f3c78045c9d5e023e32a36d6caafeff97c0c879c6fd769 SHA512 ea936a476f43c18e1149bfbb7eb025d8d99b8de1487ade5a81473b1bf4f9b4f9903254bcd1d2fea173e9400def7d712d3ee2c9eb9c3dd06ed58e46738f159092
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index af38207bd6b3..e8af1814a4b0 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index b578198425fc..9b431f55a801 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 4561627aaf4b..f366c8e0a1a7 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -6,6 +6,6 @@ DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B be061487c8b50bbb8aa1e085dc46f9b71dcc
 DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 766c072aed143313460facf8179ff3645f441e8f1253a5e7b59d67e20207a060c074f17f0a839e60027810fed739839ffe066ff40e2e07fb23c6f20d326ec8d8 SHA512 2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 EBUILD findutils-4.4.2-r2.ebuild 1334 BLAKE2B 79b08e96148ec6a073aafcb00fbd1a49dd03861582744d3a9c02867d396a20aa1bdd5318e6b36148f90d5de1a639212c94111479868d819b285f579162836a6b SHA512 83c6b0066bc3ac61b50924fbfeba59bc7161987b402465fec1267ebd3d518331cbcf639fc6b5442a8ae9b3b7eb642d853b38883412328f0609a8a8fa4a058b6b
-EBUILD findutils-4.5.18.ebuild 1565 BLAKE2B 98fc64b152d8df52278d07d5d1650c55bbd3c533ed68259fb99b460728e4c283d365cbe63b082492caf965ad9ef52021ebef68bf7258baa40839a9c095fc1df2 SHA512 1e26cb6d5fc097f32611cd8e5d21919b334938a2064e66d68238cbaafd34ae1cc32b773da807546111d1315d04c87ff71bcf317309c746932c5a39fafd2a13ec
-EBUILD findutils-4.6.0-r1.ebuild 1905 BLAKE2B e8a6f4faf5a488f83f4b41f03baed7024703fe49d9ca61d0b8864d7bc2757f4a2cae015bf558bcb0d8eee8d0f8a4caf44dfc22b4b469c0278794245b076cfd6f SHA512 11a56e7bc5ec30731a7bd2bbfd9979360a41f87a2f62b1d3316e34ceeec25e8c1fe271c3ea9c27b7123d3c57d234fbbb6af93cd390cb73a216125aaada53c9fb
+EBUILD findutils-4.5.18.ebuild 1554 BLAKE2B c2fb2c7c3c49673adde0b9dfb136a05fa980cf47e0d5b8ff677883b580fe10e759ab87f808f249d5ea385645913f8a8cbc0e1f18cc8885e3aa57e9dd4e2d7bf9 SHA512 87e20215836682aaa186507908548737c25befa31d600dc144f5e1be93a580e63b467bbd24a483a2ba393324cdc91f399584a225d427e616417b056f952a875c
+EBUILD findutils-4.6.0-r1.ebuild 1894 BLAKE2B 8916b2ce41e96a88368e3ce6328f2aed26b8775b5906b26bfc8cab184da384a688be256865a1115b85ed050905f4733015ede517057b7e5b2ba62880589b1571 SHA512 4abb07dbc93d782ca59fa84a507d45193e8ae0d795175462c844d093406de6e134ac23bafd7206459770eda7f7a783b25afe58667eacd5c9dce63105f1f7e06f
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
index ec1a6951c909..355715d5cb12 100644
--- a/sys-apps/findutils/findutils-4.5.18.ebuild
+++ b/sys-apps/findutils/findutils-4.5.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls selinux static test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index ea8388072a29..d59a80b99113 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index f73d766881f6..a525f304a48e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,5 +1,5 @@
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-EBUILD gawk-4.1.4.ebuild 2090 BLAKE2B 157b0b2d6eed94587109451db8aeae9b809f16e2adff1735d9111ff486ccacdeb0f0add59cb23f58ef80e72fbd746bdf80ee029bffd1ccba5219f6609b124d00 SHA512 59ba5329f4334688408e6afd9fcc0556f87e46bc5f860ae140197c7b0a2a62dfc6236199a9588c1ee57f4ab946ee924bbba804abbfd0125f8acf4dbecaeb9589
-EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
+EBUILD gawk-4.1.4.ebuild 2079 BLAKE2B 59f106bb6c8ca35083689bd6ef778b60af7addb0343a4e4c6e8deda9933d4e94da37fd3a4b9c5e3bec08ca9298be0c8e4233fb29b495744c668d7877609fb183 SHA512 a8abad1ee6e213257ab43fcfcc2a17d570aa754bd0bb35c58c307310ea8ac191d0f8618ea0853f962bc72900998191652effbe0c90409c330a05ec6498100eee
+EBUILD gawk-4.2.1-r1.ebuild 2563 BLAKE2B 6920d537899ad9b4c90a077c28bc26012d11893a9dbb42a64c32fd19c67b3c5412fa97bfdd7d71d9945c044c34e058e45935dbd4c955c78287c0e257e4b3aa52 SHA512 2d4c7ca88ec93cdd8c690fc870d68e8546fab250df0f612cda16e9155d6c40cad654f82e7660c59c96853c94f612b18717d93fe8b819a8c04f41452e7e0ad41e
 MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 6798442e0645..76e87ef801c5 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 3bf1a7e90d2b..4cc3bdbff8e0 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="forced-sandbox mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index ba76200c2af7..299aa77f96a2 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
-EBUILD gentoo-functions-0.12.ebuild 846 BLAKE2B 6f8138c350334a38c8e9ecc3421d2fe6af90fe4a687fb6e3ee9bc42d699376f92dcb1a8bfd80527946e970aae87902e80610c262f5f5d72f6f3dd2fdad29b2f9 SHA512 632abc3875fb537fcef9702685a07a2f9a55e540b3fb506f7168f2427e77c69d8fdc553090dc9060f8b63f32a46d7f05a39db922e773164e7d541b93f7351166
-EBUILD gentoo-functions-9999.ebuild 847 BLAKE2B bb3c020a1e5837b5897c1d6b10a7ea5486b44568189613d7fe2225811c09a088e9ac96e24fd4e907d6ff4b8b59c12156e95a6af73dd3b12b2cc3faa19cc44dc9 SHA512 c9a2cd71ba3a533867741a5b6dafa920f5e329b1bf475289e7412b0237552ab3fb10df7474005e25c2e7b7bf999afe19fb8c0083f85d7d76b99268af90f9e979
+EBUILD gentoo-functions-0.12.ebuild 835 BLAKE2B 38123ffb37c5ab75bc2381eaa1f155f9793d4687551a5b1d57114323246166bb2f685bff295b58cc3659d03be3dd2a8e08f17a293440943c81ccaa6e0dc3cfa6 SHA512 33ed21e88b67cd3158e58e0b37aebb1b86285167624cc8b5f90ae9908047e542b94ff10f8fa3e15f97c7ab015c443410fc5e3c1a05dcef365d1e5fcb53fa5cf7
+EBUILD gentoo-functions-9999.ebuild 836 BLAKE2B 4e5c7ccb55a1d3164605610c8f88a78d008a198578e95a479354a9866e63798ddcfefe6864c3a28ab37c2da9e77156da8e55dfec155448991f888e8161e8ba5b SHA512 85c17bf7e8561fc371648da2731606330728ae67d8457fcc90a6c4783f84bac0a4c3f111877149bab81d7cbfb50c00006bacd0db5dfb07ffd5a519e03e6f4a26
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index 4389b6a2075e..a5cdb1e0c7c1 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 71d08995e04c..ee29cc9b3f24 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 23d31f48ac2d..2124d8822cd0 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,7 +1,7 @@
 DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26caaca54d816c6e02539b652d967bb8de3138d6ffd7aa1d63c010632e4f888d6cff2e6a7b743a8816787319b67e5 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
-EBUILD gptfdisk-1.0.1.ebuild 1198 BLAKE2B 35a6dff3f8c26d31be4a1bbfd6b274847fb0ae854ed70c8f6ba02202b90437d7c5f195629bf5bb9865cb0e9601670470a7f9e4a313afc737a43f4f128c7fe776 SHA512 fff00afa1c3689f41c0908d5198b07ca14e34c785e6bd907d593343dac00cb9079880b18769f8856c09f3972619ef0b48a0a0bb49cd3e07ccfff189c5b31cac2
-EBUILD gptfdisk-1.0.3.ebuild 1257 BLAKE2B 9c9818910c216019eaa9797f4293c550828aacff5a250406324920b4919be27c2f4d0a0a53274457af21bec70ac7fdb088bc168aaec979f7af3057706be6a3a5 SHA512 83e08ccb6d2c0aa23bde6d4ea63818774e4c935e99af7345e2ff208b305587b8c681b3227c8455c54956b8a2978892821a181662f5711890248eb62e8ac1c4fe
-EBUILD gptfdisk-1.0.4.ebuild 1259 BLAKE2B f2a4d0d41b9a128cb27d006a89031ca7a3b8ef27e142e32af77502c05572214edc1251f8793520e1cba22e13ece8dae7161daeba0543c16c3e56a5550c6e4838 SHA512 613080951e4db937ca66a117a89040a740d301b04a74a1d9db6b7cda73bee0e4e534a2dfcd42ebaf05f6e783283ed786942251a20b58ea5a97af3bd8c65faaa0
+EBUILD gptfdisk-1.0.1.ebuild 1187 BLAKE2B bff741cf8c43f0f3b060e4febd75f9a41d76328ded6415f7d022e306e07836af7051fa5d6a755d59d88b97dee403eba2f260871435736863b6024e35e8ee4515 SHA512 f8d8c14f2a549aca37e9eb13e0365b6e3029568c44902fac2881374804b772abd8d7cf6d5d34f74c43d757dffbf1026014ad6ea11e6343b670c72c58c166d63e
+EBUILD gptfdisk-1.0.3.ebuild 1246 BLAKE2B afad4e13c8ea272f67d2dee58d76904740bddcd0f47884ffb10607429905700fa1be762f56165f0876caff67f30f51865c612e9056936717f0c036f07b36a08c SHA512 36336bdd8e9eb094a4737b1a494c5e07640384f70db3e0d7e9a8cccfadbdd72c5d8ebf382462137f804e2855b5071f0269a3cd95e7dbd9aa638bb798efbd009d
+EBUILD gptfdisk-1.0.4.ebuild 1248 BLAKE2B ddc6d9cb111fbf70b5f2bc668f2b16402405007ea338f9597c39c5d900fb92dcc67a0b5802db00d6ab5f0e7df5cf16afe34e84b4e929d1c0d5e8ed593adebdf2 SHA512 c528801dd6b4d0d3495e0b70e0dcdec485682440f721ab07b8d186be365f3a3ad4cd698797e611623cdac6614c9323481339f1a45b99e748af69ff255a4903c0
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
index ebca9efb4734..a2483f67adc2 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 RDEPEND="!static? (
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index 0b200379b91d..7d30aa44a2e1 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index ba13b2306d74..a1046c70120d 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 7a414ae2d270..f5ba148f315a 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -4,6 +4,6 @@ AUX groff-1.22.3-parallel-mom.patch 378 BLAKE2B 46d38a599ec073bddd24a31562960ed8
 DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
-EBUILD groff-1.22.2.ebuild 2828 BLAKE2B cfdd8875e9b270ce3b38bbf4d707d34757c6d7b529041c85c7758b559936c0e3080062cca3a8d3461a8ade109f2d2cc81b735de5a6711010c5574d304cbda935 SHA512 6a28fdd8b6cdf9aeb5054631916a667aead8e1102cbee07322bb36bd8a1deb393818ba16418fd30819ea3d4ff573351b726f347a71283023995dee5bd50fc05b
-EBUILD groff-1.22.3.ebuild 2555 BLAKE2B 28de6ef1b32b32b0faaf83120353f031186a1b9ffe941cb4fc5a7bd3f44458a699705896dfd6401021fe92f59e74fadbea13fec9af13bde621efb279874bbc22 SHA512 7461162a44ebb7a20b36805534311df707968452ae7f7094ccb616bee20b724a56613ae8a4025b6249c41dc969f8ea5f61c4c55a5543492bf93ef69508ec7aec
+EBUILD groff-1.22.2.ebuild 2817 BLAKE2B a9ac31d7ac1418500e11d848e69dc01c8c3dcf29a2166f1b92f5d0f8acff38e864930f0b5a5da8b9f67a61919fabd4d949ae6634d47cee5cc2b2751370c9db14 SHA512 29effbac577cfc35102ed96ed52e1a43d4d02f0dbd94bd149131b4197afb5d48bede1484d290f6d2f78635b0017b66ffade729900997a3a3421bd9834e96f47a
+EBUILD groff-1.22.3.ebuild 2544 BLAKE2B 7828a4809c93cc0fbf0044e4c5fe42f9992103b748cce6270ab380aad099108c3f93cdf1922c06ab3f1d57f710c4047b99056c1e6b36456dfe8059baa2b1e54f SHA512 5dc8649a7a4a1b276eaa366b1f9aeafe8048614c19cbfb133ef0e4409be0eea872ef65270ed01e26469e057741254c89d644fae1229729ac2cedfd8f3c964569
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
index f8c0b15a7e2c..31658a7af018 100644
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X l10n_ja"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
index e9d0eeaf804e..27e8b587a7a5 100644
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X"
 
 RDEPEND="
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 41923d3e2584..bc37239e3357 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -2,8 +2,8 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
-DIST haveged-1.9.1.tar.gz 474845 BLAKE2B bec7ecaac93f7b6ab746dcb228172272bf7575e33d6ea1e2d1cc8a8fa63187db5e41565a5b49d922c6f4c222d71452e41d0b2dd00984eda179a8026fb76432ce SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
-EBUILD haveged-1.9.1.ebuild 1002 BLAKE2B c63e879cf82aa18711e357aa62f49ad3f76fdd3b219dd1ef5241585deabf93106428731461d721aab95046ef82e83e67ccfe7e9e919177d927787e47eec25bc2 SHA512 f156ac90f991ccd4b090657055e323123915398a9e8877dc4363b297b192709d3240d68cab397a7d8de96465f08e5b833370ea19e0b5673cc3b9638e30f0af59
+DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
+EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.1.ebuild b/sys-apps/haveged/haveged-1.9.4.ebuild
index d6c9aa57c29d..4e82730b448d 100644
--- a/sys-apps/haveged/haveged-1.9.1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.4.ebuild
@@ -1,38 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils systemd
+EAPI=7
+inherit systemd
 
 DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
 HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="selinux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="selinux static-libs"
 
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.11.8
-		 selinux? ( sec-policy/selinux-entropyd )"
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
 
 # threads are broken right now, but eventually
 # we should add $(use_enable threads)
 src_configure() {
-	local myeconfargs=(
-		--bindir=/usr/sbin
-		--enable-nistest
-		--disable-static
+	econf \
+		$(use_enable static-libs static) \
+		--bindir=/usr/sbin \
+		--enable-nistest \
 		--disable-threads
-	)
-
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	# Install gentoo ones instead
 	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 6e88ad80a0e2..2aa70c162781 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -6,8 +6,8 @@ DIST hdparm-9.51.tar.gz 133725 BLAKE2B a507046d1026e901fb0feb9c61dac60d8bf8427f7
 DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
 DIST hdparm-9.55.tar.gz 136805 BLAKE2B 0739295dcc80a2b774b2edd8c447ee739476e5fe55695e22f867de2c8352746ac8dcbef220554a36bcb9417317f44c433cbbd807629ef7514b5e1d93be56c280 SHA512 a9b5be38fda9db7f125ecc5a174668e81464266493672184d214ea9b50437e089482799fb5c817c433f897eac8741fe3dc052658969bb1ebac158606dee51196
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
-EBUILD hdparm-9.51.ebuild 1068 BLAKE2B da518c793f37b34bed3ba283e7152d4fd4ebca37548090db5dac52c14141b513f47e16ae06c89e0dafbeaf92af76728d158c8c7539cad5f91f2c623f865e8dcb SHA512 af88b4d68dbb6c844b170a0313bb0ba98b6a0b2e36b3b2b6e45a5e6f6f6129f2a2aafb6b0fa63177b2af717cac5c0e322f3ed00f7ffe6a6c941dfa8145d3d7bb
-EBUILD hdparm-9.52.ebuild 1068 BLAKE2B 61dc46bef9c599cacc1ada387cb708b774ab015761d69db8a777ce2f32c1fc87edea48956cede3a30df78394f6de998d321aafe90f554181278a84523849d565 SHA512 a6601069056b25a0447032cbf746a152d257d0a5093a88736136aafbd526964a07608654fc23854390a802b64bd28950695e4be2153ab0c621719ea7d1c5367f
-EBUILD hdparm-9.55.ebuild 1006 BLAKE2B 360e7286447cbdeb2c2550f020ec7a6f4fe84dbd1416e4a1d1777d2efb7644a4f4897ae6735d11a395f6eba17e3f6e46fdbec28e4c995a6d0f5a04f57e87a0ca SHA512 a80757a40a1c52bb9d5167ba143c1ae10f718b34cc3790fad7b88b5301fda1cf8721120ecf4f1a785e2312c948eedfccdaaf408a46a9b17f5aae75429f50fbfa
-EBUILD hdparm-9.56.ebuild 1006 BLAKE2B 360e7286447cbdeb2c2550f020ec7a6f4fe84dbd1416e4a1d1777d2efb7644a4f4897ae6735d11a395f6eba17e3f6e46fdbec28e4c995a6d0f5a04f57e87a0ca SHA512 a80757a40a1c52bb9d5167ba143c1ae10f718b34cc3790fad7b88b5301fda1cf8721120ecf4f1a785e2312c948eedfccdaaf408a46a9b17f5aae75429f50fbfa
+EBUILD hdparm-9.51.ebuild 1057 BLAKE2B 301fef8bbd555444009d97aaa19b70bef9ac29051f36e508cc102464823b95eac989e0ff804b167699da76babd48bcece26a4e6f2f56743cdfea94d210a90652 SHA512 fdca7a1af7e4e5fa7ccaaf8abe0c4ca2afebde913853f3d8cb1928773ee945480220f77e527c713e7f9d817a6fcf7d51612617b4fc25df0c35741f7257b17e8d
+EBUILD hdparm-9.52.ebuild 1057 BLAKE2B 6a29ec1c584e1be1d7cab0831303d07a4622f9bf3f58b0bd68ed2a7b4a64f91ede06d3b967afe0b8427c98e071d2149b1887ea35ad4e48ab2a3ea1f807b3400a SHA512 98961f82c74bf33fa2deb324605f4485687e81de8cb3ffd8dc2f2591d12d9a06421ce670ef10e28f71844786c24709d503d7fdebca890c5645eac78034d9bbc4
+EBUILD hdparm-9.55.ebuild 995 BLAKE2B 60ecc008af48a81bbf1db8bbc0ba60a0fcf217e4b35267d8cb2cb2db01ab26fd33e3652c277fc85b039065ca98f7ac9b539d14d73adc8c56727924c9368e1159 SHA512 5e92cf3b1f13d46ee0ea91a86f069dda3f7898a6ffdb7d2cd5aa6826f33d70cdc1ad1692464007239c2170b0535e5993767a8f947abf9f25e19de3b137e35b72
+EBUILD hdparm-9.56.ebuild 995 BLAKE2B 60ecc008af48a81bbf1db8bbc0ba60a0fcf217e4b35267d8cb2cb2db01ab26fd33e3652c277fc85b039065ca98f7ac9b539d14d73adc8c56727924c9368e1159 SHA512 5e92cf3b1f13d46ee0ea91a86f069dda3f7898a6ffdb7d2cd5aa6826f33d70cdc1ad1692464007239c2170b0535e5993767a8f947abf9f25e19de3b137e35b72
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.51.ebuild b/sys-apps/hdparm/hdparm-9.51.ebuild
index 23e26825b22c..6a190878d36b 100644
--- a/sys-apps/hdparm/hdparm-9.51.ebuild
+++ b/sys-apps/hdparm/hdparm-9.51.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
index 68667499c6bd..6bcd2b516c07 100644
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ b/sys-apps/hdparm/hdparm-9.52.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.55.ebuild b/sys-apps/hdparm/hdparm-9.55.ebuild
index 5c52393e7064..e4ef9c841faa 100644
--- a/sys-apps/hdparm/hdparm-9.55.ebuild
+++ b/sys-apps/hdparm/hdparm-9.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild
index 5c52393e7064..e4ef9c841faa 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 1a2f912c30d7..c890c16641a7 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.47.4.ebuild 1080 BLAKE2B e6842ef0532d09fa4fae0171f07cd0c4d3ecbba79e0347d909d6db9983145607befb7007b8b895e6705519a1ecbb4a6ad3db09457ddd4dc04956c921336a9f82 SHA512 e80f43c763184fcf162e947e858de65a8eea35af193e8c59a9a5a670975f625de4e03adc6cb23fa9c439f024f376648d9eb05c255fd98cd07fd8829d25af4af9
-EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
-EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
+EBUILD help2man-1.47.4.ebuild 1069 BLAKE2B 389e39c59f7fc01a5f38f52768e952ecfc5a773cf9ba99219415f1ee48632b8aebc83d641a8b7db8918a74032f45828f1c04b27363532ac0c76449e6c8af9670 SHA512 6d3bcd6558285498dbc900e5b500327c341c5314b08bfe2205567a8e529dffb86f1d5e335fc0b3f00665c0008e08a008d59a51175fad95cdc26db7297f37d96a
+EBUILD help2man-1.47.5.ebuild 1054 BLAKE2B 36b6d54749a3c13172a403ea8fb2ed6e4372a01864ed70affed05ea19e7e89c40e1220372aa8b54d106dfff3ce74f45423584046e354c49308dd722efd8a6d24 SHA512 870a7897b4e2483337d06fffd41943d0a75e2f819daf153ce37815e965d24d7b4f32df64266b29d17f02299da5989c6bc9493560fe58e6f8b6236cf59f1a3746
+EBUILD help2man-1.47.6.ebuild 1054 BLAKE2B 36b6d54749a3c13172a403ea8fb2ed6e4372a01864ed70affed05ea19e7e89c40e1220372aa8b54d106dfff3ce74f45423584046e354c49308dd722efd8a6d24 SHA512 870a7897b4e2483337d06fffd41943d0a75e2f819daf153ce37815e965d24d7b4f32df64266b29d17f02299da5989c6bc9493560fe58e6f8b6236cf59f1a3746
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index f574c1e07a3c..6919046d8960 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.5.ebuild b/sys-apps/help2man/help2man-1.47.5.ebuild
index dfceeba86d7d..ad437bf291f6 100644
--- a/sys-apps/help2man/help2man-1.47.5.ebuild
+++ b/sys-apps/help2man/help2man-1.47.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.6.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild
index dfceeba86d7d..ad437bf291f6 100644
--- a/sys-apps/help2man/help2man-1.47.6.ebuild
+++ b/sys-apps/help2man/help2man-1.47.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 273b13c1e66a..90f71276dcb4 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -3,10 +3,10 @@ DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
 DIST hwids-20180315.tar.gz 3117949 BLAKE2B 34b6349d7adf38da8591a0f75e98ce09f0217bb284d1bdc70d7c1bd0a13f0c21b46b2a40ea363dfcdb7524e2a06e94d8ca3a63f5dce6f4afac2b20d05229e944 SHA512 2c52b88b74d231f7c563079b02fdbe29ff70c4df5aae64f1241ab0e1bd3ab9c3ca925e102474e32d3dc8dcb833e3451f0698024a8fff808a987ce468af281898
 DIST hwids-20180518.tar.gz 3150553 BLAKE2B e7d1be88349d04dac09e44bba728d1b371be66628d0143a5ab9d98f9ac5ce14bc21c272bdc93e88cb2af8f640f2f5d0497be8a33a136bcb8e69112a998be3827 SHA512 5a8e65b226026b59008c714df79309a888f728198ac5ab71c5908b69a1fd5365a0834afab0e38423affbda59ded04b662a09dc544b4d96695671f562aa0c5ec1
-EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
-EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
-EBUILD hwids-20171003.ebuild 1706 BLAKE2B 9e5ca6bef971a2b88fd85470abfc24742b809a225640ca777990780a2fbc598ac26125d4b3ad51e7b02fecf668b3d648bc9d02d68f3818a7bcc438c7e1c83227 SHA512 ff3c5693b5d81a0d486d269b14c54e9489ae9e959f5c57d9268d2fb2b17723bc764b41ec62660eb7483efd91e8a28fa47a56bb67cdac4fd09ec3e947ead0b5a0
-EBUILD hwids-20180315.ebuild 1750 BLAKE2B df4293882c37bd67f31031e6f57a4f530b219e79ed97a588176adb363f789cce5df1d639a4a16cbba346db05fef0d5449733d6ebf0054f9501d4b4791f56ad97 SHA512 be1425858d953975464bd1131741b791778d0399249ae2bde4d71ca92db32bab4d188a46fe5ba1fbeac1dd1d9a1351d74a377dd5a19fbbb9cbc108b116181857
-EBUILD hwids-20180518.ebuild 1750 BLAKE2B df4293882c37bd67f31031e6f57a4f530b219e79ed97a588176adb363f789cce5df1d639a4a16cbba346db05fef0d5449733d6ebf0054f9501d4b4791f56ad97 SHA512 be1425858d953975464bd1131741b791778d0399249ae2bde4d71ca92db32bab4d188a46fe5ba1fbeac1dd1d9a1351d74a377dd5a19fbbb9cbc108b116181857
-EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
+EBUILD hwids-20170328.ebuild 1431 BLAKE2B 873074354502395c480a8f7310effae4d913ff00bd6b4dafb38c8aa9129238452c6f30592da124c4bc0af86a1abfd76ef58c0dbd6c99d3a901a0297be3a803bd SHA512 357aff1def6de26ae5eb2d07446c581b6279017f1750650bde113036ea2b87fd8be693e3f7cddbbf072bc598a30cc0183d1946db5c363a8e7fb203cf5f4ff1ca
+EBUILD hwids-20170715.ebuild 1444 BLAKE2B 1dff1651fd4cb03de461c1a7db918213dff62d3832aafe5cc0452a7c728b114b96e39a241c3ce08873f78f4a40e813f5608b7b746d93b63d23a5881cb9517581 SHA512 9b412d8745b387af89821ca49157d6d12a30e2aef98da70be6324ed4496f39981c00c909611f59644ac318463b92eed9a6b7e6b1cc6677c618b515ca96e9e4ce
+EBUILD hwids-20171003.ebuild 1695 BLAKE2B 51e64ebb329c3fb66f2dcc91587b0c750b1567068dad99bcaac93758969e5a72c29a60a6c0d131791ea00690d3ffbdf16595fc934741444d39633ac87357de6c SHA512 94a79ebedc06e023e54028574eff4de27799f903e1de85d77fd15fc053fed9ed153b2256d86490c024ad17da5d8d227e3290a5a34daea8b7d8ba334f4884111a
+EBUILD hwids-20180315.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441
+EBUILD hwids-20180518.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441
+EBUILD hwids-99999999.ebuild 1739 BLAKE2B e985f2d9d336c2bdd107b7402638b36bb095f705b68ccf23afc83847b9f7c0c56262e9e81b627309fd3e7b334b033d22a65f9224e7c144fa369dce0d1aba2f89 SHA512 e953085bc62d2d5beeb80b42fdbe6c7ec721d904789488e1754c2bb1504eb18bef7995f710c6d70045261c2b0b3d5e872ba6de835d31dfef7b4d272ab14853d8
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20170328.ebuild b/sys-apps/hwids/hwids-20170328.ebuild
index b59f80cc2afc..7aa566e5cc38 100644
--- a/sys-apps/hwids/hwids-20170328.ebuild
+++ b/sys-apps/hwids/hwids-20170328.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20170715.ebuild b/sys-apps/hwids/hwids-20170715.ebuild
index 13f25bb11b32..b88d95755f92 100644
--- a/sys-apps/hwids/hwids-20170715.ebuild
+++ b/sys-apps/hwids/hwids-20170715.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index 9b824ab36d13..1699bbb86d94 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20180315.ebuild b/sys-apps/hwids/hwids-20180315.ebuild
index 3b0cebed2957..b853ba3cb8b6 100644
--- a/sys-apps/hwids/hwids-20180315.ebuild
+++ b/sys-apps/hwids/hwids-20180315.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20180518.ebuild b/sys-apps/hwids/hwids-20180518.ebuild
index 3b0cebed2957..b853ba3cb8b6 100644
--- a/sys-apps/hwids/hwids-20180518.ebuild
+++ b/sys-apps/hwids/hwids-20180518.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index ab38d2c7a978..79a041389fd9 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 008a3c7e8980..08d8f5fd7d67 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,5 @@
 DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629
 DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340
-EBUILD hwinfo-21.23.ebuild 1295 BLAKE2B 550a5eae06fbd3a1cb28ae87f7854985a744c8fe8c4bd09608a1bc1ed72493aca72a7afef60ff5b17226cf31f5ed884a8a9fdc72a0de4dd1b402262d84dcfb3c SHA512 f6cd1940a5b9ede5aaf06780434c87c218b77b27ac77c37419e8641efa6e55c27ddc849e1bceccd4c5a8bc6b4a337e3248128964bb5fecbcd8230fe697d32758
-EBUILD hwinfo-21.4.ebuild 1576 BLAKE2B ad2c9469499e1ee1565c9f34d07a19a3df5914177c30cc201cf6933e896ac827b99c9f37fd52f0edfcc59e3ea8b3d88548892adebddaae01f89773a42c007ae7 SHA512 76bc658891201db983815fa5b33295bc78b4d9056ac72da715e51b36ac8c03c3d6d456ae5309a6cdb1e3516ba3abcb85669fb4eb8d31b6eadfcaec829781afdb
+EBUILD hwinfo-21.23.ebuild 1284 BLAKE2B e5ea1d3ec4faf5f0aa8a837a2a9763744ab2a75c259533ec0566a950ef12506281cfd807a69b36aae81c198ca14c8a4a22dc23316677108d104a8d53510d1065 SHA512 e0b9312a65f8227a2e0d87ad5c96f875f6a20ee4f1972bf0a3b3876b7efd26d9c549732737323a6431bce58f268c56e72fd8fd42d5099747ac31ea60b137e51e
+EBUILD hwinfo-21.4.ebuild 1565 BLAKE2B 3f0b88f238a63e2e05f0163d8d7168ee0f3821ddd87e5daf367c55b1a4fa150d87943f6fad285915c175dcc3d011584a69f2c33a9fcaac6deffbdc7f809d2efb SHA512 0037b450bce00f7264967ffcb8ff07fcfc9a6508ab3a981c799207f67d959680b55324708714e970c20fba865ea49f8b60fe89c413f88ae417415bbae89c0958
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/sys-apps/hwinfo/hwinfo-21.23.ebuild b/sys-apps/hwinfo/hwinfo-21.23.ebuild
index a39e2d901698..97cc8c3e0a74 100644
--- a/sys-apps/hwinfo/hwinfo-21.23.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.2.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/hwinfo/hwinfo-21.4.ebuild b/sys-apps/hwinfo/hwinfo-21.4.ebuild
index 348ba397ad0d..a63b0e33b3f5 100644
--- a/sys-apps/hwinfo/hwinfo-21.4.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.1.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index b3b62fa50570..2c7447b7bf65 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,8 +1,12 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
+DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d SHA512 cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
+DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8 SHA512 b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef
 EBUILD hwloc-1.11.10.ebuild 2239 BLAKE2B 33eb03ed6ce9de352f53602c6e687e409b63cec0a4141c2e7e416be4f98dde7d867e7a8158d09168a563bb39c19578b44397c1a8f3a08662d4e375ca80456d48 SHA512 006165b38fa9c332b4cd24aef0876555ba5e4cfd5d4dcae22a82beb0fd5f253197dc87e691291eb2e9b3e7e681c7d504d4df4e44ccd8e537b7008aefb2f34563
+EBUILD hwloc-1.11.11.ebuild 2220 BLAKE2B d7f1c3ebdff8a23587a59330fc67a9498e9e2d7094561018978e604c54d5ed70c1dbf6f463419a63732c3efea042dae052cf176dcea5e117fecfeb2eb5cf3fd1 SHA512 9b8e6dab069f5b31f13f6ff68464d932c4eec9dcd5c17307b3ed29e3313170ad0a2e0df3f4582936fa503f44232b4e014fe8d438a97754b691895a1c9e82b345
 EBUILD hwloc-1.11.2-r1.ebuild 2207 BLAKE2B 56a2d0b7383b173cc389a22b3a3ee68a867db2339bad083720bb6c1a8f5e8879e414a87039164b019140f959d742519d5d5cc9126a8712e4ddb9af2dffedd964 SHA512 ec68dd2534e19ef77a0bd4fd87b357d8dc05bddc6a361ee320fe7b9145ed0a6988d219ec8c56c6ea66036db61e1cbd2ade9f34e4470b997684f95309287fce6d
 EBUILD hwloc-1.11.7.ebuild 2218 BLAKE2B e085ef7ca3e0d275b5e59b4e14206450bc4c820addef6931547247037862072d988e70f37f900a9a6bf66d478c48b97500ae1d5cbba1b405e5321e7841c217ab SHA512 984bb91ccc20ee9afeee0cc474141a7c967deb8e4cc02235a095161721e16aeec43901fb9fcd1eff0b3dd05e5f3a46691711a64a838d90423ecded36e900baf5
+EBUILD hwloc-2.0.2.ebuild 2220 BLAKE2B d7f1c3ebdff8a23587a59330fc67a9498e9e2d7094561018978e604c54d5ed70c1dbf6f463419a63732c3efea042dae052cf176dcea5e117fecfeb2eb5cf3fd1 SHA512 9b8e6dab069f5b31f13f6ff68464d932c4eec9dcd5c17307b3ed29e3313170ad0a2e0df3f4582936fa503f44232b4e014fe8d438a97754b691895a1c9e82b345
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild b/sys-apps/hwloc/hwloc-1.11.11.ebuild
new file mode 100644
index 000000000000..99b6fa5187f1
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.11.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
+
+MY_PV=v$(ver_cut 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
+
+# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
+# Anyone with hardware is welcome to step up and help test to get it re-added.
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	if use cuda ; then
+		append-cflags -I"${EPREFIX}"/opt/cuda/include
+		append-cppflags -I"${EPREFIX}"/opt/cuda/include
+	fi
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static) \
+		$(use_enable cairo) \
+		$(multilib_native_use_enable cuda) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable gl) \
+		$(use_enable pci) \
+		$(use_enable plugins) \
+		$(use_enable numa libnuma) \
+		$(use_enable xml libxml2) \
+		$(use_with X x)
+}
diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild b/sys-apps/hwloc/hwloc-2.0.2.ebuild
new file mode 100644
index 000000000000..99b6fa5187f1
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
+
+MY_PV=v$(ver_cut 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
+
+# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
+# Anyone with hardware is welcome to step up and help test to get it re-added.
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	if use cuda ; then
+		append-cflags -I"${EPREFIX}"/opt/cuda/include
+		append-cppflags -I"${EPREFIX}"/opt/cuda/include
+	fi
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static) \
+		$(use_enable cairo) \
+		$(multilib_native_use_enable cuda) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable gl) \
+		$(use_enable pci) \
+		$(use_enable plugins) \
+		$(use_enable numa libnuma) \
+		$(use_enable xml libxml2) \
+		$(use_with X x)
+}
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 26e7906cbca1..922b70ef45fc 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -12,7 +12,7 @@ DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf
 DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
 EBUILD kexec-tools-2.0.14.ebuild 1700 BLAKE2B 13e47f83fcb672fb4bbc33234f4e1b249171ce883a3515c3d046243c6981bf211652d37e3d4d952850abda95c130ebeb8b909270221658b148725aa20158aa99 SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a
 EBUILD kexec-tools-2.0.16.ebuild 1763 BLAKE2B e04d8b08d79df40644ecc4f2940dd68de6e3201756d7282328fc362b8770e65961cc4f0fdc928ecd63d966132202043c3e1b1a89b655ae779d5d2e9a258ed4d2 SHA512 59e742b204778dbcdde57368509d0a76456dbad1495e3a977de6dbd59e9156447a8ade274bdc916ef62bdb615f3018b3a7f238ac9b1704b35d301599a4f06274
-EBUILD kexec-tools-2.0.17-r1.ebuild 1882 BLAKE2B 29c1fb6af24a0d5b9002de318c405f65d4a34ea6d8aeb402954f188c7a44923615a12aeb7d131ac2c969f2bea96a0f46c0c560f0830f4a60561caa672ed9ba79 SHA512 50ecc958c304bd7afc785f3dd417d305fc4a85eb1d77c95f4abd836b9f0771d351ac779140676124ae6c54e20273ba058f870638fac8f27a0916a5d786bdfe41
+EBUILD kexec-tools-2.0.17-r1.ebuild 1881 BLAKE2B 458a2767140a75c145ce95b8fd8eb1f3eb2a7edc0dee7a268153147a056582c7f7eba7bb7d2cc1ecefebe96fc065c1537280383ab88b6d3a2d169f33db8375f4 SHA512 59f734eb8c42cc73b40c6736845903d74d87cc8a124f0b90b8bebf8345a5518b7d77eb7a7919dbde95997aba88efe079ddd6d817531732e1f43f106076a64c6d
 EBUILD kexec-tools-2.0.17.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 EBUILD kexec-tools-9999.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
index 849d5fd33b9a..b11b9c2a383e 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 inherit flag-o-matic libtool linux-info systemd
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 89c507333487..7a96a10ca208 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,12 +1,16 @@
 AUX keyutils-1.5.10-disable-tests.patch 1214 BLAKE2B ac79e98a45b02575433e3604a04b1597a386b96f45d872f175dbd36d134d9aa5cf44f0dd4a3a4b9bea38c9986a85a9d60b45f7f4a7576d19a6a5c369bea1ce4c SHA512 dda49b7c3aeadcd7d4e52d304ecf60fedbb84d02a11d0a641dfa4d563c6f6fcc2c577b46eb688c159feaf0be32c0aff4470adec5d1c3bff544d5dcea47162cbe
+AUX keyutils-1.5.10-endian-check-1.patch 796 BLAKE2B 1860c4fdb076a34127be13546007832d4b4b6a23e2033f39cdfafd84207c96d854df199a8831d7e11e0a17aedb16193483a7470d7449f11101f0a6e268f668ed SHA512 56c22165fb69c24381384e81e2927f01054cf6ba7c781c02d0891b6d55a405d63aa542d846a809a7c0ea1ae29d2b44d711890d72ce1fb18eb6146adc0ad1e9d6
 AUX keyutils-1.5.10-makefile-fixup.patch 798 BLAKE2B 42dec4f0a6b8439a631e1dbe319a893379e719b640ab2908da28f251bf837efa5d1b85d2d265250cd8248f4c3b24a02b99e0afd021ec2f203bcee4c071eeb244 SHA512 76b1eb98157f2f45b9acce9fd99f2fb10d592cfe61463075a8f6b963ffa2ab97f44aa3e5a3cc7bacaf53d08f51e81225506324edb6d3fa7d5c51954fce783e1e
+AUX keyutils-1.5.10-silence-rpm-check.patch 605 BLAKE2B 7f18a8e8530fc7ca13522bb1cfe3066c980cf9a0dab4d390a28adbd0e34fdf5011de5b14cbfedb26f3c99d6e7cdd7f3b85d29ffd64e33da2df4e7752a8989e26 SHA512 4d9f0c177be36b29fc9e23f56b964d47d4dda89c80f78c4a46c5725614816934b656dc83cf4b6920df72eaf0b9c4fe10825c7cca8fb4363277aa45befa816fa9
 AUX keyutils-1.5.5-makefile-fixup.patch 879 BLAKE2B a4c5fe84445c638e126dc017a2caf05e97803d83a21706cec4ca116982f2111d54acdcf76cff63684dd50bbe8cdd38fbde1b18b7c73f82a8d943a1558c3d377b SHA512 d3628be5cd759fd59e3fb07897db2f23615cc4b2b12d537438c4c186e5588d8d7c22438fdb26003be29ace4910db24a889d4e35550b74a91958a4fcb4bc654c0
 AUX keyutils-1.5.9-disable-tests.patch 1146 BLAKE2B 8f4206d5c46e735e51172cc470c52c0f1326d392c05fdb2c5a8885e79e3c9108336ffaff778b0953a274c161e0bde4a4f23048c5e12e220ad996b916711be638 SHA512 cae4f6457587328efba4d391726d8ca61a7d4a2ca0fbf2b8eb6ccfadce53240ad9cb44137dc178efe7cfa78bef48d6d84fffd7af07cee15a949f5c62eae493e2
 AUX keyutils-1.5.9-endian-check-1.patch 1254 BLAKE2B b4416a587c208f7e8926c205a0a565495e7508df5245466bcd8abc4f7a19214626da759d0321d7db1d51f2e4553383d5475749ea8f9f6d58ad8749762f56d6ad SHA512 95f05393186546ff3b28e14184c8da6d507085e687e6921470bcb433a925b56dfc7b806eaf63a552552d0cad3a73294614f990db583e3a6b89ff973ffad1dce6
 AUX keyutils-1.5.9-endian-check-2.patch 1131 BLAKE2B a5fd6fd62dd94be2bb23b3b60cedd1b8d6d3b06bdd32fcbbdcbdbc08150484eb6122271f20432bad3fa8697e626676c329ba08bf23d4a31788949b0c2bf7aede SHA512 9604b79b1d85bb1c56f5ca261f7f72fe84176fff0a098ce2fa35bb0ab5b325a7613f3e37f5f27ff1e9269d5779d77715baa0bd74a0d4f0b7c9bb1aa27b84b214
 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e
 DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f482e27c3ba71d906624ecc88ef4ce2ee909d7bc3a35b42b50e971c0bd0600cfdefa9a3db35b25553bfcbe7d2d13 SHA512 7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
+DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d SHA512 5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
-EBUILD keyutils-1.5.10.ebuild 2840 BLAKE2B a2c5e97bf4a87b1e8d5a4b7546004dc32c172c5bd0771721a5469aab7f2f198c3dec04eb9d48ae32d5f941a96881c9753ab374b278838afbef7b751934b36e55 SHA512 e3bb4180cbf4b6331c0f48ca2a9c3f636d1a4d28f731678a8db8eb92c7f0b377dec220894135bd8fa90f4a641ee99f80f4f09e4bc39220e39972aa1e8c09f078
-EBUILD keyutils-1.5.9-r4.ebuild 2984 BLAKE2B f93ee7c4a4fc0cd4f623d13f2007355294e0a9dc6b6f86ee8afce908569db146e166a2e90565891ed396137d5f8dcff762287674e3f36167b7d377177f36d591 SHA512 0175ceb620c7ffe593145ac41303a200584bb8212fb1df3767ed23a1a99c6027afe457da33a1fbb4f18b6bd19dd0f22808fe39cadd921a687a7464602a55019d
-MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
+EBUILD keyutils-1.5.10-r1.ebuild 3807 BLAKE2B 8d2e9f93f40d73201fd6656cb00a1014087e98456298d3287fe56c5c782ec60fc70c06dd2a4a926f00a3d2365b517e12101010c3afa6cf968eb76684b6ac181f SHA512 675c9636058912f9af7b86ba0525a19dea4581e220e8acd1ca3b3270cf8b166d8e8f8632879b71a57d8909c163e3c66adf90a69d4e9cd6a747deaa81cd8e4b90
+EBUILD keyutils-1.5.11-r1.ebuild 3807 BLAKE2B 658c8f9988c4b69aa3cf8950967af3ecccc90e3880583d4448e59fa4879cc243ad7f1bc1031fbf337e3edec3befc86220ccf48fa3322e0fd3fa0b812ab0cc96d SHA512 667f7397d897ac640e3ceeddcfe1b7291cae8821d5cd0256681c31a0407b8cd2c6cb037c1dab3274097537bcd5b10e63a03d85fc873abf8db84d5902eaccfe90
+EBUILD keyutils-1.5.9-r4.ebuild 2973 BLAKE2B ba219272ffc0de1936e9f7be9a6c648a5d96854bef34b4a9ead72f5431283cb1d2e595e96d111d9c50024d4511657252ae0490c3cfe0d497f85f8809ecb3ef14 SHA512 bdf3d4a62aac9e4ad0a52cbb800fa2d7d5a3801385b9744f33343bef587e562708352b552abe79bf65441ddc13584d51dc82f59d702062f5e10ff9444f35bd58
+MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
new file mode 100644
index 000000000000..99cf23fbb21f
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
@@ -0,0 +1,20 @@
+fix regexp match against `file /proc/$$/exe` for -fPIE bash
+Now that bash is built with PIE enabled, keyutils' check for endianness
+fails because file no longer returns "executable", but instead returns
+"shared object" for file << 5.33 and "pie executable" for file >= 5.33.
+
+--- a/tests/toolbox.inc.sh
++++ b/tests/toolbox.inc.sh
+@@ -13,10 +13,10 @@
+ echo === $OUTPUTFILE ===
+ 
+ endian=`file -L /proc/$$/exe`
+-if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
++if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
+ then
+     endian=BE
+-elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
++elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
+ then
+     endian=LE
+ else
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
new file mode 100644
index 000000000000..dafd7de8dd91
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
@@ -0,0 +1,20 @@
+Hide
+
+> grep: /etc/rpm: No such file or directory
+> grep: /usr/lib/rpm: No such file or directory
+
+errors.
+
+Bug: https://bugs.gentoo.org/656446
+
+--- a/Makefile
++++ b/Makefile
+@@ -245,7 +245,7 @@ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+ 
+ BUILDID	:= .local
+-dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
++dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
+ release	:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release	:= $(subst %{?dist},$(dist),$(release))
+ release	:= $(subst %{?buildid},$(BUILDID),$(release))
diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
index 298b6bed808c..e76b88beb5d5 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
@@ -10,27 +10,49 @@ HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
 SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0/1.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""
 DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
 	"${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+	"${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
 	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
 	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
 )
 
 pkg_setup() {
-	CONFIG_CHECK="~KEYS"
-	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+	# To prevent a failure in test phase and false positive bug reports
+	# we are enforcing the following options because testsuite expects
+	# that these options are available. I.e. testsuite only decides based
+	# on kernel version which tests will be called, no feature checking.
+	if use test ; then
+		CONFIG_CHECK="KEYS"
+		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
+
+		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
+			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+		fi
+
+		if kernel_is -ge 4 7 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+		fi
+	else
+		CONFIG_CHECK="~KEYS"
+		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
 
-	if use test && kernel_is lt 4 0 0; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
-		ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+		if kernel_is -ge 4 7 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
+			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
+		fi
 	fi
+
 	linux-info_pkg_setup
 }
 
diff --git a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
new file mode 100644
index 000000000000..23be07210bad
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs linux-info multilib-minimal
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
+SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static static-libs test"
+
+RDEPEND=""
+DEPEND="app-crypt/mit-krb5
+	!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
+	"${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+	"${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
+	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
+	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
+)
+
+pkg_setup() {
+	# To prevent a failure in test phase and false positive bug reports
+	# we are enforcing the following options because testsuite expects
+	# that these options are available. I.e. testsuite only decides based
+	# on kernel version which tests will be called, no feature checking.
+	if use test ; then
+		CONFIG_CHECK="KEYS"
+		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
+
+		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
+			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+		fi
+
+		if kernel_is -ge 4 7 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+		fi
+	else
+		CONFIG_CHECK="~KEYS"
+		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
+
+		if kernel_is -ge 4 7 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
+			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
+		fi
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# The lsb check is useless, so avoid spurious command not found messages.
+	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
+	# All the test files are bash, but try to execute via `sh`.
+	sed -i -r \
+		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+		tests/{Makefile*,*.sh} || die
+	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
+	# Some tests call the kernel which calls userspace, but that will
+	# run the install keyutils rather than the locally compiled one,
+	# so disable round trip tests.
+	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC
+	sed -i \
+		-e "1iRPATH = $(usex static -static '')" \
+		-e '/^C.*FLAGS/s|:=|+=|' \
+		-e 's:-Werror::' \
+		-e '/^BUILDFOR/s:=.*:=:' \
+		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
+		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
+		-e "s: /: ${EPREFIX}/:g" \
+		-e '/^NO_ARLIB/d' \
+		Makefile || die
+
+	# We need the static lib in order to statically link programs.
+	if use static ; then
+		export NO_ARLIB=0
+		# Hack the progs to depend on the static lib instead.
+		sed -i \
+			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
+			Makefile || die
+	else
+		export NO_ARLIB=$(usex static-libs 0 1)
+	fi
+	emake
+}
+
+multilib_src_test() {
+	# Execute the locally compiled code rather than the
+	# older versions already installed in the system.
+	LD_LIBRARY_PATH=${BUILD_DIR} \
+	PATH="${BUILD_DIR}:${PATH}" \
+	emake test
+}
+
+multilib_src_install() {
+	# Possibly undo the setting for USE=static (see src_compile).
+	export NO_ARLIB=$(usex static-libs 0 1)
+
+	default
+	use static || gen_usr_ldscript -a keyutils
+}
+
+multilib_src_install_all() {
+	dodoc README
+}
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 2526784ea7bc..9270c709bd7f 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""
diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 9590fe15fc00..58a06dbe3359 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI compatibility for libkeyutils.so.</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 61f975cdd626..763b41c9ef9a 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -5,8 +5,10 @@ DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c5
 DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
 DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1
 DIST less-533.tar.gz 341035 BLAKE2B 19e6250ef79d1356b296dd23f2aba45ddddedc1a4c365154d18cd7fa7b79d7ed8c60d8a56646523b8e713d6eede065f3e5fb33527d97053adb2b38fe1f93325c SHA512 a2fa8286f185de866d7c74d9468d201905dcd1b95dfc37013bff3a98a7c8229d76f31584c2db5fe980999cef3445b7db63d5c244078ae0459830fcee609a8e39
-EBUILD less-529.ebuild 1379 BLAKE2B 2a2ccc09e83b054b26d30defcdab7e38cdead7c0518b479e98507faa66388828ceecba7c212e5bd6128289379a61c9fafbead43cf9e34a37d20e6c8bfbec2a79 SHA512 9d88c15907f68e4a8b96febcb2282d0909933cd5a1b19b46917de7108c4e95453973b31532c7b1883ec7bc2ee779fb7cfbf57d36b5682ed86d5673fecd7f8a23
-EBUILD less-530.ebuild 1392 BLAKE2B eb779b740776cbb763f13a1e9212c80f5935b03dcfc80d4ae94ffb5efb6499a191551de03b0265c2d6a7fceb2fb5a66f5222368f6c9baa603a1224d3297705e6 SHA512 8b5fd99e7b47fbdb9bb3e079079a33783d5b1ff915a057e6cf6d2f7b23016d4882fe3395778ba173638a2b07593291a5c6ea1840a7fa2e97bb52b96295a41078
-EBUILD less-531.ebuild 1432 BLAKE2B a62f748377df05b79e0b8b3d9bd782c1413555fa60cc9e7584cf59b7f67b9e64aab3ef2c62ec26723ae7024935b21d54a891e6d2555b2337c5b3844a8d2a792a SHA512 6c1e38b51c036dfcdd94060fb3cae3a0ce4e251585ed803118ab8674747f2927b3e67451b744cee1d521078ef02e378a5bd973310ad7ba41417ee7795c4c6c8c
-EBUILD less-533.ebuild 1432 BLAKE2B a62f748377df05b79e0b8b3d9bd782c1413555fa60cc9e7584cf59b7f67b9e64aab3ef2c62ec26723ae7024935b21d54a891e6d2555b2337c5b3844a8d2a792a SHA512 6c1e38b51c036dfcdd94060fb3cae3a0ce4e251585ed803118ab8674747f2927b3e67451b744cee1d521078ef02e378a5bd973310ad7ba41417ee7795c4c6c8c
+DIST less-534.tar.gz 341351 BLAKE2B f309e486c80eb7573ebffa6cd0d43205bb517a0e1f56116ddca739fb5a94cb010157d7f64507a4e32401e28f499d25b9f1c33d160416cef8f7fba01c62cd218e SHA512 b6896061616b30ccdf4e4f03d95ed5372e912dd42832903015bb7ca1fc5596813b86581f02c6a34f6d6cc0e56f58ff62c8a7e1488a7014bd23acaca9236493fe
+EBUILD less-529.ebuild 1368 BLAKE2B 869dcc47d95cb6f8bc1fc56db2a1b6515b7b8c0e82943d603c05d125e1a6deae60d68b4034e4f691ecd66ee50c802e4c66cd0760e278f49dba74b33578aa656e SHA512 b1a6feb875564ff527d691253c01e3fe64097c511e087f44195f140fa727918d62d285a894a1fc018279ecc3d29c059436a10b490d6d1d04c80691d45bc7c29a
+EBUILD less-530.ebuild 1381 BLAKE2B 13673dbd46b697128c6db8ff626dbb90ccf8ece61472cd0388f6ba10eeda57b4c4e3c084729b81230423fbd96342ec19f251a4168575f83209afdda6cec10a67 SHA512 e787c5b63dcf1d2a2dc80d843bc5e674596ad992220849557ec6ffd93ba53f9279cd21fb02cd652ba2fa0c0d0ada2c6dfcf18198194c0089f770da3a4a40980a
+EBUILD less-531.ebuild 1415 BLAKE2B dd7f53379ee529bd725e8d03708c3310e792e36cdb001a5092e237cf5aa764bd984976204bec6f885950a308212b003164baa9865719898f300927cf88bbd104 SHA512 e5b8de631d3e540a8a67e6a67c2871d8d4490f75982debf71cdbab6c83234efd38edd3f7069588c070060eee9cf41f01ddf8216767ffc2d17c72d1d6dac76b40
+EBUILD less-533.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
+EBUILD less-534.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index 647f74ce41b3..cd2ef2bb48e6 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-530.ebuild b/sys-apps/less/less-530.ebuild
index 84d4144cc47f..212cdd7590b3 100644
--- a/sys-apps/less/less-530.ebuild
+++ b/sys-apps/less/less-530.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-531.ebuild b/sys-apps/less/less-531.ebuild
index 6509cbbb85e3..7bc31b9a5191 100644
--- a/sys-apps/less/less-531.ebuild
+++ b/sys-apps/less/less-531.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-533.ebuild b/sys-apps/less/less-533.ebuild
index 6509cbbb85e3..c4d58efa2269 100644
--- a/sys-apps/less/less-533.ebuild
+++ b/sys-apps/less/less-533.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-534.ebuild b/sys-apps/less/less-534.ebuild
new file mode 100644
index 000000000000..c4d58efa2269
--- /dev/null
+++ b/sys-apps/less/less-534.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pcre unicode"
+
+DEPEND=">=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:0=
+	pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
+	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index d44a01b207e3..eead3b3cd473 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -10,7 +10,7 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
 DIST lm_sensors-3.4.0_p20180318.tar.gz 260899 BLAKE2B a859c20ef148f80cc9d5ead61547feb5c26a77447aeedf9273334fc1e5b4075c74d8f786102e33e8fc771968dd605829923f8d3da8293fef168c74b8c55bf32a SHA512 923ee985d8e0b8fdc43b2e4418873ccbeb8433adbf2efe71fcaba1df0c6971d502866abe8ea015d199380e06e3cfd35d945451e5e9f7e64cede35fff37621aee
 DIST lm_sensors-3.4.0_p20180820.tar.gz 261837 BLAKE2B 5b072a71554fa2ae41dd0fa51b66dcf32874579eef51a94d36b95e92b77629fbdf193a281bde3258af60366df38cacec6da67055f9f4766d863d37673f6a5065 SHA512 99ca718ae0e832fab8cbb3a2ab106f5df2fad9e822df99ee24d73758c64853a05c50464081e84335680a44ad93acaa6d4f0ef21291b7f008f24bcaa292d0fdab
-EBUILD lm_sensors-3.4.0_p20170901.ebuild 6330 BLAKE2B 8b17a747524ae07e3105d570109a18cbd690725c834234bfc82ed926bac576b97e1d5fbb2c7fd58fcace61dc95807391961ebe15beb1bf6cafd462f86fa32f1c SHA512 afe2db6d3699a1ae079a4994746fe214269c89b09ab641788b73b0c7ecd780713210ed31251edd1eb4141b7679b7124c0f6ee22a33a150aef8dff13e482ab03d
-EBUILD lm_sensors-3.4.0_p20180318.ebuild 6338 BLAKE2B 99b2847e9f3de45368b3dc1d9de7006c340a4b336f6ea82eb2220c7a45342f680bd3bc9d005338868b96b9bf65816da0ae29f3945029ac6b9fd806ebe957163b SHA512 526fb55c056d3782c9461a2bb1eb8af5b3816225fc923563e66ca23c1435736ec2ce74cd88865cd7411cef9e47ac641e7815cd3c5b2d404d093dcb6a988fa36e
-EBUILD lm_sensors-3.4.0_p20180820.ebuild 6338 BLAKE2B 189d222d04f813564610348a131b87ad9bd13deead56287ded42573c2457efed572028eef88b75426afa35e511d7468563ff17f2f0250badc8b0e3c71832f29c SHA512 6d0b4f26dd725703e2f411a56347f50c746f9ac2560a62721f9a88bb78bdecc603808359dbaee9d0c74f75ac005018b1a049ad2f5813586e1a1c2f1395844357
+EBUILD lm_sensors-3.4.0_p20170901.ebuild 6319 BLAKE2B d1ddc399feb10b050e28e0e7b2ae05178b3de4eacde019ae615f57d2d83c214b54330f1f0923ffe2e27838b6048f27b4cb2225ead5436002a84da2fbbddb2a50 SHA512 72759cde25a87a464e9ee6f25945965172c514c0878eb44c258ac295142575815975aa4425e1c13522e94faadabdbcaef6248e2b4b89af14bcd4e047241685bb
+EBUILD lm_sensors-3.4.0_p20180318.ebuild 6327 BLAKE2B d195ed09adba08e97e789b7b1331ee420503c272fe2ea820db781e74ed9b3d4e93b735e286bac3a7557d600aa17af77b81d55f3ea73125151a93ffd73a979ad3 SHA512 563eea349d9e824986867a0e25aee963a212bbc927269771f6f350cd7c2f2142b15e9295ac3fe2e0fa5d7f8e883d7a69eced1e6890064c0325a9636446186bce
+EBUILD lm_sensors-3.4.0_p20180820.ebuild 6327 BLAKE2B 743e324ff197bd8d388e0fec9ac4640a2414c3098515a37dff39fb2718706ed0679a11504cdc435c76e6f5a3e508fc095a0191e862bc58deaa49620efc48b26a SHA512 b668973e8b4f8ba0f81ae4ea61c10377f32551e32750a24eb4b546331106282363f957df0cef72695831307809bc5052227fb001de2c0df7c3fe64c55eba3bd8
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
index 3999a62a36b1..9dfdf7000f8a 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
index a6c69f572bca..c5661adbf809 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180820.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180820.ebuild
index 98927537b6e0..c653d828dc4a 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180820.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180820.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index ebb6352241be..9c8d71b088a4 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -2,6 +2,6 @@ AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a1
 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
-EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B 5fc65b823fddbd74a588f0de3ae4946530e35c221c3d1368a315c2d3d5181c80f34eb5e6032b8b5b4a8e360131487620c1a73d303a4e5d22446fa616a1e8a4c0 SHA512 c82b9b9548ebaf9dce134cc80f290e1199344ec70d9f94a7b742971a320a9419c66e06e4500865d108f73733b50e726cebfe4ed7fb31573deaa12300b457d047
-EBUILD lshw-02.18b.ebuild 1732 BLAKE2B d131f58bfd6f47fe79d4e9a65f2af1d5151522b1a804051179be674fa4b1521aaeeed7c85780df99cd0cb8fcee349f79610aadaf7c16fc9488fc06cb3fa91dee SHA512 2bb39c60194d9648309c2990ab0b354ad758abe3a46e25e21b1aec5444f87b4652a47fa63f71c9242cf9b8bbc05e997e552259b309b48f95f2094914da84629f
+EBUILD lshw-02.18b-r1.ebuild 1768 BLAKE2B e557af6f6f3874f434bb0f0da824a378d2fe1e36ac00782752f126df14d8b4ff83b2224bac4fe91df7652b0383de009fdc3c5f01b94e771c2d61109ddad343b8 SHA512 9eef7b1a0e54c2ef5d9e1af5c3caa21dbd566443d7b3d83e68cc8cb073495105452cbbd3126ce1eda78f08ea430f7a92e9cd01a83449bea86e8bc53b26c5b91a
+EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 617491f96945cbca541d7448da5c5fe13cf3ff8af07c0e0f3f749daa6a2f08868af8dbf45271d89c728a1e671fe6fd16dc4613094225e3057560f4587ff728e7 SHA512 3ba585be677880c6efbb1aad340cfb8dce7b6b33709e877dcb91d25973d363d48a26b9bbc83359070fd1b42e0c0d4e72e2d19b4467f9f559a7a8f6c0b2f19781
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index c22eab427571..0e2cb9c62563 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index e9da0f61c0d1..7f414bac3819 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index d42dd92d143c..4a32a2a842b4 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -2,8 +2,8 @@ AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
 DIST man-db-2.8.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745
 DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d875edd79f0aad992d884e83fc28a8c3b7d82ded187293d858dfadae48eb088722c3ffc91eec64b71cdf46750be SHA512 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66
-EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9
-EBUILD man-db-2.8.3.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
-EBUILD man-db-2.8.4.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
-EBUILD man-db-9999.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
+EBUILD man-db-2.7.6.1-r2.ebuild 3162 BLAKE2B 5aefa5d09e68cc46d639cd09d55d8347046b9fab1b148d40e11a996cfbf94fcc43b8fc386941b3a157a2ac13dda2c6b4f8eafea75433af10560d86ee6f1270c7 SHA512 b42c3a488d2424c24a12f5eaeda2c15efeb18cf9b3c55230238e686712d78f127f9c9e2668dc0da84569cac1d532e19088cc78936d94146a981b776f82934fe9
+EBUILD man-db-2.8.3.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
+EBUILD man-db-2.8.4.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
+EBUILD man-db-9999.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
index f3518c712b31..42f29b6128dc 100644
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/man-db/man-db-2.8.3.ebuild b/sys-apps/man-db/man-db-2.8.3.ebuild
index 627b8941479e..670cbc0de539 100644
--- a/sys-apps/man-db/man-db-2.8.3.ebuild
+++ b/sys-apps/man-db/man-db-2.8.3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-2.8.4.ebuild b/sys-apps/man-db/man-db-2.8.4.ebuild
index 627b8941479e..670cbc0de539 100644
--- a/sys-apps/man-db/man-db-2.8.4.ebuild
+++ b/sys-apps/man-db/man-db-2.8.4.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 627b8941479e..670cbc0de539 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 731cdcbf7516..17fa9b7ec5bb 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
-EBUILD man-pages-posix-2013a.ebuild 783 BLAKE2B 28f59cb3df4f6ce645c9455a3b6ff85a400505822d19ff03387a4a7d2a5bd9cc0dc88412d72ec0522a1c997ae08f99fbb4f77f247adb75fa1e3956d71a7f02fb SHA512 8d0d1d6a53cb78e892bebb474c7763c8f5366e6182ac9b36ec60339636bb969688a0bd72dc32aa9698a928d9c68d634ce3ba7b236dc546a5c342c91c3bbf1998
+EBUILD man-pages-posix-2013a.ebuild 772 BLAKE2B 5165ab57a70c1d7b2c2d4c2910a1418bbd2bf8fdc0b4515e9197c5148f9c2735b38586d392937345fff7691d1eccdde9bb040d5a338093d24ec39163fc18c0c1 SHA512 1bb3e151e8781800ba63eac68ec8b1551f501cef10c8886678558716b83040af284322c3e6b0bda487e25b03ce6fd3e797ccaee3dabdd9f5fca628e0abd68553
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index 7e6d878f0611..67b7c2b08f58 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="man-pages-posix-2013"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index b4d9465e613f..6d13edde0017 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,7 +2,7 @@ DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d30079
 DIST man-pages-4.15.tar.xz 1622184 BLAKE2B fac4895411bead3f2ce7ce642206f80ec7422b11b0cbe96abdbb855e24acb1f271c07c7f3d2b07105c46062b0f07c54c9ee06281ba3dd81224e0304174a6842c SHA512 cde896add266e672347841a9116e5d182084044c4543a847945825f98962192f0e8278a4f562fc47a580eb2ddc3d669ffc75a21922219b4d3c36cbe8a792e205
 DIST man-pages-4.16.tar.xz 1630064 BLAKE2B 7c436ebc01d5248378f40fa8f8004bd2e0760a8409b419d4d7aadf8f0075bfa9b89801172b328856ed0f0a70b75523a489957a9aacba66e893698bea1ac98efc SHA512 df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-4.14.ebuild 1656 BLAKE2B 6fa0129e7c8c1d11245ee519595377d1fb6a5c3a894c7b340d73c22121928b498f1b0612806a97010bd9c44a7958fe9d3ec334e5d0769ef73310e06870fd29e2 SHA512 e39d42d12106ef69a497bd48326e9d2a20528a4a8e329e8fbd3f8a3dff57acc3b3481971763598ca1f89f1cb27f4de486268ab4e44bb1e3b3039250ebf8957b5
-EBUILD man-pages-4.15.ebuild 1656 BLAKE2B 6fa0129e7c8c1d11245ee519595377d1fb6a5c3a894c7b340d73c22121928b498f1b0612806a97010bd9c44a7958fe9d3ec334e5d0769ef73310e06870fd29e2 SHA512 e39d42d12106ef69a497bd48326e9d2a20528a4a8e329e8fbd3f8a3dff57acc3b3481971763598ca1f89f1cb27f4de486268ab4e44bb1e3b3039250ebf8957b5
-EBUILD man-pages-4.16.ebuild 1674 BLAKE2B 535811be8d0e7f17d8af2272e66e8623d21b546e4c820207adb27545c1730c7d14ed3e40e3a8c05559224600d9be0c82af8809cac7778caab64cb02c3935b208 SHA512 b166a38aa5517ba146016734260b8e0137b65260d59ae27408b6960f1db9187c27184ddcff54776149094afbfc627cbcfe732ddcf774943fd8837277f5bf1ee6
+EBUILD man-pages-4.14.ebuild 1645 BLAKE2B 1313b896ab46a82d8c7db39313163388bb91a2fc23faf11ab758beea2b968ccd0225cb0d8f3c1040b68d8e82b6803e47e84eaebebfce61d5d251a7b6e6e495ab SHA512 a7d6ae123a2e7e3769a206e62587a5d2aeb87ce2da6b3fd217f4658fd97e0f29816f5b2fa4a7b3cd754a4150b293c155d006cf19337a906b08b9104bcebd0325
+EBUILD man-pages-4.15.ebuild 1645 BLAKE2B 1313b896ab46a82d8c7db39313163388bb91a2fc23faf11ab758beea2b968ccd0225cb0d8f3c1040b68d8e82b6803e47e84eaebebfce61d5d251a7b6e6e495ab SHA512 a7d6ae123a2e7e3769a206e62587a5d2aeb87ce2da6b3fd217f4658fd97e0f29816f5b2fa4a7b3cd754a4150b293c155d006cf19337a906b08b9104bcebd0325
+EBUILD man-pages-4.16.ebuild 1663 BLAKE2B 56422d9d813f110c23d84d133c65b4628e381c7d91d2e8c4cb3c35527c271a517e77a3ddd115b2dea4cd99ccd53b2c5b23ca6df48afa845d75521fd6fa9d0b91 SHA512 673726a6eed0f05f37e44550e35684d3305fb778778e4fa8c3b69a8a387eff4d05b1c2bd8e285500af7377dbf7c0696b99a3a3445657dad569a4e16a81f29075
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.14.ebuild b/sys-apps/man-pages/man-pages-4.14.ebuild
index c29ebeb71310..d1ebe8fa6a89 100644
--- a/sys-apps/man-pages/man-pages-4.14.ebuild
+++ b/sys-apps/man-pages/man-pages-4.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-4.15.ebuild b/sys-apps/man-pages/man-pages-4.15.ebuild
index c29ebeb71310..d1ebe8fa6a89 100644
--- a/sys-apps/man-pages/man-pages-4.15.ebuild
+++ b/sys-apps/man-pages/man-pages-4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-4.16.ebuild b/sys-apps/man-pages/man-pages-4.16.ebuild
index 29ff57d6d8fb..946ba0ae743a 100644
--- a/sys-apps/man-pages/man-pages-4.16.ebuild
+++ b/sys-apps/man-pages/man-pages-4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 6b9e2061aad8..fc7e60e51530 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -5,6 +5,8 @@ AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a928
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
+DIST nix-2.1.1.tar.xz 814812 BLAKE2B 48486e8eb2937fff1e2b39b7ea61eea3ad6ba477229006e31f6efbefcd7839669d1e9533b1b601302a5d4264e2ea261758aff3a79bea616215b22041d32e0469 SHA512 38a5b4013eb60a0088870dd142b2baacabc9f204af07f349d34a529a3130568e260765793162c5a978ee6115fd66019e132c08524af4984e5698535f17fc29bd
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
+EBUILD nix-2.1.1.ebuild 3182 BLAKE2B 9b6a0aac5c73bc3f9dc688eddc6d2b327c80f40c9431f76e285640dfc44dccc603e1d18302ab0f2c5a04a8f679737cb8a702c4682fae4e1bdb58468c22b195bb SHA512 89ed502fdb9472df48ee061541449e087e2630595c3b97053d828ff90d0ab13610c260bc458c94a11857f9d7f7a696f7a702ef36a5ebb931f89996095b549d85
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/nix-2.1.1.ebuild b/sys-apps/nix/nix-2.1.1.ebuild
new file mode 100644
index 000000000000..66d217abf098
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix"
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+	app-arch/brotli
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-db/sqlite
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66:0=[context]
+	net-misc/curl
+	sys-libs/libseccomp
+	sys-libs/zlib
+	gc? ( dev-libs/boehm-gc[cxx] )
+	doc? ( dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.6
+	>=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+	[systemd] # systemctl enable nix-daemon
+	[openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+	\$ nix-channel --update
+[as a user] install nix packages:
+	\$ nix-env -i mc
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+	but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+	nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+	enewgroup nixbld
+	for i in {1..10}; do
+		# we list 'nixbld' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+	done
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/nix/var \
+		$(use_enable gc)
+}
+
+src_compile() {
+	local make_vars=(
+		OPTIMIZE=0 # disable hardcoded -O3
+		V=1 # verbose build
+	)
+	emake "${make_vars[@]}"
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	# here we use an eager variant of something that
+	# is lazily done by nix-daemon and root nix-env
+
+	# TODO: will need a tweak for prefix
+	keepdir             /nix/store
+	fowners root:nixbld /nix/store
+	fperms 1775         /nix/store
+
+	keepdir             /nix/var/nix/channel-cache
+	fperms 0777         /nix/var/nix/channel-cache
+
+	keepdir             /nix/var/nix/profiles/per-user
+	fperms 1777         /nix/var/nix/profiles/per-user
+
+	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+	keepdir             /nix/var/nix/gcroots/per-user
+	fperms 1777         /nix/var/nix/gcroots/per-user
+
+	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+	if ! use etc_profile; then
+		rm "${ED}"/etc/profile.d/nix.sh || die
+		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
+	fi
+}
+
+pkg_postinst() {
+	if ! use etc_profile; then
+		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 0917ad19ef29..c31bdffe23c7 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,6 +1,4 @@
 DIST paludis-57881321fa3d5d82a9260db54afd608fd61dd533.tar.xz 1004012 BLAKE2B 0bc65918b277ae4203fb5dc66fe3a84caa142b5e97b9e1f1b9a5f2e1b9c27fb4c60109c0bc1c058e095850bcf488075e21ab080bc5c4f2156e4c901923856ddb SHA512 ed9053b933172dea0122c171a14965b0d183affa8d3f2aa2be5cc2a2cf11f81f8a693b30bee93963dd890ebe41f454cf5ec5ab38f0b7924318b8bd8d1c37f5d9
-DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 BLAKE2B 1c34c93815efa41298cc2916c4428971d1f54242cfd759c771972bdcde94986c6af03546372c7eda277a343851b38ee93c0a103e519457b42e48cc7bed87b755 SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e
-EBUILD paludis-3.0.0_pre20170808.ebuild 3780 BLAKE2B 9d3c990aa4f87bb45c3fbef6796fd4c33f373e9475cf78760fa7ad2599faee12adcd015957a5a390ff98dec4bbb37d6622a94356a2c85744d7c3a7c4f87a1d24 SHA512 64abcb3081658b9e4c391559fa1b22aa5729f20b7a7bbf8967819fb760e626bf01e90ed078699e97ad73e700880ce636db2ba472f30039666a219285783d69de
 EBUILD paludis-3.0.0_pre20180214.ebuild 3779 BLAKE2B f4e8313c5f5fb3253dedab218400bd6d72ec17a5869888d506a214f940af7cbe268ab97697d09da140f0bd69632818295a60d728b8329729e42b6ddc026fa1d3 SHA512 931f67be3dedb323c81d257d54cf667204938bcf9509eb660356b073175e54325d9950a5d8099fbd225b3632b7d800097fd648149edd1211c5ed0d2782c6bc69
 EBUILD paludis-9999.ebuild 3633 BLAKE2B b27ba87915d6a019d6503c97eb23fb5ea87dc85df20e0ce3d29973117a961c7f477bad0b21c660f6689f9c1eebba178b4f2797e5c8e40d8c5fe23f3d46a12e1d SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d
 MISC metadata.xml 706 BLAKE2B ec2963b467d0fbab598fdf44b021cc10569e9a25305ad22c08d129c17f36db1a0759edb6e89119cd687fc36b2b26c4844086ab1cb8e249b6883df8fb9858b830 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
deleted file mode 100644
index a373d25270d0..000000000000
--- a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-RUBY_VER=2.3
-
-inherit bash-completion-r1 cmake-utils python-single-r1 user
-
-MY_P=paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
-
-IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
-LICENSE="GPL-2 vim"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.2.13
-	>=app-shells/bash-3.2:0
-	dev-libs/libpcre:=[cxx]
-	sys-apps/file:=
-	pbins? ( >=app-arch/libarchive-3.1.2:= )
-	python? (
-		${PYTHON_DEPS}
-		<dev-libs/boost-1.65:=[python,${PYTHON_USEDEP}] )
-	ruby? ( dev-lang/ruby:${RUBY_VER} )
-	search-index? ( >=dev-db/sqlite-3:= )
-	xml? ( >=dev-libs/libxml2-2.6:= )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=app-text/asciidoc-8.6.3
-	app-text/htmltidy
-	app-text/xmlto
-	>=sys-devel/gcc-4.7
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-		ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] )
-	)
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.6.0-r1 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/sandbox"
-
-PDEPEND="app-eselect/eselect-package-manager"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( ruby_targets_ruby${RUBY_VER/./} )"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if id paludisbuild >/dev/null 2>/dev/null ; then
-			if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
-				eerror "The 'paludisbuild' user is now expected to be a member of the"
-				eerror "'tty' group. You should add the user to this group before"
-				eerror "upgrading Paludis."
-				die "Please add paludisbuild to tty group"
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix the script shebang on Ruby scripts.
-	# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
-	sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOXYGEN=$(usex doc)
-		-DENABLE_GTEST=$(usex test)
-		-DENABLE_PBINS=$(usex pbins)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_PYTHON_DOCS=$(usex doc) # USE=python implicit
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_RUBY_DOCS=$(usex doc) # USE=ruby implicit
-		-DENABLE_SEARCH_INDEX=$(usex search-index)
-		-DENABLE_VIM=ON
-		-DENABLE_XML=$(usex xml)
-
-		-DPALUDIS_COLOUR_PINK=$(usex pink)
-		-DRUBY_VERSION=${RUBY_VER}
-		-DPALUDIS_ENVIRONMENTS=all
-		-DPALUDIS_DEFAULT_DISTRIBUTION=gentoo
-		-DPALUDIS_CLIENTS=all
-		-DCONFIG_FRAMEWORK=eselect
-
-		# GNUInstallDirs
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dobashcomp bash-completion/cave
-
-	insinto /usr/share/zsh/site-functions
-	doins zsh-completion/_cave
-}
-
-src_test() {
-	# Work around Portage bugs
-	local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	local -x BASH_ENV=/dev/null
-
-	if [[ ${EUID} == 0 ]] ; then
-		# hate
-		local -x PALUDIS_REDUCED_UID=0
-		local -x PALUDIS_REDUCED_GID=0
-	fi
-
-	cmake-utils_src_test
-}
-
-pkg_postinst() {
-	local pm
-	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
-		pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" )
-	fi
-
-	if [[ ${pm} != paludis ]] ; then
-		elog "If you are using paludis or cave as your primary package manager,"
-		elog "you should consider running:"
-		elog "    eselect package-manager set paludis"
-	fi
-}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index c65690cb3516..f7ee5f3a36f8 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,12 +1,10 @@
 AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
-DIST pciutils-3.4.1.tar.gz 404166 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
-EBUILD pciutils-3.4.1.ebuild 2854 BLAKE2B bfc624cfc8a303673e2c480ffd77d888243bf0df8c84733ba37bf9dd7c13063df458160f9649c3c8c67d3320418595406cafd9596814f399d24646161ff8d9b0 SHA512 cd86bd701d2225009923bbdc4bbc75b32b1992fb0f2b212fc7b0288c1e607f7ac64a3503c85dfdfc1a448f75cac9f904e4b2767d01abc7d5f5f8b048d826896c
-EBUILD pciutils-3.5.6.ebuild 2891 BLAKE2B 6f8e291077b15975bc14ceea0016f414e40443aa6d17cff42d42bb8572b7d9170f166675d00c32cf85d0c4d47591093661946ea2cb1b09ece4276fe6ef1ae849 SHA512 8820f77e2b2976fdf597454e7d82e85b29d7cfca775052781ad0c3a299fdd3c2f198c19d7d3aa56c6e69749ddd9829d13a283336d2fc72217297718d91600607
-EBUILD pciutils-3.6.1.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
-EBUILD pciutils-3.6.2.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
+EBUILD pciutils-3.5.6.ebuild 2876 BLAKE2B e8719bac7c67dd22f99b09fb087aa715b35ceec9e03b939c3c354574637d629dd03dc49b1477d3801110a29412e8a582a8dd0f96063fb5a9f9815070df629f53 SHA512 dfff94aa0813269e8d965e78284e7300af178581c55cd4c9b97fa939051342670d65fa097198cf7910fd47e61e71498a56290dbde1b7dce63555a4d7ed1bd29b
+EBUILD pciutils-3.6.1.ebuild 2889 BLAKE2B 770d5ba8df0e2abd4a0a81aba07e878af1da6b6b76c783f5bf737cfc5239811c91b610170b0ec44335488e674cbb97c763d9496dd887d3e253bf8768d949a726 SHA512 73799a92758b15c5ccf81362696220c1baef545d22923ff50eb9f3399d1b3ecb5a891650b47f5c694b30a6e8cf6dde87c5442b4a5f36435145a39f822b95bac4
+EBUILD pciutils-3.6.2.ebuild 2889 BLAKE2B 770d5ba8df0e2abd4a0a81aba07e878af1da6b6b76c783f5bf737cfc5239811c91b610170b0ec44335488e674cbb97c763d9496dd887d3e253bf8768d949a726 SHA512 73799a92758b15c5ccf81362696220c1baef545d22923ff50eb9f3399d1b3ecb5a891650b47f5c694b30a6e8cf6dde87c5442b4a5f36435145a39f822b95bac4
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
deleted file mode 100644
index 6769a5b8e41a..000000000000
--- a/sys-apps/pciutils/pciutils-3.4.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${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 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="kmod? ( sys-apps/kmod )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
-	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-DEPEND="${DEPEND}
-	kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	append-lfs-flags #471102
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}/static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
-		"${ED}"/usr/share/man/man8/update-pciids.8*
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
-		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-	fi
-}
diff --git a/sys-apps/pciutils/pciutils-3.5.6.ebuild b/sys-apps/pciutils/pciutils-3.5.6.ebuild
index f8ddd190f8f5..e9b3c34b4292 100644
--- a/sys-apps/pciutils/pciutils-3.5.6.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${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 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
index 4fa617e1c488..9797f04d23d9 100644
--- a/sys-apps/pciutils/pciutils-3.6.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${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 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.2.ebuild b/sys-apps/pciutils/pciutils-3.6.2.ebuild
index 4fa617e1c488..9797f04d23d9 100644
--- a/sys-apps/pciutils/pciutils-3.6.2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${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 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 957a80ec1766..f2ab6a988006 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,8 +1,6 @@
 AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa06eeec753415df8b514894dbc925c9210df80fbdf2f723a476740e8d15785c2c98cca6733249c4643aa632aa SHA512 74421fe073cb55f665c4a0350931beae7c252300b4954f69f215334e3e4e6dda927f51837540d24d893ba8ae862e3c1370b694d153508c4186e94959d37f918a
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003
-DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025
 DIST pcsc-lite-1.8.23.tar.bz2 749922 BLAKE2B 62c7fb931735bf5fba55e75141a3e4216a126c56ae47833168b154abacd3294dba4afc47b74814a474ca9e52c7ca62a532a0e6ae9fb88b635592e8c545f68e76 SHA512 fef9f40376660bc9de938608cfdbf12ca764be1ebb59c7a1065cb74a21ecc7333f86add25028bd47ec55b2227a9e2d15e1afcb6d0aeb510636d2aadef254bec4
-EBUILD pcsc-lite-1.8.22.ebuild 3112 BLAKE2B c1d106f3b4f16ced53101f297682baff29474e2eccb04bce34c7b11b094696f0899dae6fee3de59f5ffc61f2900cd25f41719a7393a03aaa741a86b8e36e6ab5 SHA512 e34b879d3e806c22d3d337cfbd100063f2464f127edba5afc312787ffdb58db16d6e54f637ef550335190f1b33781bf4daa01c87a2c34ff924745741169e445c
-EBUILD pcsc-lite-1.8.23.ebuild 3178 BLAKE2B d7b1d679878ba0af7220ae219b9306e11387c73c49e60221e9f17158ce2d4abd3ef606181a6df06f74d091a516b9347c9b157a5d9095f0279947e0d35df6b26e SHA512 d449fc2c2be6f9457ab704dcf1642103f1be58a8e195d794114897ecc228bf3f86cfbc3afd6bd518e8baf53dcdbdc3e56153a3765b9425121d6f42821c407254
+EBUILD pcsc-lite-1.8.23.ebuild 3176 BLAKE2B eb1e6b7e25fc4e8182eaa7b37fd31bdc9b6c5b808aedfaa06ff5c5109b9ef1ec0903cad253022cfb447eb74f443aef1a40c3ace27e64cafd9d1638e6ee295c33 SHA512 2cb289e5f2cf8ea36058563c6d37aaa71fc3ec605a3f80eb8a5ac5ed8da93abcf7f8b49472edda272156f77b72a0f28dc0907f10362e4720c26bb4c40a00e79f
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
deleted file mode 100644
index 4d2ab52863b3..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-single-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="python libusb policykit selinux +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) \
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-CDEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-pcscd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
-	fi
-
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
index 906dcb901940..2136aebdae3f 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 4f688e1dcf9f..d313e9dc12e0 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,4 +1,6 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
 DIST pcsc-tools-1.4.27.tar.gz 192342 BLAKE2B c17fa151afd6064bc15dda156248799bffaa08118b65fe57690a7a6e4697e0f44c31abc7e1b03f3eb6a3c551bec86b853b944b693f5b9242d649563fb64a2cd4 SHA512 f4532e6deab799c96fb344a8b3d07768b4c13d8800a486cf0bfe6200794e2b49dcd1c761dec86dca3c350d88577ec2bba420298c693449fddeeff93672449836
+DIST pcsc-tools-1.5.3.tar.bz2 267564 BLAKE2B b060e6fc923c6274d38c364325c367f793acf2979f2410c92857cce7483ebbb59db07657bc27be6d5a799f7f85da45782c4f1a9bbf7c450b43d533dce54755e7 SHA512 da5b362b7a3a6d47dd309ff217e6dd8af29298501db5e898ecd68762020ce62fc982132205f9bbee159a7d7eac549fdb8f25395416bb52bc0d0c888a5b0fa1a0
 EBUILD pcsc-tools-1.4.27.ebuild 1443 BLAKE2B fa74ae4845511bddc3b792be953ab9b3b6aad6299e3600969346a9d4a8f97c3ab77c0d02973ad29dd6ee825196f7f2b8453f71f28f9acfd966781b8c3dcbfcae SHA512 4f2c67271f3e343469e0d556980a760e376c143a35763ab740885ef154728d8416f8e36beeda24b924bad5986c814cb1604eef6301b1f1d0982ca2909d1a4d35
+EBUILD pcsc-tools-1.5.3.ebuild 1444 BLAKE2B 1f7815bfb592f18a8fd53e5a96408318d6cd6fbcc33bae4f54aaccc94851842da9c2d68264a46ba012c1856189b9f2c94ead0535f8f7e9625307dd6fb867f840 SHA512 262046c5bee259def265853fbff55fde355a15c3ca5de7e83845920fc5403dc971880bceaa6078c57817f1a6371d19f29f84bff31dec3b099c11af3d9ed03f17
 MISC metadata.xml 470 BLAKE2B b07602c76c26d4dd8468930997a52e1768a1e45aa5294a7e27995c9129f700b658a2b8afd5b73829b21620e6349cc04505a54c37166d2078a1ed250f172c2bcb SHA512 bd45fbe04b4a3e8b1501d3807f879dc1982288a10d4d209d01690e2ad1a2fbb8a475721961835717a2925e127e26135639bf6bb1f35e147595f9e8e619481079
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
new file mode 100644
index 000000000000..216e4232f41e
--- /dev/null
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils fdo-mime multilib toolchain-funcs
+
+DESCRIPTION="PC/SC Architecture smartcard tools"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="gtk network-cron"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.4.14"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-perl/pcsc-perl
+	gtk? ( dev-perl/Gtk2 )"
+
+DOCS=(
+	README Changelog
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:-Wall -O2:$(CFLAGS):g' Makefile
+}
+
+src_compile() {
+	# explicitly only build the pcsc_scan application, or the man
+	# pages will be gzipped first, and then unpacked.
+	emake pcsc_scan CC=$(tc-getCC)
+}
+
+src_install() {
+	einstalldocs
+
+	# install manually, makes it much easier since the Makefile
+	# requires fiddling with
+	dobin ATR_analysis scriptor pcsc_scan
+	doman pcsc_scan.1 scriptor.1p ATR_analysis.1p
+
+	if use gtk; then
+		domenu gscriptor.desktop
+		dobin gscriptor
+		doman gscriptor.1p
+	fi
+
+	if use network-cron ; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/smartcard.cron update-smartcard_list
+	fi
+
+	insinto /usr/share/pcsc
+	doins smartcard_list.txt
+}
+
+pkg_postinst() {
+	use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 9852461ba50e..c6cbb1e6e924 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,6 +1,4 @@
-DIST portage-mgorny-2.3.43.2.tar.gz 1254672 BLAKE2B 2fc3b7d1fa617b0032525fcef475c53d8a59b2c5b34a6685b7c34d88d41930bd24bd4203966922537ef243f30e4377060ba7f94e89c1bb3c9941cbc3297a690b SHA512 b23386616dac61295460c823bb24959e3adb926d97d1d6e188df8958089bfec20cd87b2f6090e74bba249c0006496571d3807b20edf1947655659e777423a691
 DIST portage-mgorny-2.3.43.3.tar.gz 1254313 BLAKE2B afb5101537bfff9b05622f4357757215bbe9641f2ca058baa59316b72ad3280ca7905f75e10b3270627c0b703434691bbfbbd88c6e375ba3f405d69d983b1944 SHA512 4fe3d1a8809a91fb52a9ccccac7d66cd25e8b6ff23b0ab2b4fae5f26a2036296a1c4eba78fee819003a8a8c44a5c6fcb0f04b9eded220d124bf08019a4f2fb02
-EBUILD portage-mgorny-2.3.43.2.ebuild 7168 BLAKE2B 02710ff96aae53795a5be8a4c6bfb077f6260bf40c7316d4502457d1d9b2f7d2faf516d0fb8a9cb2c76d74b4c9c86542d6a21f0bb2bf8e5c2416e92ba60533ce SHA512 d1c2fd6ef66b900f0ff6988d156c99d55f8415558bb2eef9dfdbc18eeb0d705ccc04beee6846357350bf959a229f6b4193241f8ed9641ea08d199507760f7ec0
 EBUILD portage-mgorny-2.3.43.3.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
 EBUILD portage-mgorny-9999.ebuild 7080 BLAKE2B 703c046e27a79356ed4a0c88690e83677ef0493ea63e4a19be21778513ce9a3f8f14ff03e8116aedbfe9c8baed2f31fbe613d88586eae647386b2625527a6c2c SHA512 d7fa51354786bb879c6f2954b633a07d863126becaeede41e11f8f3d1c52ad80f8ffde671ccd4ffafc5552b2074e5cd6c30270f525f828244d5a7b339147b445
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.2.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.2.ebuild
deleted file mode 100644
index 05451d50b3f3..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10[${PYTHON_USEDEP}]
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 76fbe6beb082..a42cb1069ef0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,10 +5,12 @@ DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f
 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.48.tar.bz2 1010013 BLAKE2B caa314508dc54255e4829b31cd9b943f901458a9521a1270cfd559f624f39b16e7e8dd9ca8e8c0d8ff387c1322cdf896df0f69f55f693fdbfd3817ed3bea9835 SHA512 255132364daafd47462efa5fea2fa5cb87df3458f2e5da025e5fee35531d78b9581bc9daaa9e78e01730f271e7e8844405a963bbaf739a532699d68760184498
+DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.24-r1.ebuild 8997 BLAKE2B 66941bf2ca4330b0fa230833f6460044d8063b177fe537192125a6170f6861a1c6182a1ce25efc2c22d04cf76c7ab2c48e8c332120afb7f191a78be065df93dc SHA512 eafc67c5df88075390151a28e1cd9e89bb2ab85d9e2c3cb5dc02ef3cae93d91aaea219c642dd8a59b3ab8d8e06614524dc116459c311b957bed7f4c2c848362d
 EBUILD portage-2.3.40-r1.ebuild 9676 BLAKE2B 143c477c2089c9cd8ab1df8a377cd6c5c65869027744a9fe82acacabd10d74011694772c46983b54d3f222ed0ae2bfb3449e8b899e6b1f3c1a8a06867d51d27a SHA512 4c5c837f5f546cfcb95afd9b1000d65575a3d3ff03d43161e83c2c5b905adec30808b75d58714db091e069cd08f71735964b3373261254a3c445fb236c250053
 EBUILD portage-2.3.48.ebuild 8687 BLAKE2B 012b80d23a446732def3256defbe42f2d3fd32a18a71d76658054b63c96a6eaa5d94339ac273d0a3bcf5852994a0c5fd36771b2e94880dd1afd52ecaca789fc8 SHA512 b57b6c07281afb445705a2dfd3a07b92c8a030ec2acb5d66f7474331bb6ece2c6a23dca2c015b9f201919c922b58536bdee0c63f666b4792d9fee6cee8d05346
+EBUILD portage-2.3.49.ebuild 8687 BLAKE2B 012b80d23a446732def3256defbe42f2d3fd32a18a71d76658054b63c96a6eaa5d94339ac273d0a3bcf5852994a0c5fd36771b2e94880dd1afd52ecaca789fc8 SHA512 b57b6c07281afb445705a2dfd3a07b92c8a030ec2acb5d66f7474331bb6ece2c6a23dca2c015b9f201919c922b58536bdee0c63f666b4792d9fee6cee8d05346
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8553 BLAKE2B 3341e4fe3dd6601a1a5c94a166910f61bdb9bf860fdcd7bdf725bb0e424b016800a58cae1c547cabd70604d7b4b1a3ef11535afa875a75203e1911c42f8f920d SHA512 de3bee0495126b35c22947a238c57fa6b92eb9b553f540f6617f12cb4861f1f5e9ab611548a4660e87612bc2dee8f1f5c1e38de207fa67ea9617d89858d9ff54
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.49.ebuild
new file mode 100644
index 000000000000..9963e46ec945
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.49.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index d451b95ac1b1..20587801b91c 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,76 +1,139 @@
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
 DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
+DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.6.crate 5617 BLAKE2B 52274b58d4ae19cdd57a85a46449be32ac4662da6ce746382eff30c75729dbb5e50a9e9ad59f11b11f6d40b7ec2bc261e290f33127de62636c7f249c174bc4d3 SHA512 ae0aa91616571391eb4a2cc46b4765784dcd96b514fc7c3b64f756d1a180f95c83b9d14086f872fb7466be0e623f44a1a3170e786d7fbff5bdd949ef0cd88997
+DIST base64-0.9.2.crate 37967 BLAKE2B 91c72280ade562664619aee3130ebf0c51db4b593ed08858757649cdc3abb2c04c4352cfef90bab7f40c3398d7be4d343da334ffcd41fcbe607e463590dc12eb SHA512 d7c859ebddf17171daa2ef803a7cfd12871fa95cba47ebb24fa7491bf63fd33a593d98b3045149cc23f310c13292d703b045834431a0acf2cfcf4952127b8402
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
 DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bytecount-0.3.1.crate 12347 BLAKE2B 31d4d72e7edd37b78232db9b7a0ad2ea2fd18596891e43cff7f00438f5e033d5b3f901e6750fa179dc4d313424afb4dd853d3f5714a0d14c4faaf83958eb961a SHA512 09f2fda4bcddffc94f9e1f60afe478ba988c74276196e003f652229d7979491b1dc29686d3d11e2a9015b628638288b6dac23b27b157ae1025f64b05c35a5e19
+DIST bytecount-0.3.2.crate 11026 BLAKE2B 2a2a556e2cdead9c70ce1c69cc5c4a0cb3c11d34a078720d3847ffa8be54d34df9f8986a780331f5c80f71c998e12491b94795d3d3f59f9da949a6d9e7f301a0 SHA512 fa3453f220112f83280dd3a123b25cf3ec07d2487c89cb80dc383f12e9f4d759e316d1eb05bcb0633186dc3f26d2ed58d979ba4ca86404a7f6edc4c174ae0edc
+DIST byteorder-1.2.6.crate 19985 BLAKE2B 717b3c7a497fc1624a32c38a2f1a5ab48ac76ab996e2b7170c9a295002a64da05538489d7e497d88ae13b66c2d4911daff8840232d4201cef3d26f4e30cdc820 SHA512 7106b5404a213b080a231c4bcc3010caa2f2743a0d0b64553e0c789ad849970ce1fb547b330711d03374cba5a7ff56b728f5259d0c6fe7ac00c8c13324503dce
+DIST cc-1.0.24.crate 43132 BLAKE2B 16e2a57abbb94642dfd98e829f3179c6b44183a491c67025d288b1daad9e90d290b1a1789159bbf97fcf573c605f9b70a072f78a2bd5ea6cc136a9885e1b9e83 SHA512 97bb515c57448dfa67c57ab69402893181ad5324ec870efe49b8185facdcd536bff3550f4db7deb79a5b397e387a8f734d4cabcdac2661dc020c82ea993f42c9
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
 DIST cfg-if-0.1.4.crate 7113 BLAKE2B fe63fee332d08ff50384f5e5d90a30281445f339e29a9d0f036ce2202a72f02c7e78ffc166baa681c3b739afbbbe8727ebf5ca16ea0a6fda2f38e08dd8b94996 SHA512 4a7131fdaec1ab63485b016e0b09d538815dee8b64218bc33230910277344e0631bba80e57b1188ca4fd6247595c6c5e3b2381369614574d7ff17cdb5b8546a2
+DIST cfg-if-0.1.5.crate 7363 BLAKE2B ca668ccdb4cf082d2b874976e6ac38e85e2618430cbb5123f9359e328e38b61e59a492116bd6a9f8ed986796095a763d148291378d32ac3a9e7d501c5ac967fb SHA512 48ab0bb1fe89d6e388ac4bf851b9aaed6479f9ca7da62945e2ebe58800b5201897feaf6aabd2b028110b0205b33d5abca7f02826ab3c688647b944e7140e6d94
 DIST clap-2.30.0.crate 190562 BLAKE2B f97f4eb85f5a6775a42f112bd26c48561bf8ae41016b638b4f0fe0c18987896a1a3918f41211330f617b44a40c7ae0a2ccdd107e6f3bbdf53bb6c035439f4139 SHA512 2a4af4035dd92adf00e183d15528ed658ce7dec6d9df592565fbcc86e94b1b41ce9f11996da64a655a85909fc89c9b9404ec9b717bbca78c14d96e85916480bb
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
+DIST crossbeam-channel-0.2.4.crate 59889 BLAKE2B 0876078d5506060fc25b757e89c778ef4bfe2537eaf9412f2c7e0ae2b4197581607e2126c4a94af5d5a39aab287d232889bf19c041344bda0f0accdb453bd61f SHA512 d753fc9114e2dc0f7b2e3a4048457a859034f80f6be245f46771933e9352685b20b256ce389223d9426e50ec600c681a819b9cc7701bb888b98f3d2bf18b630b
+DIST crossbeam-epoch-0.5.2.crate 34136 BLAKE2B 7ee6c696cca686748215ed9b1e368b639d9c7d632ec56ff45d04066dad807441b00a37dd0699d9435933237b2565b5d4b58ee6a50b2ea8a35d33dffaf2020fb3 SHA512 2b54b0e7a3af100e336d9b6b7c9078907de9d98c3694a39f353865b4b618cf004941108d274803d91bfd98eb694ee9d8d593e67efe2d7ccecd5c66dbaad7564e
+DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
 DIST encoding_rs-0.7.2.crate 1241345 BLAKE2B f3aea266a3cd48027405d537e8bdf45b5b1084ab2d9d30a17dfdc23806607fc4eae4ecbd20d6faf667084d401f58fbe0fb53babc2aadbbfcdb30b81bd91a325e SHA512 92633620eb915ec3a4b1cc3d9d3ac38134827fa5f750eb7415e31e97c99e65e8532393090202a6a5a86979ac64127a7e8531b7c736f1109f47ea303bcb4f81ee
 DIST encoding_rs-0.8.4.crate 1244691 BLAKE2B 616b2434296fe178c33c8368bdc4c08a1fe5631912eede33ae0f93ae754276c055104f7b7cf92e3cb7ca57b0261b616dc5f9b33f09f93eb0a9ddcc108be63117 SHA512 ca696c7c2200dc95218fdd28aea5a0f59a95ee6811b00b4b504d71674dff275a9c2ffee323923d5acd0d498c90e57109a5f52faf8a593def81baa4a67097b9cd
+DIST encoding_rs-0.8.6.crate 1242813 BLAKE2B 8208d1d69b926688ce7702942306269dbb7966b4efe51494a0dba54ec00dbca0b78f5fafb7d60aa83733b2ad69635507269e4f654924dacc14675dc73c65a7ba SHA512 e3bca118c94d947eb0e94ca73affa75092821623e5e32204df8093c181c4f5df58ff9ee54fbbfa5c5215fdf3bfe97f5dcd83dbf289abd86e65e0c0199c812456
 DIST encoding_rs_io-0.1.1.crate 15200 BLAKE2B 16f3ccb2f6111f3dff5792c8d66100a286d33fde33310d7533d13a3568bdb447043f1085b8071fe99f38b606e25b0d85acd6032da27fd574a6fb7e04d886c404 SHA512 ced3d52333f62779e7af983550ae9a4617357eb26b7b21f1e38433f9383e3b18aa647b51f3e59fe886608959914baea2256805f6c66676668e725f251fe41311
+DIST encoding_rs_io-0.1.2.crate 15356 BLAKE2B 4cb62c8816f99771452971537dc0d80573d3b79f0193461a424aa490f3fc7d6de54237766c153b1f9075afdfbabbb56ef8939d05502a39fd4114b48e8472ed09 SHA512 ba955cfd1e571afab630db77e44fe9ff3c20866686d94be750c15b0d99909b0863deda81704326ae831897e169361ccda7ac831e0d44e8e62f70519b2089e82d
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
 DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
+DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
 DIST grep-0.1.8.crate 236744 BLAKE2B f119476878826f0b410770db4b95fa65fdc89b461f6ecdc43d15013d9fc82d91117b76fba6150c193633667243b3e49f88499cc532a3cac21565bd3e68217abc SHA512 d0a4e9dd51402ed8036aa5d2cfcdb184538d2bf0c81baac75c73e80d05945a63cb08a931d87fa526695af93271cecaed6650a045904ceaa05ed6e06fd23e537b
 DIST grep-0.1.9.crate 237472 BLAKE2B 6b5223b45baeaf5257976b07ce1025c6aacf18886f16ef5739f729291841fafdc7dad324cc953c42ef77d8bdf39802776c759e478c0b61c99954c475bf612323 SHA512 1ce3c1c1faf2d001bdafc6e021ec3523e08cfaec611bbaf70492cf0038578c2e738ead0df826229fbc0f5e54ff3f9f9cf928be9223bb53907f12b6f468545ef3
+DIST grep-0.2.2.crate 3959 BLAKE2B 89778ec58270bce7dee7ba04e395f5522a3b7c31b602cde3f3fcae2af4a062353bd70de34fedc87e7a13e2607b4e8ddb40515626a465f039dbd4e82f5fa855a1 SHA512 de4bc3931921884c06cf53bcca6e0fa9b08c703bc9eea5446fc7b2bdddd7ba444feda545f48f323f6f60a6e2a11edeffe511e4b8afe020ed16eec1d1b3efd35f
+DIST grep-cli-0.1.1.crate 17335 BLAKE2B edb24fbdf4ffc6abb84359632419418e28cdf408e9be3f13a708c1fd9dbc710bc9e644d4603c7c872abd3fb4ad563a3d363e0f7a792fbe14514b2e0ccee0463a SHA512 c9f4ccde63e16cfe190786ccae82b4986fecd2d5c1f1c507ecf796d0f8511b79349e0482170bbd92f5865e7cd13655a708fa3b448259e38d8dc5fa215ba1a09c
+DIST grep-matcher-0.1.1.crate 15577 BLAKE2B 60c4f3714e742008b16fb447536330442af1d613ea9a2f13dc0883beb7b6e2ad2589c2ddf956bed3d9c4d430fe7c26e914ed3e9b70ef0748ac48247c4c481958 SHA512 42e7966113c722646ed1c6bb4e7f9d00cb6c4ea2ee6f00543591c1765a028b7ea5ca4073f91a9148f2b0b6d963532119326a153ef75bd503954f6601a77acaf9
+DIST grep-pcre2-0.1.1.crate 7439 BLAKE2B 8aef9325cb006f08f421851a12f7ecb3f8fec34925c5a41c4fc6b20a5404299c030ed0bef8e22b59ed63fd0052d36e7ac7aa49cc6cc6b807f56e66f1262f485c SHA512 077e8241912ac865ff94659db7e111ee1093d77e013ba77555187c834c1cf246b7c3e353ec24c5900fd625d6f84eccc5d79ea8c6a70c91b55d09b5a95a694bbe
+DIST grep-printer-0.1.1.crate 41441 BLAKE2B a5c244f142eb43796340f1038e7dde253edea28894833e0601c18b6c1e841ffcb358b9465b823b93ec61c64ff690fb9e16e298e3e6e74300cfee90ea1c9d9343 SHA512 579b57bae2b0583b32658855960f974587ad462961d0853ae42c00bc53121892c3870bb475eb02707dc24a3d716cef6be941b5147b35e188f277c0d3898705ef
+DIST grep-regex-0.1.1.crate 22683 BLAKE2B 59c40a1d1d0da56dc282ab93273d8722bc665598135be34048f8d51ecfb080a796ecf087329f987bb7e4ed892f8d3b6b1fbe0ccddfdd581c773072a20c2e0d0f SHA512 281585dca0d8e42778bda7a23780ddef38d31145c36e3ea831b1edb98be66c87bba553303fb973af1211aef21d1deb11d2f9466947fb0622b2d1bf180af01a1f
+DIST grep-searcher-0.1.1.crate 42673 BLAKE2B 7ae6e9df98061331c5a6e3d37febee36a4fe26fcca22ea65f4accd0bb2cdf07d9eac98b88f3d8645e193b3499ea556c182d0a62573009a4cc9aa2a6dbeae4e86 SHA512 523c8f994e01f34c403601795e6fedcc515e89f1f0188d2ced03f21c9abbe2aa61009705e393713b032a6346583f5ef79c722de6c58bca03f88f2ee283b3518c
 DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
 DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a
+DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
+DIST itoa-0.4.2.crate 10581 BLAKE2B 4ef219ac121ff82d0bcb9fbf7a0d44cb268b40564ba656d88ff52217061f33935172e23a76c5e7ee6c0531b4b0fcd551001ab951c0def39ff52350e0681c1b1c SHA512 d7201f9bb44f5dce15a90dedfbe6b722aadecf15c3defe1eb1fcb5f8fe64300a594c9acef4f14538129a787044374c71d69e69dbef76d1bb780309fe7d55a796
 DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
 DIST lazy_static-1.0.2.crate 11431 BLAKE2B b427dcfd4a1acfd2f3a1e353e5550d439a3a81f038365b6065d21ad74def83d3107abbc6759a22087c59c141612e17b93b54c3e5cbc268f9715a4af82ce5eb94 SHA512 43ceb14b418143ae6bf46d5bee378e419a005ecf772c5ced809ca79be292568a3e70cca8a0652e5d06fbd76e1a9057adf44831705b2fc564bd4ef7446b2097fb
+DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
 DIST libc-0.2.36.crate 310575 BLAKE2B cd61236a99ce86b18329e0bfc34b738b6133a38e90d4a1a257b2739ec0e91e6ff24243f6b2b7e1c5ad3b4aa1301da42adc81e67769698f11928ee712ec31e70b SHA512 97995c49322f5a3c93df2db08b7372ba3a6da0edc9247cbd3bfb58f9b01315953596154c97c5bca1517b56b8e35e8d03bbf89f9b980aff724977b98bc0d938ed
 DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
+DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST lock_api-0.1.3.crate 12167 BLAKE2B d01453c4232ccbab72706f4932af598cf6d6d15482c065f7e900f0246973a130d2db1d01779585a6b99ab9a36e074a787ee49d99947bebc2079201b380f985e0 SHA512 5c088cdc3a5321ac9e9f488acca11c554be5d91b2de0e48171d2ecba15d7e5960ee0a8ed82fef15377ddf17646ca350d9749b2579d5ec74cdb66ffd327e61c5f
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
 DIST log-0.4.3.crate 21629 BLAKE2B 0656ca6931f7be89fb5c551b33ce2800f0c20f804884ea88ea04eaad27ba595988d6f7cfddcf07973bd2a58d6fa6b2092c3736ae353da0323727336116499555 SHA512 bb92f3ce23ef7361116964d2d0d6d9aca192d99c231385da71b23d0e4d1ed71fefc2ebdccf1f40f047916909df26faeef777aea68edb960298c75799765dfa2f
+DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
+DIST memchr-2.0.2.crate 10092 BLAKE2B aa90acad8c25a67ceecaa5bef086cae873cc71336efa38dcc71e770808c2288538b88b0f561f405fcbe7e829dbf2dc86392bc975eedee8dba7645af64d2dfbcf SHA512 92dfcb5a60077e0906d17c76a5eb3203cbdeb066cda40a2c8eb2acaaec366ce45bf1bc57876ca7d0794be2aee639f296ccaf5c54a7e941875f3a78f0126ae9c0
 DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
+DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
+DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
+DIST owning_ref-0.3.3.crate 11710 BLAKE2B adf07d01a82c1eadb5f4e74072a69e0a76603bd5f7a4fe2fe86f71c9733360a769eeaae4bbf830fe125da463a909ad0a690e99a30ffcf766165cf63dc3c43202 SHA512 260f3d77f23b092c5ca96dff6746d378caa1bac965745a71ca18eed30a12c6869af62259daafc91c8666baf95e04619ad0d8fe06b47d5e517688b35f0c59005a
+DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
+DIST parking_lot_core-0.3.0.crate 21965 BLAKE2B c5ff23d6ea0860a98e80fc9b66c0865748d9aa1156bf887561b6cf74680ca4a9521c59b75c6685141f896c067d5c2534ddd2aa585df2e5968df985e0aeccb38f SHA512 da3d05da132c3abf2735695d9322e8353ba88c2d9c5d69008f0d90bae570fae521fecff4998980fedadc3dd250a6a6142d2bd0a996c13e8f7d3111ad70319b26
+DIST pcre2-0.1.0.crate 17574 BLAKE2B 22810c4f0d1789925d07b259465ae52fb5a674cfa63e69720df1fa36d9ea275193af565639d22fad51328380e69154fff26103aa144f0424763f4e9ddec47cba SHA512 20490a4d79894e67d3affb0bcb13f9d68e5fb5fb874fcb5ab9aea7b826c7480741ca341edf24c1118471dccc6a660117909fd28d664b00bf1b5f41fd6469034d
+DIST pcre2-sys-0.1.1.crate 2136686 BLAKE2B 78da08ef356b59e225696db956231cc1b04385c43aa0fff459e93872ca18714a2c07bf51cd2df28f3c446eda674c05a0f12cf91ce21aebf21031459b5f18da04 SHA512 7c859e0e7c7e62df1ddbef7d6a7f3938905aaaa2e6de6cbdc957c8fcdf5b5f3b3fb4a30ead84326d9ad13fa9581c0b8729d735678aa649b242d8e57055472adf
+DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+DIST proc-macro2-0.4.18.crate 29919 BLAKE2B a8fc28a2b8d7fd6c3ea457d2877cc6707fec579766a37dc310039d66fd690c5c90412cc12857a816dcf2dfb6a7fa4086485525e0167e66869139a72a2df7602a SHA512 f6f9c715af1f39ed83aea15a8689e99e523c2b781d2f35c7ac15ef97a38220ce02e7ac1075a85e4bef53ffa682224cc0093aa9b94a664d2a944e6a3309550870
+DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
 DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
 DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
 DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.6.crate 197800 BLAKE2B d135424d756eee989ad9a9180882c773fa4f399cb7f99b454c1b7ce3f2d66ce8daaa19f989878e5676b70f8d5dc2cac30773654156d8cd4b410bef44bc1276d5 SHA512 69c84096834b794227e4937db7598f35e8c489ef8445d3b5f3c0b2a73fe54be029f6db609b046441fda6374485c16943197f7416ed9545c784d14fb61c9e804d
 DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
+DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
 DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
 DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST ripgrep-0.10.0.crate 212925 BLAKE2B 389e7b488685cdc39f36f9884a6ac94fdb86dbf73f2e7c13202c5b893fc37327aa6ba6e5c7b9c08e0b00c644d35410cac5af51640770d0cf1869fead67833780 SHA512 d96c12be497999d0db777ca5fd33f907ed01cba121e3fb43a7a6a5f3176291f04b7bcd6e26f04f98b305cf50ac422a77a10d6a34c3a7510d233fa76228784576
 DIST ripgrep-0.8.1.crate 199607 BLAKE2B ba936fb5ad1072d45314abe67f916121e9082cb5fc58779b213ee75db4164576de683c7b616f4558d779dce29944904db510ba3b3ea38432686ef13a3d85af85 SHA512 bd1575d0b2efc9799ad00bf931fee61e5a475db9725c9587f9f157e0dcb6c958defb09ffa4636965806481a09e3d3218b820f601d931bf5a9b8bcde92956d9bb
 DIST ripgrep-0.9.0.crate 205514 BLAKE2B 95de95d5bb4b284c65b585f75013b9033916891eead9e1bc703635148f6ba50020d4b469a04f36f263fc1779cbed28dd147a455cb41b31256dba250763606d2f SHA512 8adab0f95421e853b813d74d6c45cfbcf6fe9485f445fc79e34fe53ac59f81dce727d1551a2a99effdf8b7c479681927c1dbeba86bce55dab8353e8a7e0db60b
+DIST ryu-0.2.6.crate 39911 BLAKE2B 3dda01a1da474c106d36f63dbc762f5b7eb37e5b0c545bcc4cc992ebabaf02e0649cbbb27f81971cd4c27cc51453f4981eac869768a0cdb31ece3a68a6f8976d SHA512 fa7596d53f3a16673df016aa75a4cc7a637456db595daeb9e4a0a393c7ab7d18b669bcd2886f65a4421897c0261ac57ff85d9c452772e172a4bb6c11b61a8f1f
+DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
 DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
+DIST same-file-1.0.3.crate 8995 BLAKE2B c2df54cdcbcaa3645bb17f3c78bf8f48711534c108d7439b791976224e126911b497049b720186fb5d97bb2207ca1407ed2c2a4f54014afe79ea77ab0c9a7715 SHA512 eba49f77a94d3f46cf063545f31050dcf67216ab7c723381dd75ec25aea22de217c2919ade87970922750bb53a5a6bc2ebed6fd68ecbfcce97cb987e69582402
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST serde-1.0.77.crate 72861 BLAKE2B a7eade5b92fd525c281ca664ce7cc8c0053ccfcb1ed84dbd6fae6578ad38af269cd8851f50b65a13f18c880a49726b8012d4af9eb54af9d19de2bb35d23d025c SHA512 0849ba48765586b0df9b49a6077cf05dc72ae15938dab8bc748e4488b64663caf7b3e8ae9540ea106fcf259278fda615ddb78fceaa7b9eccba1e71283d3cd8eb
+DIST serde_derive-1.0.77.crate 46352 BLAKE2B 0eefd0947bac23c9de1660784b87bd8b58b73583556ef97dbb70622c63a24467555bcb5c5d6ee3bdbe2cebe02c8a85a5271483713bd91c9fdbe24893ad6b52c0 SHA512 6bb9fffcefc2087a1d70192ffef6f941984163b2c00cafd2f2896340fdea0e763b2ff2799af172bdd2bfc3e7dd49b2dc4a2c6ea582140e8f4cab88b63a0a624a
+DIST serde_json-1.0.27.crate 65402 BLAKE2B 9b2a4723b49f80a3757b66ccc4e293100bde9c403ad2cac7b2b8976dcc6882c6b72c340207cb9f039af06984b619d844bb930cfd474d987497f6eac49fe2302b SHA512 36c19e4b3e7f0969fa13571b6a6334e3176eac204f74f91bb0345f7069f2e850dfbad86a17d36bade38eabac35cbe201f0f78481c77cdc34c0928202e8d0ff8f
 DIST simd-0.2.1.crate 35716 BLAKE2B e34e1e937ed92e921603f7aa4b78283a01ee9246c9033c7e16cb95e2585c9145a591ac4f9786f0c51d0b303637203fdf9a0354a0ebc3d658c47edcd055a98546 SHA512 2bf1c2f830d10f60e62def7c5525598e121124e8a4fe1125419c0da3ed97bceec9909550eee171a335ec9c6944958ce5581ae53baad47cccddd234d2b7801535
 DIST simd-0.2.2.crate 37477 BLAKE2B 647b2bc68400f7a1dd126c1954254dca7914d7790a9a47c1685ffb59a42da13de0dc9736556671b844c556f8b6634d24558b30c33500fd518b60c733c13d1a21 SHA512 d4641898dabad23421575024d5240bfa1f6781c57953bc20ab22810ddb9dd015a48a3847ea307a0fe0e66f4099e4f2c7c95608c3813d391489c4745f50fbade1
+DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST syn-0.15.1.crate 142480 BLAKE2B bc0e334ff8e00003ff5d57faf0c1463f7677e1fa3199748295d932390b0167da21a368e5622cbf5b0a3c8910ee7eba37be1361922ea15e13f4d50163c49df3a7 SHA512 631cfa34619e514a976089924157ffc0100a9affc1ff8c41c2f867bf35749c129d68b67d78b3e0b3b131aef87c09537adf11408d06bce6bf14b01367441a0b58
 DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST termcolor-0.3.5.crate 13539 BLAKE2B d5b9edfa562321ed1efd0d26d634c327d0256f09a0d8d1eb5b35b6095561756a4a374f5b43b5384faa8ca321882b8f2598692734b02909884911dff9825bda8c SHA512 3057a20b5aee2a745180c51605469f7b27c0c15b3073b2ce901558cab19893b4cf2afccf95128596a709464c281e08a66b7ae7bf1d28e64da4fb221865733277
 DIST termcolor-1.0.1.crate 14228 BLAKE2B 795c4c9020d3ab31f59e909640e9de5012d2b2c8af122b072b125172086cccb65743bae6a88e248e9fce62c68b497e33ecbc56d51ede7adbf3d9a71f37e21512 SHA512 4498f619e736501cbad0d242cdb7e64592de8109ed8d2dd1fc51ade5493ce21dfa9110e4ca96a603410348d61a8029e8df33d17e29e53cefd94fa662f0cde320
+DIST termcolor-1.0.3.crate 14410 BLAKE2B 9870d48e19ebae86c90ed192bb5836803af952c9d24ebc509f62dd91202af10eca1fd7a8ec06a978fda0eb718eefdc398d70c07f3eeea36752d43b69a9c679be SHA512 403a0027b5e858a5b283a5b1f44dbb04207ea080ed9a4eb521f0f16e07292a29ccbd172d062b50bb2e41f03e4779d0d87ef21cd4c97a38b4795bb7b320224acd
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
 DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
+DIST version_check-0.1.4.crate 7946 BLAKE2B 1122354fd571c8879aa29d80aa2011ccbb0fc64545af4eb15a62c84ac81a4aeffe223bf776f48824a52c159f31acaf3501ffc2613a1041a1a1179446d830af0e SHA512 766fd53ddcdb7c60f7a62959c767cc10e498f92ad0eaed7a0ade90e13ee4293121153d5310fb987b9dd9ad32c3f6889339be29444a2bfaa73bb3b6a719f77e46
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
+DIST walkdir-2.2.5.crate 23985 BLAKE2B 9113b88c4742548040adaa9aae651599f1f3cfc41acb9d50cfbb5b32b379273f14786867d9dca0bf1be5c482379c3a60df6efe3e5521a2df327d64e34e144706 SHA512 2645ce9a0e665d0badf039df14da565e6f904e1b5443b4c60e97b05194e2c2798d8084a45bbd7edda56d58f2b37bbd8124656125338784f379e06fe39d38128b
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
 DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 DIST wincolor-1.0.0.crate 4777 BLAKE2B 843d2b3f9d56b332504de707879a490169a790ccb515311d32114c43122f0b13dc8c360f9610361f810b2e23424da35b2918fd30480b7daeeb2a9b2689b5ecbb SHA512 c5a6c6c01fd4cadbd0967d95f69e28b5f6aeac38a7e5297f843be4ebdbed2253db3d5d38f58a91eb2cc7055bad5884a199350a52ae17b06ef11232167f610b04
+DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
+EBUILD ripgrep-0.10.0.ebuild 2281 BLAKE2B c08302050586784c84899a9498534ea87da3f6f955421afc9945d11e10f5b57add90a0c3ae7bd2bf3f88b7eae6b9ba3ccaf5f81765348cc62ff17cfcb6d4cfe8 SHA512 05561dd5ab6f8f3d91458d71d54ea5c124f02e5e0482d71973d177861733fa8801ded3634206b6e0b5e6fab1eb0e557f7db89f73f8d527bda37b624e8aed12a4
 EBUILD ripgrep-0.8.1-r2.ebuild 1532 BLAKE2B 1b5dec09d8a0ad05d570534daa72dfd4cff896a20e79b6c26daf151c79234042eaa02a44afa1652c16881b2787e0612d46649fbccbf52fa8008feafd7196ef60 SHA512 d4d4be24db631878e260c1d43b4b2d73bad4a8002cdf2fc404457f587b52b975e836ded7d17a9e9b9343b8dc54941dc06debf717d4532453a67ca8d5b9f525bb
 EBUILD ripgrep-0.9.0.ebuild 1621 BLAKE2B bb7082046a7c58bdc8925cda09b742a0edb6eef23b8f8bea7967d21a275c0090a69b7d90388955cb4182c12d1b2c439197c535b01a23084e0ca65d18aff0bc10 SHA512 c0746daf908533a60254bb6d59308ece831073e7fbe1f4464ae022a7370244e1bab9fb33aa739e089a18c66656dc6b78eb5bb7be49ee7c39091d2cdcd3d50e27
 MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/ripgrep-0.10.0.ebuild b/sys-apps/ripgrep/ripgrep-0.10.0.ebuild
new file mode 100644
index 000000000000..f9b287ae30ae
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.10.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.8
+arrayvec-0.4.7
+atty-0.2.11
+base64-0.9.2
+bitflags-1.0.4
+bytecount-0.3.2
+byteorder-1.2.6
+cc-1.0.24
+cfg-if-0.1.5
+clap-2.32.0
+cloudabi-0.0.3
+crossbeam-channel-0.2.4
+crossbeam-epoch-0.5.2
+crossbeam-utils-0.5.0
+encoding_rs-0.8.6
+encoding_rs_io-0.1.2
+fnv-1.0.6
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
+globset-0.4.2
+grep-0.2.2
+grep-cli-0.1.1
+grep-matcher-0.1.1
+grep-pcre2-0.1.1
+grep-printer-0.1.1
+grep-regex-0.1.1
+grep-searcher-0.1.1
+ignore-0.4.4
+itoa-0.4.2
+lazy_static-1.1.0
+libc-0.2.43
+lock_api-0.1.3
+log-0.4.5
+memchr-2.0.2
+memmap-0.6.2
+memoffset-0.2.1
+nodrop-0.1.12
+num_cpus-1.8.0
+owning_ref-0.3.3
+parking_lot-0.6.4
+parking_lot_core-0.3.0
+pcre2-0.1.0
+pcre2-sys-0.1.1
+pkg-config-0.3.14
+proc-macro2-0.4.18
+quote-0.6.8
+rand-0.4.3
+rand-0.5.5
+rand_core-0.2.1
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.5
+regex-syntax-0.6.2
+remove_dir_all-0.5.1
+ripgrep-0.10.0
+ryu-0.2.6
+safemem-0.2.0
+same-file-1.0.3
+scopeguard-0.3.3
+serde-1.0.77
+serde_derive-1.0.77
+serde_json-1.0.27
+simd-0.2.2
+smallvec-0.6.5
+stable_deref_trait-1.1.1
+strsim-0.7.0
+syn-0.15.1
+tempdir-0.3.7
+termcolor-1.0.3
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+ucd-util-0.1.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+utf8-ranges-1.0.1
+version_check-0.1.4
+void-1.0.2
+walkdir-2.2.5
+winapi-0.3.5
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+"
+
+inherit cargo bash-completion-r1
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/rust-1.20
+	doc? ( app-text/asciidoc )"
+
+QA_FLAGS_IGNORED="usr/bin/rg"
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+
+	# hacks to find/install generated files
+	BUILD_DIR=$(dirname $(find target/release -name rg.bash))
+	if use doc ; then
+	    doman "${BUILD_DIR}"/rg.1
+	fi
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
+
+	dodoc CHANGELOG.md README.md
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+}
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index c29e5f07b15d..c10274ca20f4 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,3 @@
 DIST sdparm-1.10.tgz 361464 BLAKE2B e2e7f09936fcdbdd50b7f397c62023592b494d5b1f8a998d32a4777134ec2edc39b11433ed00f5518ba6a8d04f7dee36e6a070221901b9c31a1a0d25da8439e5 SHA512 1cfa95ced443d190ee9e4a899c9cfc6b98367ba39a9cc201c0db2f8c92dd4e74368182be3b8bfe28e51761b1ededf914ee669ef8ff6023d1ec1f05d69889a35f
-EBUILD sdparm-1.10.ebuild 1025 BLAKE2B 0ceb15847e593076807d7e060d468d095f85b74301caf8499346e8fd44ceedd3e3b0a8755b614af4e0035fb37852c31ffc3768e1af4799cf25c07174a03e5659 SHA512 bb1f74e0ac480e2b4aaabb71c966418536bf79da117d02eaeaa19f43becd02a4768fe2c8459c489673e6d07cf78756db78997e495266ba5dd0d09dbb67eeb263
+EBUILD sdparm-1.10.ebuild 1014 BLAKE2B 14df30a306633a306f8ddf5df362df24355d77c656cfbe420fc157be4f60355a339d63493f541170be2ae4d67265a556b73c55d18ae6a883366329fff65b7c88 SHA512 2bfed44416469884e4a6c809f527443c3d8786f132fdbfd9132c487d62e1a54253e8ae2a95b3b9152b870904d5bba15cf41fee3feef96ccc876f60b9157ef978
 MISC metadata.xml 372 BLAKE2B b025115c048016a23d179218c7e3579cdf87fa3e6445b5d69029df1d96a5f3df951bf087f0c51f65ee1a5df7050163ec99c554428cf883247e1f9ff5b8812d1a SHA512 ac15ece82367c7a5a7cee2248a418b2dc5912027f29805d2851643127ea90c7b4ff3d21c90afcf0255f6946b0290551884405bab7fe62d2d9ab0dcc10de4da5d
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
index ddd555e974f2..e7378a56f935 100644
--- a/sys-apps/sdparm/sdparm-1.10.ebuild
+++ b/sys-apps/sdparm/sdparm-1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 85078a0d5fdc..559c7a81e59a 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -7,10 +7,10 @@ AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a
 DIST smartmontools-6.4.tar.gz 822539 BLAKE2B be76ec24cf24b2388a77758a1df5b5b9b19bd455dda26df6c13184051a51feeb0baf164265fcfe15b1d2ac41767d546109dea53cd7ac290d02f6e03b44da454f SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc
 DIST smartmontools-6.5.tar.gz 855642 BLAKE2B 25f78de8fd58497cf052e75aef746c15af8d56d2694007c1d6e2f8e31cae3b517babfc52ef73d3ae4bc5104a49e4bac16a48f23f3b3145228997bef0aad823dd SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3
 DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd434673df6a17e4527d160f06a5a8762e6ae490fc5ed13a33f819ba23c1924b49dd13620f4a51e6a40dac20a217523 SHA512 64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf
-EBUILD smartmontools-6.4-r1.ebuild 2534 BLAKE2B 3395b22b8bdd26c78404016cbb5f48a91b9858ffbff70ae3ca486fc3d32ca9603cbd752111693691a91b5c04982f07987391745514af782bf31d4644d8314223 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c
-EBUILD smartmontools-6.4.ebuild 1639 BLAKE2B 103e33da5b3605be940863b879ab2a4859036c3ce1206052b08cd9f0f88acca4d3f56513049a24ac57dcbd2e3c2413fdfcf4dc973fc19645c735feb2063ba122 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448
-EBUILD smartmontools-6.5-r1.ebuild 4043 BLAKE2B cb6764d3186c03fc1df0878d00b7ced1d1e5036e8e3e7afeeb552e3d257cb51c3173edc07b738d111b41eb73f83f67967a9bd9ed071ab11478e12fdf5a0ea20c SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5
-EBUILD smartmontools-6.6-r1.ebuild 4198 BLAKE2B efdd8dd91c44c87f2b7424f6200ab64095ccc82c8c36d239bbe88a93e1fa89a653a9d6aa5b7db1fb43e7f152b5333ca175e98e6f394729328c640f4a229a6f79 SHA512 e23a2d29430c2984dc944d3f3613c45dcbd6d6892e5eca3ca97d2fae649163bda5dfcfc2931df86b0d329779ffa26f8b45f11dc1776a0e66b0d270e688d9b218
-EBUILD smartmontools-6.6.ebuild 4141 BLAKE2B 44a371caee16745f0e5ae8aca8cd92e673579df9d9a693a81ed2ae0f91a9e2138558cf23f4dbbc6beee6f9910ed4e16368ec9ac68f6b8ca9772a40dc58f21481 SHA512 499b051c4e78c0dd053c8a377814f86b8d01c8176bf973ea03b3032037e573759e08ab1de68ae5a989a18fe688456f306769196c838b4f6b3809121a53aa9f65
-EBUILD smartmontools-9999.ebuild 4094 BLAKE2B 2af97f4da8bb0b0f5a1c6f9bc275724d69b4687e3ab7890f021d9e2fa25fccab24769dde1a08d61464f8977b6cd8c912b906307feb119e9f94eb83ce204cf0c7 SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a
+EBUILD smartmontools-6.4-r1.ebuild 2523 BLAKE2B 2e1f313d3f74018b382a889b84dd3a22af78fc5dce90a160ce4736e76c48bbb61eeb0a150d753aa815cc2af1bb889d8296f588f49e0e8cfe3c47de8c882a2889 SHA512 192842c49cd29546c3771205a7a86f9c79eef0a68003fe058b7fd856a615f336cea6350911fc7ff5917e6a058b498822fab2d99135be5cfaadd9e2e16696f495
+EBUILD smartmontools-6.4.ebuild 1628 BLAKE2B d1ae6c4297609f2dcd23be50719e88657e6a12c1c07935a139957bd845cefaa4cfef263ecd7b8d87b4d1992a415bb1ff1cc002559fc55ab8a95b1bd4bc64bf6a SHA512 e33d70a9e228103b5afe8bdeac2b40a1d00d92d5a75e3606b7b55b031b32d8d236fce0e7f07090cd55c380f2ab44f4940af7f156c38811012e118919a46d3737
+EBUILD smartmontools-6.5-r1.ebuild 4032 BLAKE2B 789235fb45cbcef3b560fe193be739d4449d162d313301b62bfc70b3bb8bfda1a53e72396d6aa3dea20315f991fc8aa21cb7283764df5a21a324373285a7d65b SHA512 0ef036cdb5ee6c71bab7fc94ce11fe2877c86f532200026aff9b04949aab69b1633327ee1cdfbb936f97b519a21eac6c883bfb146bbea130176f2f69b92c6be8
+EBUILD smartmontools-6.6-r1.ebuild 4187 BLAKE2B 944a9dbe7e8daf1ebb14d8674117bc421d0d87e05877e313f3d3e78178b4a56cf795e3c60d392edc1310cd87c2ae4bfe78a9ebe29928db7643b7e977e905490e SHA512 51a378f9503dafbddf8b64a24cf30abcd5aba982b20ba632967198069fae9f5c65b900e14ad942d74884739aafd5ba24a88c65703c3435522eba4f589c6323b3
+EBUILD smartmontools-6.6.ebuild 4130 BLAKE2B 8128e1ed40b33fedd93a3c0d81d8de7bdc4240753df41779bb571ecae0e68d84e0f257019dc94fa539b4c334edc04e8091f2ee1e88fca4169f4b97391df628eb SHA512 b312edb0993e3c14505be45e08398e3d598d3bbdbd098b4e4fcae866b272b35ba61d9298f652a3437908f06289c64ffcbf4a50ce70e1938c0a710647d8a4ea88
+EBUILD smartmontools-9999.ebuild 4083 BLAKE2B 7a80b258ba7ee8d0fbc4c1c3814bb9142504425fccbf5fcae9261968371697e3165aef7aed43628cd51faa8035e4cb739ad01e04a558866e73fe78b0104480f2 SHA512 eb5fc9180e4fae4048880fe6f73c09f913562de3f03cd554727514255e47a17010a9c913af332087fcebce225573eedd8cab31a1f81f3226ae190671b8effae1
 MISC metadata.xml 718 BLAKE2B 4172ef96f081f77b7f701d2f11ed1eae3cd7342815fd3643373f8bb60802a273d8308dc4ff8e8d36349f8361e04213ee2d94619045a16739aa2fa75560c7cfae SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54
diff --git a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild
index 04fed0a4248c..c5512a3aad94 100644
--- a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-6.4.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild
index a9381a6c4d8c..c3613455e263 100644
--- a/sys-apps/smartmontools/smartmontools-6.4.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild
index 499584db4c39..499d2ebabc70 100644
--- a/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
index 06a1bd943dbe..f0c381ba6cb7 100644
--- a/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild
index ec775cb6beef..1661efefba14 100644
--- a/sys-apps/smartmontools/smartmontools-6.6.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 4b26ca97c630..a2e1ad35a308 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
index 13fbf00e33e5..533a39afb4c0 100644
--- a/sys-apps/smc-sum-driver/Manifest
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -1,4 +1,4 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
-EBUILD smc-sum-driver-1.6.0.20151201.ebuild 886 BLAKE2B d11e9409609902cf9a0c40c04646cdc990cfb190db7a399fc3d1e0aedfa06c6fb33a64de1d91952dada7eb45b14e572632a34c9e149813931af6f006562d4986 SHA512 1c5461d28af43409d444ba481f2f1a3246a732185802812fa2cce456d0931f265a9219812d96c68292c3c7d33d377d059cb31498b15bc660843f89d854a15621
+EBUILD smc-sum-driver-1.6.0.20151201-r1.ebuild 854 BLAKE2B 1272340d41d5f6f2a9b00e15448481fe864287a8c16073e443b738420cd86f8aec21f3769df04d3e6e3228a6823932180c530b2cd657c12843b39ba9a28dd3c4 SHA512 e8d2463374e985c464f82d64b41a0a6aab337e20ad33021c627b63f70701256964a00e44186814fa1dd13e1ee93fa13670c2bd633b0297649f0084933b111f9e
 MISC metadata.xml 602 BLAKE2B 6bb453de4cd9a7cd7f52648c2994ac056bb756a8851659bd4075341e5d97a6cd81d056ef54cd4315ae25d6821ac684bafaee12d7928d7a998724e87af57cf05f SHA512 27d229c5f3ea94fb7098f4659edf321b048ecdba0624a41cfc53cec5b3d3c975914fc599494ebb03ae5dc8ea29993a23e90a9b7be76505cb7dcdf8ab1e3d9b5e
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r1.ebuild
index f37dc6d72d09..825bec7d32ea 100644
--- a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201.ebuild
+++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eapi7-ver linux-mod
+inherit linux-mod
 
 MY_DATE="$(ver_cut 4)"
 MY_PN="${PN//-/_}"
@@ -26,10 +26,8 @@ BUILD_TARGETS="default"
 MODULE_NAMES="sum_bios(misc:${S})"
 
 pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "sftp://dataharbor.supermicro.com"
-	elog "Username: dpguest\$ts"
-	elog "Password: supermicro!@#"
+	elog "Please contact the Supermicro support at support@supermicro.com,"
+	elog "in order to obtain a copy of ${A}"
 	elog "and place it in your DISTDIR directory."
 }
 
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 11b2e948e9d5..30f913bde009 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,3 @@
 DIST sum_2.0.1_Linux_x86_64_20180420.tar.gz 6150348 BLAKE2B 1aa520ac18f97bfe16b9160c632cf09bc2021d47789712dec5ea9c9789022cfc8a24f15b1cebd0bdfde65af639a97b2de1474ea0af07c9bf569a56d02e1e8e56 SHA512 61a46b7bc745267fb2f224151fa29b965a56d163ec0e30d46ebdc925b3fab036903f9364cf83428f3e17c6e57db93be48a1ec2a5e7ab6599588d7430af1af628
-EBUILD smc-sum-2.0.1.20180420.ebuild 960 BLAKE2B 0a75747290f3ee2b1939347080e55fece135f704c73f9d3f0a587999246754fd13e479982994152ebd4b194e9e4a948b0c97ffea184813e4a61442eafb6b2f8b SHA512 c113dabcf3a971b6dbbdf4333f23f6a8d66bf4b18488666b3cc162f796770128fc1f8121eb46df06f0314610ab76a0a5b94ecc7eedf6e359854d407b97be7197
+EBUILD smc-sum-2.0.1.20180420-r1.ebuild 911 BLAKE2B 1ed79dbeaa8c2952cf2f17e45ad1f870b439c0dcfa0e56786e538e61bb7c852fb1b939df9b76669e43beeaed7586606db04598271c168f45a7aba96b41044dae SHA512 1e8fa0022c8ea2906a9a6caf22e7041f075a3e3cb09af6db941b0a787ed4574c3877c1eec3bad52cc2f18b107b73fe1b683af0afef67236c4824c5ffb0f4412a
 MISC metadata.xml 1136 BLAKE2B 4fbbabd1a17374af0549a687211c55f4633ae1beea70b844b85b5f90b8f0c1cf053e11d271c9fd61be371a443bb0dcff268ac08476b5ae8d27a2580fa35a8371 SHA512 0d16f9dc63d86b301ce11ca3ae269aa9ea0e755370f46d875dabaf33f0ea244eb304d622bfe22d92dafbf014eb259f56c69ac53dcd0d8688f4792760f267531b
diff --git a/sys-apps/smc-sum/smc-sum-2.0.1.20180420.ebuild b/sys-apps/smc-sum/smc-sum-2.0.1.20180420-r1.ebuild
index cdbd078eb847..423244a7d81e 100644
--- a/sys-apps/smc-sum/smc-sum-2.0.1.20180420.ebuild
+++ b/sys-apps/smc-sum/smc-sum-2.0.1.20180420-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eapi7-ver
+EAPI=7
 
 MY_DATE="$(ver_cut 4)"
 MY_PN="${PN/smc-/}"
@@ -29,9 +27,7 @@ QA_PREBUILT="usr/bin/smc-sum"
 
 pkg_nofetch() {
 	elog "Please download ${A} from"
-	elog "sftp://dataharbor.supermicro.com"
-	elog "Username: dpguest\$ts"
-	elog "Password: supermicro!@#"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM"
 	elog "and place it in your DISTDIR directory."
 }
 
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index b30a10d81eac..f4a44c186ed6 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2504 BLAKE2B 16fdddff4a289c1e8fdf826b06bbd3fa2d323074e3d0cd345e7b09a584bcd8264578969f50e2f449229c51a05d385def0ecf40930ed5661139c41bf1bb9f44ac SHA512 a092bfe8a468e20f041c9dc20465193e3bddf2ed598b8112a1311fdcd5c88e6038efd5741d0b0be2aa65c86c12a7d51cd3732862484c407c5736ef75326b7430
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2493 BLAKE2B ec773781eb534627394c7b3483f0fd78b213ddc26094f5cbfc161423d6f3e1956a8ccd20a08f60d865d61bf6f87a09d73bc7ac9892fada48b98e067eab9dc375 SHA512 cf155b492e2fb9d3e61e3f03f6edd79287814594f12b3186a0a47b6320a08670d21aab0174900a4621c446e8ff5a8765b7d1f0262fad73065a6a97dbdeaa8427
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 211b1a2ca298..aa24b925822e 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND=""
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index 2f7d81161a82..e0ad8332aebc 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,5 +1,4 @@
 DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-EBUILD uam-0.3.2-r1.ebuild 1477 BLAKE2B bbfb23a4c7d65305ea40f6e316552357e06394ff5a51e2e3855262430f86b72890c2fe17106edfb9f90f9046d3f8ef927a2ffa57678d5ebb2f9a33b870f51207 SHA512 d5b1ca27e1c8b156ad86eb957fdaa049589bb68fb617d9a51744b48aefa993994ba24ae7e31748ce0400a41009d5959c2280676dcdbabdd9cb354b11f8ea65fe
-EBUILD uam-0.3.2.ebuild 1491 BLAKE2B 99e490c5cbffe511bc15559193c8cbbf8402e362cec57b9812579b2e001e736830a2ecc854a3bcde53cb2a5e66698ecfd16288e1be91cb11b80e789e1dfdd808 SHA512 190309f169b1f70a1dbd2e3469ccbc09fac2781dbba027294796fec61d67538a46a88e600c934d085373160e10e72f17045dbdf166451e0355c2477a0ca360d4
+EBUILD uam-0.3.2-r1.ebuild 1475 BLAKE2B 9639fac307ee43155a8847d49cd1cae4cd1feae0535df422fc2f24114e56cc66a919249edbf4dfcecd59b1d690ab7b5c6590bb912dcb5534cd35670012370409 SHA512 fc315fe69d91a5c5d1b1c186322fbd19d381cacc5c6ec95bb2041e7a9f9b3498efa7f0fa599776923c57bd92835867f2d5fe53e02ee37454dcccedd1af655da1
 EBUILD uam-9999.ebuild 1509 BLAKE2B 8fee1d4104540955b2cd074fd902ed56ee2777f315e88850d096461bfd76c16f93963dcc8b0d60629fd0226e8c2b95bbbc73446c7afa7c9f572e82552022642d SHA512 d410de4ba3041a770b13edb3365b896e6548611748168f4031b89d090718c3e600cfe94c294c6e3842ca00cd1a1a10cc35fb8498c028018474e710253bd7d7a6
 MISC metadata.xml 714 BLAKE2B fe8e8accd2c75c3aa51ce152676480d221a02e009db51874118ad939350c22c01bd171fe5d8628b626b0bf399df31b62f24303496768e214a0392979101ed128 SHA512 a344cc7080f63224d58604c26db1923afbe06b6bae3bd839f72e8f1cd8b6e41fc01e2eb46b135e8b8dfcb1217fc5ad507c0e86315c833a2d2b0541a6c3a53078
diff --git a/sys-apps/uam/uam-0.3.2-r1.ebuild b/sys-apps/uam/uam-0.3.2-r1.ebuild
index 409fc7f68e81..eddf29d0f8aa 100644
--- a/sys-apps/uam/uam-0.3.2-r1.ebuild
+++ b/sys-apps/uam/uam-0.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/uam/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-apps/uam/uam-0.3.2.ebuild b/sys-apps/uam/uam-0.3.2.ebuild
deleted file mode 100644
index e0bf0ed9eeff..000000000000
--- a/sys-apps/uam/uam-0.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils udev user
-
-DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://github.com/mgorny/uam/"
-SRC_URI="https://github.com/mgorny/uam/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
-	elog "To be able to access uam-mounted filesystems, you have to be"
-	elog "a member of the 'plugdev' group."
-	elog
-	elog "Note that uam doesn't provide any way to allow unprivileged user"
-	elog "to manually umount devices. The upstream suggested solution"
-	elog "is to use [sys-apps/pmount]. If you don't feel like installing"
-	elog "additional tools, remember to sync before removing your USB stick."
-	elog
-	elog "If you'd like uam to mount ejectable media like CDs/DVDs, you need"
-	elog "to enable in-kernel media polling, e.g.:"
-	elog "	echo 5000 > /sys/module/block/parameters/events_dfl_poll_msecs"
-	elog "where 5000 would mean a poll will occur every 5 seconds."
-	elog
-	elog "If you'd like to receive libnotify-based notifications, you need"
-	elog "to install the [x11-misc/sw-notify-send] tool."
-
-	udev_reload
-}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index d0564d2df28a..8e2236440bf1 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -3,7 +3,7 @@ AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba58
 DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f453327de54a32c563268db22a870fd7298cf839692e58ae42148e63037260e09bc2f1d5700ff96bcc451aff626ba SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
-EBUILD usbutils-008-r1.ebuild 1244 BLAKE2B 65d0f771202bf1e39d243c6f46d3f45d818033b7bd40ba198e834038416498a68e329c7182ec0ba756479ee6bd54aac11556e4513b44baa98c0dcee320b1801a SHA512 5384707b65c9801744ec1838e94396ee421ea007ec25c5afc1503134c2d7bf0231fdd1d9dce8b6af9892177b1dbe16b30303c810bb4e1d82b2082c2f32fe5964
-EBUILD usbutils-009.ebuild 1144 BLAKE2B 9fa4c45b9b706633f9f967468f4d6115c4d37310e6b9fa7d39c3a58a7f60a56fdb0039fabcd4e6c442927c5a18bfc0a0173b017617130265821ccc1c3a3f225a SHA512 40cf6c93e23f33e46c8111fc17e00c9a57b457c4ccf260188ac4b12f4f524d9f8d43e206f27bb72f954ee7f4506034516cf15ed477fa8cf81aa5e262768455d8
-EBUILD usbutils-010-r1.ebuild 1260 BLAKE2B b70011975310485c999a46e1815ec7f70bfe66cd30561b9b85ed6632bf711882f5b2ef5fa00c3a9b1106ba4bf6e59fdd833be2eacb784737aa42a7f207c2306a SHA512 94105a54e8691baa33702375dcdc117a870b0dcb32e60b499db0ae91ae1aeec8f6b324a0b58266297fb2dec7106e6d1183fdf3701b7e8b973767ab427ffa234c
+EBUILD usbutils-008-r1.ebuild 1233 BLAKE2B bd4a135641d42af965c9419b9d2cefd4f0b0f9a66de24bad5ed127a05fffa4c6aa2328a9cb331223691189b3ad7d42b10338f82f5da3d8b62f484108fff4db00 SHA512 6bf060d7773c9abc7935df695783ee523a160cda99e8b405a495e424034b209b039bc551cd1f711ffa07f503313348cb2f3f34fb9169387785469ba3fa99b31c
+EBUILD usbutils-009.ebuild 1133 BLAKE2B 93d5326da2d8a76846292a395eb8a96cd5fce8bfb24812ddd2657ca0a37d782611533cafbc5a60fe0da4aca2032a52a5bc1bdea0c0a7c1b73bf6ba63644a2d69 SHA512 c5ee7dc9644cfa0d709af886e1ad89a1272a156bceb3580d05ebc667a570b2dfb4fdedfd8c4c973186e62d6171c9595d7922cab8ca3d5c5ea70dc52cd1464845
+EBUILD usbutils-010-r1.ebuild 1249 BLAKE2B d81e58baa5928f383358b9b2adfb274c6cef0e5a547bf062e521b989e9e50a1a91c6ee0e4e1eb65815055044220496659ba3379fcb5d9ca86773e2d6ddfd9e72 SHA512 53b65fa4bf4bd01142527e51e2d6644dbf22a8f81f679d07f95ecb2a0d541936349d10c6d2c5aee493b1bcd2265e758dbde8292b6404bf238d9b119984608bd5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-008-r1.ebuild b/sys-apps/usbutils/usbutils-008-r1.ebuild
index ef15f8b2fa1d..b4a75cd8ce37 100644
--- a/sys-apps/usbutils/usbutils-008-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-008-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 55edd2e05387..c7b6f9525d8c 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index 37260497e7d2..4d60030d8e49 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 88b280838994..b8622bf23158 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,9 +6,9 @@ AUX util-linux-2.32_rc2-umount_completion.patch 1157 BLAKE2B a20c9965747048e236c
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de5d414c1039bb38784a376841806c1e0d38b702d29c6a8e91a2c3464fec1edcf68caaaa655400db2e5be483eb5efbcf SHA512 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
-EBUILD util-linux-2.30.2-r1.ebuild 6489 BLAKE2B 45ce658cfffcf33f2c50090be7d19a645a9694f9cf2307f7fbdb3bc7b5823ad310e73291ef64c96995dca5da0bede72d74218857ecb9da044c87c5f9a281c6b2 SHA512 3b34b7a023e092177537ed518be1b3f603751d58166e68bb2425c2438e592ec57ef5b91da5f36c010ec472ef519be4e7b26e07db3942cd5adfe8bd18dc13e955
-EBUILD util-linux-2.32-r4.ebuild 7280 BLAKE2B ab7595db270de788c539224612227c8c4e74afb1295937176ba5e62b1b9b12c9791a4f9ffe8e498deaaf5a06413955230b4aea3f233b056f6fc379bcec20705f SHA512 eee729e6926f11aa09c71d85e41aae81cb2652647a1583daa685e02e1e92675d373fce784944e07062a8568d1384a5564f83df687ff2866279e2af8109b5a3ac
-EBUILD util-linux-2.32-r5.ebuild 7375 BLAKE2B 18b0a51967da2e8bf22fcf90c9a58385d412a0c850240b8a06c6914304e93ce1e7ffa9ab6c1dbd3b16dbf5dd93008d3b88d9a1e5c3847940aba678236725bff9 SHA512 f228e414bd5cb82d6b00cbf46c040af0fdfc88d933e2087f60050c3874cbee4b3f3a6480412759487dc9d04a383de385420292eb6d31eda36a3325d3207c81c3
-EBUILD util-linux-2.32.1.ebuild 7381 BLAKE2B 01eade855080b8b84671f1c0ae07f5b8fd91c99c06bbcb4793eadfd2a9d2c82a21897a1a9dd0932c1c0c97f2ca7800a106909226c4aa1df301fb2aeee048114f SHA512 986876317856f6ed6a0aaedb4d26dfa1213b76ec264c8516b3a5a270cb238637ed62409497ef8de3ce21f21d24867dd260c08c7463845b15908ebbabd0cbc0de
-EBUILD util-linux-9999.ebuild 7120 BLAKE2B c609e4d485492b2e30e41789e740ae3126eda8336bced85e25f3fc69d37d38674ea2f1c1e127bd88b940553b873487e2b1b8d0b667c7e7bcea9678fd60104a8e SHA512 a0fcf8282612fe32bf834cec11a8413841beec2accad7ccc459dd416e64167c1ed32bcbbc3ffedd28605baa73d5c0a0f2fd8d75d8233008339fe15dd378fe320
+EBUILD util-linux-2.30.2-r1.ebuild 6478 BLAKE2B 87054bab714702594a240ebd4aa201a0c622b15363b3b18c244951e02c648290a65ecd7efcdc8ebc6adad2cbb35e9dedd51179a7b7fe173636ccd47f2035e0fc SHA512 a80307e8fccddd05c0d5d2c8118f9a46781f1b8a7600f3c4cfc3596e01a36fca6c534d7abd4c5f5f74603336624a99a1f3ee2950ded62ccdb0398a739c956623
+EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3
+EBUILD util-linux-2.32-r5.ebuild 7364 BLAKE2B f6a01a4472eca77c72455f486190ee6c59ae2ed532bd67f64f73d9c23bb1ce6d0447506578870e800a641abe79aa1b6db7b4d1cae4d4545dcbe722f0d2e1ca5f SHA512 e62e7b02811640c65da1e1708b29fe90a0547dc4091e4e5ef627156227141e524356448d00399a9eaf8875a00aa1be50e0babbe7f8ef9bb41f62105ce9e121f1
+EBUILD util-linux-2.32.1.ebuild 7370 BLAKE2B f613cace23c64e8d7e69dfe785cc1cc4a2e7c77897867d2e84943559e7030841ec929fa8b178d75096ce1ec0adf2af861fcfc99bc7d446760727432637212c2f SHA512 ea7131a22979df1efcbd041ce5539ef3b3ca5df31713ea46952af3fbee143a5b609b114fdc1be6e0d981f23e82d1bfce2fa489f2e5aeae0d19a01ff04530b5ca
+EBUILD util-linux-9999.ebuild 7109 BLAKE2B 6b87ab1217a31c3387048d6c32331e2f7f3e428791eb6c1affab05de219814cefd8f25cc2ac7ca237e60a38dcda27a1966e4ba46908cee4970acebd9dfd2c166 SHA512 2e3ee3b8c31486e3ac92e2e3838e619671e34755393f48bd2389582ba00b17b8abd8c92e026cd81d87ab6e10b5a0b4f213059ed43e91180c6c2371f195997986
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
index adba6b4d54f7..dae5303c3ee7 100644
--- a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.32-r4.ebuild b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
index 9999d740ade0..f23de35db8b7 100644
--- a/sys-apps/util-linux/util-linux-2.32-r4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.32-r5.ebuild b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
index 78c47b8971e9..9c2f9a602d91 100644
--- a/sys-apps/util-linux/util-linux-2.32-r5.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.32.1.ebuild b/sys-apps/util-linux/util-linux-2.32.1.ebuild
index a3a2918ec6e4..95679d47735c 100644
--- a/sys-apps/util-linux/util-linux-2.32.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 12b6618a9495..b0e8d25cd4ca 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 02584c2494bb..01be7de3ee39 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,3 +1,3 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
-EBUILD which-2.21.ebuild 673 BLAKE2B d681f3859e04138afec5d34cd74591217630e65ebd4620345fdd19ebaadfea217be8ced8012cd22b37ba6bd9105be7a8e21b4eef36563d7d59832f88199879d1 SHA512 a15d06bff94a64d770489f66d2683f6d6eeaf08e30c3275b8f4d1a18b40cfeb2aea68be2738ff52e15e4e4084443000fecb5bb78771526df3ed3d83da7a7ead1
+EBUILD which-2.21.ebuild 662 BLAKE2B 826dcf409ed9d73687b207508c182bac7d40553dd2b7cf490abac2cb45eb74b251cd3b486c2410b11beb5aaa3d2b78b493730f2a332baafff947b95cd403d780 SHA512 6e34214d4d0cbe034b65798b4fa0796571774f599589d54f8a6be5be41b716db8ad8204d6a136913646f5af65b4df148094798b3a5652ee689c87fdcba69101b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index 4b01ed6b5168..6464f0d47d8f 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /sys-apps
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)