gentoo resync : 18.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
commit: b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree: 16fe44748708acacd909d4e2e160a09a7f6d936a /sys-apps
parent: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
48 files changed, 701 insertions, 634 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7a1411ce5ddd..d8bb854b9b5f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 96e39405208e..e82be0cf0228 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,4 +1,4 @@
 AUX ack-3.0.0-gentoo.patch 428 BLAKE2B 331f35f3ee7ab8140110bd48f499894e344bdac8ea592b0da4f8b7a5ba3d911bc28158346f94ed062cea3a1fc5bed7140fd246d6d637b70bc2eb8d73b66d0780 SHA512 a88cec8b7b4c53bb6f176e5ff6d88ff3a7888ad23e025b527a98adf649df9ac205c14686bf1565555743bf84f46db3ecfd6bb42ef6f44d817698818d79eef938
 DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a6e36c5265d11492d84990a67b34af0e42041280b9a9ab6c57d951a2c73ba5b6fe07c9ac8774bac445c10fd SHA512 2bf4e9719d8a5ec56c9d31acbcff647aece7b52ff7ffaacbfec56e59e30efb9ca7397fa379e13a9113a27abe47053261b9adb641b995d3e8579d459c0483fb45
 EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
-MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f
+MISC metadata.xml 1618 BLAKE2B 29016eb74fb367ba24bd0e78a04347b05df87fff51be27178ec713e16395752c75a2eb91ea63b5e86d34d117f2c339ee6a665e9e73f1b3634aa81d5dfcebd542 SHA512 f0317c27167f34a6ecaee0c9afe1a189c58e5f08304f7fe099a5ba5ad18688e4b952d05e42a708fcb16b755fbb9f28529bdc4da7982a739ad014c105e870b940
diff --git a/sys-apps/ack/metadata.xml b/sys-apps/ack/metadata.xml
index d1ff84260b81..cb46689f3b74 100644
--- a/sys-apps/ack/metadata.xml
+++ b/sys-apps/ack/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index d25c0ff6d754..afe53750e881 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 1383 BLAKE2B bd6b33ba28ef7874e7b072e119f7711b779776d5891f871fd52af0f6539f5d950c98367f721b861c4b03b9713c14de9794eb981c42187e5275d2fce6404d6446 SHA512 4d975c99a096befae707e5da57777ef0e5aa0c41962c8c6231936a75b90f7ec14ccfca3d79a80ea1c5eb640df2132db219b983863b3ec53bb75e0e6f51f1c39d
-EBUILD acl-2.2.53.ebuild 1080 BLAKE2B 1f44f6dc3c15aefa2fb440f85585d0bacc1bfc826aec30a0cbb0c661ff53f377dcfcf715f9eadf8f0e6f896326ef24eb0d4f40e43f7d65163043d91fcca75b23 SHA512 dc82432b25ea24c5d14faebfd86ae5f94dc2274ca726d801ba83148fbe27639999c511c6987b5d64c222f23c9288320869672c71ce6d05c7176ba134ac3808a3
+EBUILD acl-2.2.53.ebuild 1240 BLAKE2B 248ccb48642fb7c2751abf67d85481e08bb2af4fd47f6ade315cfa3566c4f7e35d44e736c2882d38dc0b6a959af7ef570d47a179b54e2956ecd97d71b43ef369 SHA512 d55631d7766b36a28cfdfab59e1285ce40ee7c4ee8e2e58f223daeb6f11a805be8ccf2df5f3199a4c21e374949a77181306e134d4b388f38d185a3407c13ed65
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 97265989420a..7a98a3f61eb2 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit libtool ltprune toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
 
 DESCRIPTION="access control list utilities, libraries and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
@@ -20,6 +20,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	# filter out -flto flags as they break getfacl/setfacl binaries
+	# (bug #667372)
+	filter-flags -flto*
+}
+
 src_prepare() {
 	default
 	elibtoolize #580792
@@ -43,5 +49,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
 }
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 8b172fe71626..ccb1e9ddc156 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -4,6 +4,6 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f
 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 1723 BLAKE2B 4ba215c8b35326cb4a607fe63e23e14262ef345c1f28bc9ac3ed2b9db80450adc365be791ff7391bd607c7a3d9ea0e0d77a931aeceaf3b4c61a86277e5488789 SHA512 34c2badaa57b539b0009747354bc2ba23a8498e86e12b802fd6dfc6ac7bd5f424b544ae1783ce6361b2635880d7d11d1b7b09ee76ad65ad32675dba5137b588b
-EBUILD attr-2.4.48-r2.ebuild 2109 BLAKE2B d871796b5945f20511d9916debec767436e249c68d41605a7203c4fb954992aec8f320f0607e5657308da881ab9b4d54351301ec51fab443469b8cebbab23e01 SHA512 28363d164d4ea15ed83c3b53e45060fbb415667fed8957be3e67f31def9d075353c8c943bd59fbb08f0949432c0561f0cac26b9707f61e22d53cdd192c43e175
-EBUILD attr-2.4.48-r3.ebuild 2194 BLAKE2B 3e71d2333ce22d1c8e5d93daf29579fe77e677eba611301a68d4f6464330f55be574cb282f3b9517a71bb58a3be15d936c3260dae9d921fbbf92267271bff546 SHA512 4588c952bb83cba21e706e92402d9afd4cf2614f0bd2fad70496b3c650fdab0c4ebfe73613e059b6d2503d7daab97c9ddabefeb0214dded923cbadfaeb104775
+EBUILD attr-2.4.48-r3.ebuild 2353 BLAKE2B 293779e6b076e73c2eda3ad51d5282cae7e5b1b1615b660afb8583a7ba820d1b684ef19a42b0f9c65f605f93795b5f349c6b5d2752d825b512b40e15def115d4 SHA512 4943e67eb6843ea5f4cd525bd79c2d959a8318d84727e0dc9ff77928347784c552767f593abac4f5c2a6f4d30d887f7625c497ad229aea8f7cbde7b66c732205
+EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index 15333e644dad..c5ed52072cc3 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
 
 DESCRIPTION="Extended attributes tools"
 HOMEPAGE="https://savannah.nongnu.org/projects/attr"
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )"
@@ -21,6 +21,12 @@ PATCHES=(
 	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
 )
 
+pkg_setup() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+	append-ldflags "-Wl,--no-gc-sections" #700116
+}
+
 src_prepare() {
 	default
 	elibtoolize #580792
diff --git a/sys-apps/attr/attr-2.4.48-r2.ebuild b/sys-apps/attr/attr-9999.ebuild
index 0f25cfed5ee3..1d01d82440c3 100644
--- a/sys-apps/attr/attr-2.4.48-r2.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -1,28 +1,43 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit libtool ltprune toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+fi
 
 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"
-)
+pkg_setup() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+}
 
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize #580792
+	fi
 }
 
 multilib_src_configure() {
@@ -33,11 +48,11 @@ multilib_src_configure() {
 	tc-ld-disable-gold #644048
 
 	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
+		--bindir="${EPREFIX%/}"/bin
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
 		$(use_enable debug)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -77,6 +92,9 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
 	einstalldocs
 }
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 7eed4b124b4b..3096ea0a25ce 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 EBUILD ed-1.14.2.ebuild 904 BLAKE2B 7082d93e7f0b4d25de048276203d0a7f86ded0523102a2ebdb6cfe09fc3ed095e54e833b5acfd8f8246c1e40b3915b01b0794b686fcdad98d7cbf5a66d3103b0 SHA512 5b9a117adaba19625076775d724ddb85830c974bafd748b03bf0ff71559ab8d44bee7f2a08f3df712f16fb9fa12a273417eff473e2059884361b4e9433c424bc
-EBUILD ed-1.15.ebuild 925 BLAKE2B 4564afbe7352432e92228ebef9a62f3565d9e0b1d0141348d90c1d5472c3c20f4d1ae6a3072e728b8c109169d0ede4f9aab7cf927e0c1701cc9cdb4df3acc5ee SHA512 038e80bfd81d8c23e2f3c0bddbd48fba3c76bdf02958197dd96273be5f2e655fbac769953d715057fdd29043a48a80d52fe93767bd4fced178f309ff49ce0f0e
+EBUILD ed-1.15-r1.ebuild 945 BLAKE2B bb2f7a6d24b312becce52795593c486930a65be5b872747f6f099962a13c2585d92a9bfae297f94fc6d0a05551c52c98068a030e6b609a2227b0695f81ffb181 SHA512 06824d4d8399429f54872e972b62418a892ec7fb5a4cd81a0d1793be7b04b64b9b5ca040f55a08e63223e7cbd31d6c6c0d20fbfcf65af97bd357d99bfc93bb2b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.15.ebuild b/sys-apps/ed/ed-1.15-r1.ebuild
index c6c5d7a96bc1..95fe9691666d 100644
--- a/sys-apps/ed/ed-1.15.ebuild
+++ b/sys-apps/ed/ed-1.15-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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=""
 
 DEPEND="sys-apps/texinfo"
@@ -21,10 +21,11 @@ RDEPEND=""
 
 src_configure() {
 	# Upstream configure script is moronic.
-	econf \
+	./configure \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
-		--bindir="${EPREFIX}/bin"
+		--bindir="${EPREFIX}/bin" \
+		--prefix="${EPREFIX}/usr"
 }
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 5ca82e0152cc..2d34e6491efb 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,6 +2,6 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 EBUILD file-5.36.ebuild 3140 BLAKE2B 5dd07458582785009964253e23e2e52f1abf1ca163aea5b4c4a504fcc5d85443a3a865edfeeebb29b5be6c02db00eb010d91be1777072fc2f7b4713b95decea0 SHA512 261875b1a18aedea7ca70e54fdadb974ed40d8ef42852fa1b9f88860402fa7fa1ad27d36f52adf6390205aecab16b58d8c0464f1dcbbfb051a451bdbd32e6788
-EBUILD file-5.37-r1.ebuild 3206 BLAKE2B 63ddf85b31c06e00bca8c6db2e5a7350e4a018295978e878587dbb8194bfa757b738f8d54d9c10e42c76d67c9a4b91caa7660f177aaa708df30715fbaabc06c6 SHA512 19516eff8a94546f2a5cd1774ab1bb432fdc1a8aa235f23a7dfb29995cad9c8cb2b8473697e2c784cfbae259eb77dab137ae9c8c8148c5e0ccc0ac52a6731f91
+EBUILD file-5.37-r1.ebuild 3203 BLAKE2B 6ab8dc308789831e0dcf9a2abb906c65c6b90b653eeb4bb29bc0d60c232144b649964b23220dfac5447fe17531ac3332bb3cb8f9e1d0039d176fc6904408ef9b SHA512 29c30606d76611ee1df79483b4734e59ef6cfc54c08373daa48049e763d0e8f9ada165007491dac5badc84722cb45737c624df6046e8c92d67edf7243387e080
 EBUILD file-9999.ebuild 3240 BLAKE2B deaea9fdf075c13ae9584fb37ad19193485118b9e4c5289b5fdf5bc365431a50df698b11cea463b4ce939d8534bd371fc0a64fac7f4b9b131c59054f79e035f4 SHA512 31da4beb4b69906ce21177453922c3e23a8580e0378135428f1e2ab8de1e34cce368dccebcecd6973bd5879351152156010d60982e393e1fcad632ddc755fb22
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 15902d849e8c..12402b999dd3 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index fdc163c03ad8..a9eae9b3a3f5 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -6,5 +6,6 @@ DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 B
 DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
 DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0
 DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
+EBUILD guix-1.0.1-r1.ebuild 4654 BLAKE2B a5359b2c9641e6dca4a781e3e666ffd33bae15b944f94878135b4e730bdda4b881e046460099520d74ec8173fca7437d1d11bd1a96d75dda1f0eb49d8908c08b SHA512 e3b07b2b2d41a2031fd4fc2fa802e590e8b1924c1cedb31da1c914f2f0b7d24be9d2cd7226d6d7ec8f70a6d9275c9f00e736a1dcb569f023e165a27c78c7d7da
 EBUILD guix-1.0.1.ebuild 4561 BLAKE2B e83b2007f66bef0612f6aea68f894645c0856a41312857ceef3d3084e4f684d69d87a37a9f7fa1cf6c49f7b585dfc73fab1240c2a588ba9b60c73021aedbeaa1 SHA512 60c31ddb829937de5995e643be99739267345a5ea4aed91953ca593e3d4ac71bc6674cd41bf9019da2fdd0524af91f6f1b69e7a76a45a1af4bff7a75dc2e5d66
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-1.0.1-r1.ebuild b/sys-apps/guix/guix-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..0ab61861e615
--- /dev/null
+++ b/sys-apps/guix/guix-1.0.1-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info readme.gentoo-r1 systemd user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
+	"armhf-linux    20150101 guile-2.0.11.tar.xz"
+	"i686-linux     20131110 guile-2.0.9.tar.xz"
+	"mips64el-linux 20131110 guile-2.0.9.tar.xz"
+	"x86_64-linux   20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+	local system_date_guilep uri
+	for system_date_guilep in "${BOOT_GUILE[@]}"; do
+		# $1              $2       $3
+		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
+		set -- ${system_date_guilep}
+		uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+		# ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+		echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+	done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+	local system_date_guilep
+	for system_date_guilep in "${BOOT_GUILE[@]}"; do
+		# $1              $2       $3
+		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
+		set -- ${system_date_guilep}
+		cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+	done
+}
+
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	$(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	>=dev-scheme/guile-2.2:=[regex,networking,threads]
+	dev-scheme/bytestructures
+	dev-scheme/guile-gcrypt
+	>=dev-scheme/guile-git-0.2.0
+	dev-scheme/guile-json
+	dev-scheme/guile-sqlite3
+	net-libs/gnutls[guile]
+	sys-libs/zlib
+	app-arch/bzip2
+	dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+	# guix archive --authorize < /usr/share/guix/ci.guix.info.pub
+[as root] enable guix-daemon service:
+	[systemd] # systemctl enable guix-daemon
+	[openrc]  # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+	\$ guix package -i hello
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+	guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_pretend() {
+	# USER_NS is used to run builders in a default setting in linux
+	# and for 'guix environment --container'.
+	local CONFIG_CHECK="~USER_NS"
+	check_extra_config
+}
+
+pkg_setup() {
+	enewgroup guixbuild
+	for i in {1..10}; do
+		# we list 'guixbuild' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		# 'kvm' is used to make 'guix system vm <system.scm>'
+		# work by default: bug #699642
+		enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild,kvm
+	done
+}
+
+src_prepare() {
+	copy_boot_guile_binaries
+
+	default
+	# build system is very eager to run automake itself: bug #625166
+	eautoreconf
+
+	# guile is trying to avoid recompilation by checking if file
+	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+	# is newer than
+	#     guix/modules.scm
+	# In case it is instead of using 'guix/modules.scm' guile
+	# loads system one (from potentially older version of guix).
+	# To work it around we bump last modification timestamp of
+	# '*.scm' files.
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+
+	# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
+	sed -i nix/local.mk \
+		-e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
+}
+
+src_configure() {
+	# to be compatible with guix from /gnu/store
+	econf \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	# guile occasionally fails with 'bad address'
+	emake -j1
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	keepdir                /etc/guix
+	# TODO: will need a tweak for prefix
+	keepdir                /gnu/store
+	fowners root:guixbuild /gnu/store
+	fperms 1775            /gnu/store
+
+	keepdir                /var/guix/profiles/per-user
+	fperms 1777            /var/guix/profiles/per-user
+
+	newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index bc37239e3357..8719ec4fd81f 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,9 +1,12 @@
+AUX haveged-1.9.8c-threads_build_fix.patch 1066 BLAKE2B 45013ca4709656332ad2d32b8614d0be4048878c2241240cf26bf00dbb786b1ad4192a620993e797be1938d2d2c086d44efd33542c2b061fff7788823594dd90 SHA512 945ba4a5691382010420aabb9d11ed809eebcfdff2772262da38d4809e2d7d19cbf5ee33d3b71e074dc248b33717ca66ac5433099b5829fd6b15bd35ce91e815
 AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c51df25e9dbda2baf8ac6d8ec5437794c47c56de2d4af841e3844d91660a9eec4e8b243f60c3cc3a SHA512 b7bc782765a4521d34485d44391da79a3d1ee3bfda548ffcbf662093c8c7fdeb6baf2813ed7aa741b07e7b7e8eca1a94dceaa37ef202f801686d89855ffb7c30
 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.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
+DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
 EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
+EBUILD haveged-1.9.8c.ebuild 1003 BLAKE2B 610931f67cb089bfdb9b8fad276f98278f33506465177e699e8e29c306d265e89519c3ea4719068ead744047da5ab3164abb5552f99390d24102ead9cff6038d SHA512 c0da839f56f2ac86cc919233960be6afab5a4bf09dc270596376a3fffafd53c7e9af718fe7c0e4e7ee6be156bc97c9c28d76ec23ecc827c986caf6ce889526a6
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch b/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch
new file mode 100644
index 000000000000..fb88a8b51212
--- /dev/null
+++ b/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch
@@ -0,0 +1,36 @@
+From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 14 Nov 2019 16:15:00 +0100
+Subject: [PATCH] build: Fix compilation with --enable-threads
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Previously failed with:
+
+havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’?
+  190 |    *bp++ = BUILD_THREAD;
+      |            ^~~~~~~~~~~~
+      |            BUILD_THREADS
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/havegetune.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/havegetune.c b/src/havegetune.c
+index de39c53..6f14476 100644
+--- a/src/havegetune.c
++++ b/src/havegetune.c
+@@ -187,7 +187,7 @@ void havege_tune(          /* RETURN: none               */
+    *bp++ = BUILD_CPUID;
+ #endif
+ #if NUMBER_CORES>1
+-   *bp++ = BUILD_THREAD;
++   *bp++ = BUILD_THREADS;
+ #endif
+ #ifdef ONLINE_TESTS_ENABLE
+    *bp++ = BUILD_OLT;
+-- 
+2.24.0
+
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c.ebuild
new file mode 100644
index 000000000000..dfe030e05698
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.8c.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index b72006daec8e..72b759dbb743 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 EBUILD kmod-25.ebuild 4924 BLAKE2B d7fbc42a9d490d10c0fca9e590c7e0cf8520ee7bf80d780d33a08af22e46fea044725d3ec2e5c49f0520d17721f97130e06212d823972aea9387c2b3cda80d04 SHA512 3fa591487100ffe314c1a7f34d598cb1188c89893462a57f6b497baeaf702af6a154b4d36967304fcba144aaa92ad0897613eeed4e33b5d802a06444cb88f803
-EBUILD kmod-26-r2.ebuild 5099 BLAKE2B 4487c5058627df2a8204e2fab619f5dc5ccf88508073d38b6d7b6a7b1aad2815e1af78dc64fecec9bfabd20714c0b5c7a51bcea9312f428943fd339d7224f4fc SHA512 a91fdf2e4b8edabab95b85ae3300c60fe2d553b3de6053524c7de20accb346062c6648539091d33c086532593eb7b537b39bed26a1a5481f9a2094a1d9e7dfcf
-EBUILD kmod-9999.ebuild 4974 BLAKE2B c2d8c0da4b9d209e46ee9a39def747c7e2dfe7bc50df0d5e47c9201674d184be3a40438bf42168f08aade146f07117c169aeafbad207a3743b3508ea339a9527 SHA512 7e1a487fdfd13e7dd95e8fc27fb51eca38345be289e40a0248bacb81745bf797c57a53f28bf9ff5e9051895780e913764b5ce7e080f518df77c0c7043bed99b4
-MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
+EBUILD kmod-26-r3.ebuild 5101 BLAKE2B 502f84192e011dc541eefbfb70f0302c4c0c6a176cf589e735a06c5e0a539c8b9b765e7410bb997e8b88df1563fd950605087b2d5a6b06ed2ac80a786857edf4 SHA512 c65c9044a4fbbe294d4d6654777cc4b95903ee30afc3314457ba7ad3d553e33d0c4bada80086a1e7956500fff7f65e346dbc72e9f3826bd7db894541e2d518ca
+EBUILD kmod-9999.ebuild 5044 BLAKE2B a8db971037a2c312826f62fa882a1a1e7665b15067fadf0a8017c38ffe25083ba64fa26c3cbacb74498b4a8b9c210076a159a80e3b0b1a7a5cfe63054c70e5f9 SHA512 dbc278ce5db407abcfa1b125f0c9ddcb868ee88765febdc96faabb6527ab21f40d7edba7a3a0cb8165b5624d19641442dd548ac469b0292aa423201f93fb0067
+MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-26-r2.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild
index c2aa5bc3dd97..4c0380e44bde 100644
--- a/sys-apps/kmod/kmod-26-r2.ebuild
+++ b/sys-apps/kmod/kmod-26-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 	inherit libtool
 fi
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl lzma python ssl static-libs +tools zlib"
+IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -36,7 +36,7 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	ssl? (
+	pkcs7? (
 		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
@@ -93,7 +93,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable tools)
 		$(use_with lzma xz)
-		$(use_with ssl openssl)
+		$(use_with pkcs7 openssl)
 		$(use_with zlib)
 	)
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 40622a08336b..2cf70d9af7ee 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc lzma python ssl static-libs +tools zlib"
+IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -36,7 +36,10 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pkcs7? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
@@ -86,7 +89,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable tools)
 		$(use_with lzma xz)
-		$(use_with ssl openssl)
+		$(use_with pkcs7 openssl)
 		$(use_with zlib)
 	)
 
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 188bf47702ef..be2aa7701742 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -10,6 +10,7 @@
 </maintainer>
 <use>
 	<flag name="lzma">Enable support for XZ compressed modules</flag>
+	<flag name="pkcs7">Enable PKCS#7 signature parsing for modinfo.</flag>
 	<flag name="tools">Install module loading/unloading tools.</flag>
 	<flag name="zlib">Enable support for gzipped modules</flag>
 </use>
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 0ab61362c4a5..32cbece7f78f 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -11,10 +11,6 @@ AUX memtest86+-5.01-no-clean.patch 603 BLAKE2B cb00ec1f702c7fd1697c48599ba7113bc
 AUX memtest86+-5.01-no-scp.patch 388 BLAKE2B a5b195d54c4a9d99c62771430822f87f20f6f97c7dfb28f8fc8db0f5e6aba79404bdce924ad303fbbb0cf04fcd5551abc81bf0fcbab9ac17884bd32f81832d33 SHA512 4b14e16fbe8e69a4d532e8327486fd2434798613a784aca24b381f1fb5ae39839344281494c32dfd0fe8a8a46b744abdaac7884be4a95a87b635e0baea63731a
 AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1
 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
-DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
-EBUILD memtest86+-4.20-r1.ebuild 1924 BLAKE2B 86699f1b9d2ad4677b48c0c912187de3de3a772ecbe07f6f7740410db1934a3088d899898088eee5e77b5c26acfa53d9d0e993affc76ba385a9aa009765daa26 SHA512 b44c8e88f926446dfa7d15a9dab6169ab4f74b74577920f1b6483a09e29b91354ad3c081f0ccc50b6fce6d40daf980ca2ce58330aa3feb49913186c97eda8a48
-EBUILD memtest86+-4.20-r3.ebuild 1730 BLAKE2B 896a560eea656f8ba385db8b9551275ce47cca80634cb5a427e45805f97ff036e139a2de2817dfc1e3e9e439b450eceeefec813fd9acad549f7b123c610797f2 SHA512 b9abcab6754b2625ecbcb2aabd404be98927406fdfdd0538566569f8814e67ca53424d96a875917ecde61aa5cb6ceb82bd6fd244ab30643646c15d8ac54c4303
-EBUILD memtest86+-5.01-r2.ebuild 2358 BLAKE2B 7588a1ceee5912cb93ccdc40935a3587d236b5dcb2aeb394ceee34db1c1a2e3f3d87a6a83e69f85f5cd33b11f3a3e3a1e7c730fbd57d10fd9d09fb388a5a4690 SHA512 59f8763cbbfbe21ab08c6c193a51d15d4202c89d68dbce80d93257d6ccd7fb90ce1a2295c2b88c38e7ba4d85a4aa3bc9b91d88eea2fff723003c6980c524395c
 EBUILD memtest86+-5.01-r4.ebuild 2775 BLAKE2B 6f09d52ff4c119a0b2eb64a122fe1fe594ff8c4422baee314d6d65f8eb8b87f59229f3e67cdec6d67b65bf21f05e5edb0fcdfebbd203356f4f37dab376ca7201 SHA512 f27e4bbdefe648a2b88d2db83acf8cc7c8dd7c23faeca535f6140bfa4316ed0aec89f7ad66294c76bf52bdbd544892bf4f901f945c3c14871c17ac1dfb4f231c
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
deleted file mode 100644
index ef79c442e7a1..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
-
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-
-	cat - > "${T}"/39_${PN} <<EOF
-#!/bin/sh
-exec tail -n +3 \$0
-
-menuentry "${PN} ${PV}" {
-	linux16 ${BOOTDIR}/memtest
-}
-
-menuentry "${PN} ${PV} (netbsd)" {
-	insmod bsd
-	knetbsd ${BOOTDIR}/memtest.netbsd
-}
-EOF
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${T}"/39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	elog
-	elog "memtest has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs"
-	elog "by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest"
-	elog "    > label  = ${PN}"
-	elog
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
deleted file mode 100644
index 5ad27dd25b9b..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
-
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	elog
-	elog "memtest has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs"
-	elog "by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest"
-	elog "    > label  = ${PN}"
-	elog
-}
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
deleted file mode 100644
index 47ecffb46285..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy iso serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="iso? ( app-cdr/cdrtools )"
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	epatch "${FILESDIR}/${P}-gcc-473.patch" \
-		   "${FILESDIR}/${P}-hardcoded_cc.patch"
-	epatch "${FILESDIR}"/${P}-no-scp.patch
-	epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312
-	epatch "${FILESDIR}"/${P}-reboot-def.patch #548312
-	epatch "${FILESDIR}"/${P}-no-clean.patch #557890
-	epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638
-	epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974
-
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	use iso && newins mt*.iso memtest.iso
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	elog
-	elog "memtest has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs"
-	elog "by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest"
-	elog "    > label  = ${PN}"
-	elog
-}
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index ce8994f16689..0801cf31e9ad 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,5 +1,3 @@
-DIST memtester-4.2.2.tar.gz 20952 BLAKE2B cf0728363250f13b58f8376f1bfa707125e52af382b572643dc1c7676205d170ae525b8e14c79532cf44151ad9b46cc3a26c1319c01410c76e6167f71c271123 SHA512 9ddff98e3173583e3edd50fb5e8a951f20956a75768231c8576d33d091776f22eeb15717a8b87e968e9c49211c83551d518f62ad3a1b0ee1db76152fee925bfa
 DIST memtester-4.3.0.tar.gz 22113 BLAKE2B 564cb874ea8263e23049d99417bb75f4d9f6fe1bbc022b2f2043735548c97f0060e877079087e524738bda3f9669d0ec171fb3aa9958a2904d848ace87d1cd91 SHA512 045bcc73855706ff03e8ca65297a0d6e5b5ac02f99dae0f17cef1310b403efcb78d9a7295eca6d2de703b0a7b2f71b58a37f5a42040f01fc77a321a8d2205888
-EBUILD memtester-4.2.2.ebuild 710 BLAKE2B b34121ab332f6c18482d3a22a2be0838819751efda6921e1c5d3b7508990909f37c7113eed3763bb8446855a6e73d2804a25df60412dcc950cdc688cef378c14 SHA512 30f0319b8a4daf0911aae14c7fedceb8b081c1371e9e0ef1ea3923ab1215da3577bd763a1af445946a009e18313ad13a28ed54e53e190ffb2c95fc1b2161f3b8
 EBUILD memtester-4.3.0.ebuild 716 BLAKE2B 33911a95eefdf9b76df8bf3828528ff37836cbfdbd6b5a22c4ee2795110b6f33fc3f1365d3d5ef948e7148d01c5779831c4271adea9659c7ca0909d366733112 SHA512 976bc16d7b2acb0ad6c31d67c979be77e3ef351a2b8f949b235a3cd916d4047af71a0fda3fffec6cc2573fe4a27385baf5bc3421864d7c71f661a9d60ba9a233
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/memtester-4.2.2.ebuild b/sys-apps/memtester/memtester-4.2.2.ebuild
deleted file mode 100644
index 78eb7e3c08de..000000000000
--- a/sys-apps/memtester/memtester-4.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="userspace utility for testing the memory subsystem for faults"
-HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="http://pyropus.ca/software/memtester/${P}.tar.gz
-	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
-}
-
-src_install() {
-	dosbin memtester
-	doman memtester.8
-	dodoc BUGS CHANGELOG README README.tests
-}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index ef1df697eaa0..f0489b5130e2 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -4,4 +4,4 @@ DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
 EBUILD moreutils-0.62.ebuild 1511 BLAKE2B a978a0b7539b353d9f5f8e015a884a92b91c79a296f74cb757599ebabc651e225c37a85c985f36f76f50f5d1a9713c1377a8c16566ef7b3f215e68b5530418ad SHA512 984edea18c99ca61c8e621c6f1e55a54fe9ed247d16dbe63cc16056a807f78c419b0ead508b70117e2b150ca058577d857f7dd8aeaaac00acb4bcb9086038660
 EBUILD moreutils-0.63.ebuild 1448 BLAKE2B c88b1a5a7f2ebada0cd3b420984e2245673a0cf4c4ca70e10ac7c7468267e585422e3da834367fa4f82487343b5acd1239e68bdc22aa52911f9087a0eb4392a1 SHA512 8e8c2a2ff905e4bc83f23e9b182e67e07ecb8e8db6fe1b7c076bd600a00847e8ec7da8358a0bcb3194b38109a15ad4db718362a45a7fe9b20743a17ef41f209e
-MISC metadata.xml 313 BLAKE2B 66183e9cd23dd84df66abc1f3e229607f3a234f6a07a29cb2246c130cf214fe5ab1275c6f96b5804e27ebc8b867236c49261369756cfaf9dc563dae60f387be5 SHA512 75fcc8c041bbe324b5c1bcd0b006b7cfc17b5b2ae4bf0ef711b9ef4d3233917d4a189320ef06f3165e23f33ac7e6e58d1545cb4c2082eb22a052d09817cecc6f
+MISC metadata.xml 237 BLAKE2B ceac7f98433ef3d26c4e5c452f2c41f30625ed0209982872213cc4917ad45d1dc64077b5adbc7e2aa14a86feb86a218a64d5f4d1829534b452516ffea6d6fe48 SHA512 38f6b51bed4a582dfe6137eabd3929e59232bfc626f6661cf936b7d00959d75591cb77ac900e1ad1d20c9a13097a2c08e39442cf5e6201dccfd2cfcfb5d989f7
diff --git a/sys-apps/moreutils/metadata.xml b/sys-apps/moreutils/metadata.xml
index 9dcebf680e36..77a13c050fad 100644
--- a/sys-apps/moreutils/metadata.xml
+++ b/sys-apps/moreutils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>radhermit@gentoo.org</email>
-	<name>Tim Harder</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="perl">Install scripts written in Perl</flag>
 </use>
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index 3dd4d126e4f2..04a368a1e8bf 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,8 +1,3 @@
-AUX pick-1.8.0-cflags.patch 204 BLAKE2B 1760b019fe93b1288ba12c01557b6de9e43adaca2c437d6e519acdf660fbf621d10d602da9a31e849e044df4964de320a9b5ba4611d0edde46277fac605f5df1 SHA512 63d5700af23b717641845db6c5d6e2bc6d94f1af4108b28fd7243fd7a46af5687371513fd9e423896b5c6e6245d5c575da5b4645d2db2cdd7c1fff10244fca26
-DIST pick-2.0.1.tar.gz 108010 BLAKE2B 3fae7cfbbcf6913af9cf695e44f171aef58737038e94c779f0cedbe2e386577b4661cc9a55ad657b1a11873fc06bdb7bdc8eac032b6ca584778fe695f8ad4e68 SHA512 616c7889e2ad5d5bb267f683530327e9e121a678db4bd04d5cd720bb8bd81ae14e6bd83e342b33863ef18bd10943e6bbdef177c9639af513456e0146f9b73226
-DIST pick-2.0.2.tar.gz 132174 BLAKE2B 1f186d7dd0fc628d7a1b5fd41ad8c4b0c81f12c1855418354e77376232beb9fa500f43172d8d75f55972ee2589feafbefa6d777cb2149e4707509df355542744 SHA512 92d74fa62f6c829117c6c3faf6ec39fc5dd66465516be396d21d7b0a92ee10761a1d3f43aa4a454f8d19790ac02a4a1af145139d488344c97a511805c5d6965b
 DIST pick-3.0.1.tar.gz 29878 BLAKE2B 8910bf726102802a76717ecc20360882c1c25bc346324c33173eb64872066ff284636557bf10a98a6cfbecc50dd4c8cd87b68aa924b976b072e5fead8989e316 SHA512 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
-EBUILD pick-2.0.1.ebuild 547 BLAKE2B 6e3e7ac4dd81c7511dfdba5716cc00b4439904ffc7e00552eab3bf46875dc8b644fdf5777c92552f7b7f659c991ac370cb5dcfa942bb24e3a2d4548cc1235de3 SHA512 f12167e04fee7a4fb0e38a796271afd6c334e9756a1c0a15ad2ee91f41da324df760ffdc64d6921c5b9b8bea46a335ba66e849051a21af79b7c52ad973de8730
-EBUILD pick-2.0.2.ebuild 474 BLAKE2B 18c4fc6a0a9d6f4a689a61f9795e999ae426632fedbfe01cd87cde32e30376c9d479111732ea1c4745c44206ec0eac117b0adc6b8391fc85d140cd42a32a8091 SHA512 8096684f81b5d5d2db728c8139dd89acdd9d0eeb6f2939a2657b6eb7d6661140e643664edc02b0356368881dd08aef3bc59e3007dbb881218be53099c092a3e3
 EBUILD pick-3.0.1.ebuild 638 BLAKE2B d39e2abee8dc53fbfc47ebd9fa05ce1328de323a516f4e2d4f24a6fa55424977db13cc958398d3766970a3d16f1a107096fc5d7722f109c9bd0b4536cebe1782 SHA512 02866aac271149845cf9882caf582e770bfa59475e0cd253a917555f785e46cce3021ece3022524e21d64a1573e0d39f3ca41a5b87c14b6a0521ea32a4c2fd1d
-MISC metadata.xml 321 BLAKE2B cf582dc1cffc92fb52c01e5bcfb10de03968dc95987f8676a3b50e4adb68e39602df57a462c6d0149690b8b67e23efef66e1c679bc053c2bfbc4f1458341af4e SHA512 aaf81ef88f69bac040cc61485986d8f52c01ffbe0ba499da510f378aed1e778ea3634e73b0e3a1d16bdff5b2538c0ec60ed8dc39ed05ebf7ace29622f3aef403
+MISC metadata.xml 242 BLAKE2B 3917c4e887e59cb27fa14a1ea92192b5a924ce39a4dd39a2cd75d04d7a861f57f7c9e969581a243339ea432f132f6e0963efe9940ad1678b506588317da0ace0 SHA512 03639d79f8e79b78d86d64d217268bfbb6255cfb2d37188a764465686dcae9ffe5e41b01cc746f465a6ba92a3bc2c9d87d56889e00317c96fd759d37b840fae0
diff --git a/sys-apps/pick/files/pick-1.8.0-cflags.patch b/sys-apps/pick/files/pick-1.8.0-cflags.patch
deleted file mode 100644
index 6d7834b5cad9..000000000000
--- a/sys-apps/pick/files/pick-1.8.0-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pick-1.8.0/Makefile.am
-+++ pick-1.8.0/Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign
- 
--AM_CFLAGS=-Wall -Werror -Wextra
-+AM_CFLAGS=-Wall -Wextra
- AM_CPPFLAGS=-D_GNU_SOURCE
- 
- bin_PROGRAMS=pick
diff --git a/sys-apps/pick/metadata.xml b/sys-apps/pick/metadata.xml
index 6eab74ef0029..86010d6fff63 100644
--- a/sys-apps/pick/metadata.xml
+++ b/sys-apps/pick/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mptre/pick</remote-id>
 	</upstream>
diff --git a/sys-apps/pick/pick-2.0.1.ebuild b/sys-apps/pick/pick-2.0.1.ebuild
deleted file mode 100644
index 88c100aa3408..000000000000
--- a/sys-apps/pick/pick-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/calleerlandsson/pick"
-SRC_URI="https://github.com/calleerlandsson/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-cflags.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/pick/pick-2.0.2.ebuild b/sys-apps/pick/pick-2.0.2.ebuild
deleted file mode 100644
index 54ee90179479..000000000000
--- a/sys-apps/pick/pick-2.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/mptre/pick"
-SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/qcontrol/Manifest b/sys-apps/qcontrol/Manifest
index eb9c4170ec08..d95b884b714e 100644
--- a/sys-apps/qcontrol/Manifest
+++ b/sys-apps/qcontrol/Manifest
@@ -3,5 +3,5 @@ AUX conf.d 133 BLAKE2B 4d77e38035348a26a1dc576cdc681ef41e10104730158e4c3f58ea40b
 AUX init.d 2211 BLAKE2B 5656083b4689db24bfa77b07704316123a4690e8160d355b42d6bdc359a9ace495ae52b72199e31573307b400ec6e9bea02cfd5e9e136a5faa7b3d94591b3a8c SHA512 66c6c4f30e93f759ca7a9875e23ed82843d9cc728c14c7bc7fffee3fbbafefa57244155649986c547264f500a21d0099efd1195d1810b47370c8f77ed79e4dde
 DIST qcontrol_0.4.2-6.diff.gz 11426 BLAKE2B 5f4374d2a6a2f79ca357827437d7ec42c6122b8f3ba008bb8c39adaf80a2edff24ed4f0abb29780ad70cac09eb1d39124d3d9762d603c896c8857ad7b8e7910e SHA512 ce450d04c72052c8e7ce0bf26d21d9942d3ea02b958b510efdf26d368ee69778eaf61bec2084c4d21cc1a5d281d1331e40b7bcaf388b4b59174a37ed037dd984
 DIST qcontrol_0.4.2.orig.tar.gz 18344 BLAKE2B c90d3d31ffd624bad11e70a2c700e0e058c9fa6cc2cfa6bb803471df67d07d03a88ae134d5543dbbefe30b5870089a29151614a545dc171de5eb4732d6592461 SHA512 f132faff54833f11ae79622dc8e33b4e0f2516f7377633ff47a4ebe71335503c5e4892723c049b00888622ce059026cd97c6856b425b94163ec09887bd21e81e
-EBUILD qcontrol-0.4.2-r1.ebuild 1370 BLAKE2B 5cc8eb0a71190f95679c6e401ca01b8feb9775a07acacbc99ca5929874db34f5cfd5d1ca3d9bf4286f07467f4bf083752b1158e5974d80f73ad3f453c6e21544 SHA512 e7ccccff4cf7e0189cf2c24b15b00c3bd7415648d64516cc3afb2c25fdf58bb0166cdbf0ff75454b12c04487675b1543413281920a085711f375cb04c3ee1643
+EBUILD qcontrol-0.4.2-r1.ebuild 1372 BLAKE2B cf9409c225433f6ff62a0c2ab82c5c72de9c512ef09e7daff408c1eedc365bb83d87e130a2be853f019efcf416c3d08bb1ea07fbf9fc64d7a81035686c4d3053 SHA512 e1f8f0da5f99d39af2919248e99556916655040dc59295db14e270c63714f355f58ed4d8e655251f7cd6b225adfd2802b48cd609ee62f1eb7a0e6c164141ddfb
 MISC metadata.xml 367 BLAKE2B 8a20a869201a1a69097488f15283baa6eaff5e80667974605e34470d0fbeef210efce302a5feb1b30075273c468b96cf197125d7f7dcdef93faff7b35fb34664 SHA512 ee0131a33df4a79331dfe2a7485d71b05f8f386d3b6ce0b26ab76a7c9f8d9b20efb931fda54d499feb9dd6c3feba34299cf8943fbac2ffea2076e634d49087de
diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
index 9330b5503f8e..3dfb69bbc9a2 100644
--- a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
+++ b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="arm"
 IUSE=""
 
-DEPEND=">=dev-lang/lua-5.1"
+DEPEND=">=dev-lang/lua-5.1:="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index bf793b05282f..283e916e5ef0 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,118 +1,73 @@
-DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST aho-corasick-0.7.4.crate 55480 BLAKE2B 61f8913da203106380d20f8ae4eab2bce453557ae5745522ec1647deb04c0173f96279aa64e3ebf4f8bcdb6f34a31a0f37345e4a4b7baad750971088b301760a SHA512 06863d85a3183c7ace014d6a8345d47147df53475c194030607314b80e00890625ae88e3e669d15e54704f2d3132dd6bf56dc057b87dab7f06c5deaf50d29b79
-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.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST base64-0.9.2.crate 37967 BLAKE2B 91c72280ade562664619aee3130ebf0c51db4b593ed08858757649cdc3abb2c04c4352cfef90bab7f40c3398d7be4d343da334ffcd41fcbe607e463590dc12eb SHA512 d7c859ebddf17171daa2ef803a7cfd12871fa95cba47ebb24fa7491bf63fd33a593d98b3045149cc23f310c13292d703b045834431a0acf2cfcf4952127b8402
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST bstr-0.1.2.crate 330601 BLAKE2B b477c2c7ff5a13dc1daa5d9ea3e6d9ba9e844cf2e055bfbfdee99d3310dcf9d12fcae36aa7b29601ca965d5ffb81d0d0a640c2f0e40f2edd33748bbb2f5eadf4 SHA512 93e57b17e06c9f67179e31338a7fd8f69ad7e807955d8483ac781208edf59339e89b8e11223d79b2b640a1679d61e2d4c7ca15ca6fab602b97b8558757f2899b
 DIST bstr-0.2.6.crate 336014 BLAKE2B cfb2eb6ecff2e0e18f26b05fc284cfb9db31f022984243b9d8fbb25d03371588a829a73cd312f0e54daae1f49216fcbd0193385ba7183a73b992a94b619a07b8 SHA512 e5a4dd8061208bd153052fc991d827e96f5d3358ffde84c68d4fcee4ef5ec65de4482795f4d4fcdd5b2b4cea4b69a7e35e369f09a476ab536ecec54aa8d051d4
-DIST bytecount-0.3.2.crate 11026 BLAKE2B 2a2a556e2cdead9c70ce1c69cc5c4a0cb3c11d34a078720d3847ffa8be54d34df9f8986a780331f5c80f71c998e12491b94795d3d3f59f9da949a6d9e7f301a0 SHA512 fa3453f220112f83280dd3a123b25cf3ec07d2487c89cb80dc383f12e9f4d759e316d1eb05bcb0633186dc3f26d2ed58d979ba4ca86404a7f6edc4c174ae0edc
 DIST bytecount-0.5.1.crate 11888 BLAKE2B e7e72cd64f12315f6883c013ae4d309948cf6a577d653238742332d166d8072d30967b134a59fe22f14104e1764db3e9ff855a7e85511fca71b6e40eb120802d SHA512 9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9
-DIST byteorder-1.2.6.crate 19985 BLAKE2B 717b3c7a497fc1624a32c38a2f1a5ab48ac76ab996e2b7170c9a295002a64da05538489d7e497d88ae13b66c2d4911daff8840232d4201cef3d26f4e30cdc820 SHA512 7106b5404a213b080a231c4bcc3010caa2f2743a0d0b64553e0c789ad849970ce1fb547b330711d03374cba5a7ff56b728f5259d0c6fe7ac00c8c13324503dce
 DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
-DIST cc-1.0.24.crate 43132 BLAKE2B 16e2a57abbb94642dfd98e829f3179c6b44183a491c67025d288b1daad9e90d290b1a1789159bbf97fcf573c605f9b70a072f78a2bd5ea6cc136a9885e1b9e83 SHA512 97bb515c57448dfa67c57ab69402893181ad5324ec870efe49b8185facdcd536bff3550f4db7deb79a5b397e387a8f734d4cabcdac2661dc020c82ea993f42c9
 DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
 DIST cc-1.0.38.crate 45503 BLAKE2B 19d8be59f639c200e43021eda8174dd2b6714d6a8756e1a87d01dc5d3876d11ceccdb5874cc0d2f94da3bba1b576f31409f660dd120a1ecdfe63adc6bff72dac SHA512 0d08ddd3f30c52eaca8195f9cd473ce3fdde6c6788481a33a8970c842781ce1eeb521023291f75d7c03279f524e8739abf3cc66f51ebf6e68945626589f37d30
-DIST cfg-if-0.1.5.crate 7363 BLAKE2B ca668ccdb4cf082d2b874976e6ac38e85e2618430cbb5123f9359e328e38b61e59a492116bd6a9f8ed986796095a763d148291378d32ac3a9e7d501c5ac967fb SHA512 48ab0bb1fe89d6e388ac4bf851b9aaed6479f9ca7da62945e2ebe58800b5201897feaf6aabd2b028110b0205b33d5abca7f02826ab3c688647b944e7140e6d94
 DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST crossbeam-channel-0.2.4.crate 59889 BLAKE2B 0876078d5506060fc25b757e89c778ef4bfe2537eaf9412f2c7e0ae2b4197581607e2126c4a94af5d5a39aab287d232889bf19c041344bda0f0accdb453bd61f SHA512 d753fc9114e2dc0f7b2e3a4048457a859034f80f6be245f46771933e9352685b20b256ce389223d9426e50ec600c681a819b9cc7701bb888b98f3d2bf18b630b
 DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
 DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
-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 crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST encoding_rs-0.8.17.crate 1401378 BLAKE2B 95c7e545bdc14ba2870432e0c884f14cf56a43d3c5d9c063cbd1dcd9d18e70ddba5632bb1cdf42cef846eb86a901943c50af246b32fba478d2b60a9a44f2642f SHA512 db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453
-DIST encoding_rs-0.8.6.crate 1242813 BLAKE2B 8208d1d69b926688ce7702942306269dbb7966b4efe51494a0dba54ec00dbca0b78f5fafb7d60aa83733b2ad69635507269e4f654924dacc14675dc73c65a7ba SHA512 e3bca118c94d947eb0e94ca73affa75092821623e5e32204df8093c181c4f5df58ff9ee54fbbfa5c5215fdf3bfe97f5dcd83dbf289abd86e65e0c0199c812456
-DIST encoding_rs_io-0.1.2.crate 15356 BLAKE2B 4cb62c8816f99771452971537dc0d80573d3b79f0193461a424aa490f3fc7d6de54237766c153b1f9075afdfbabbb56ef8939d05502a39fd4114b48e8472ed09 SHA512 ba955cfd1e571afab630db77e44fe9ff3c20866686d94be750c15b0d99909b0863deda81704326ae831897e169361ccda7ac831e0d44e8e62f70519b2089e82d
 DIST encoding_rs_io-0.1.6.crate 16392 BLAKE2B cc3be4956c2bd26ae063757e815c9360f382a358ddec640361267b6abcd882129e924f59601e30eebf2b1e2e2025ece727de06ce11c8fb1907de35452705a8a5 SHA512 ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-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 getrandom-0.1.7.crate 21488 BLAKE2B 70bc3a4a4b4c624f5df8dd73954de3b77feb897406b7907f88357f6b4aec919fa72560e219933e744f909f3408478dd93f59cb28d53f7d608b7b6edc3204ad90 SHA512 e38e82ef3d3613e69e2ac38c63a16e6a4f0a7d54f8b894c45e1c9cb2b1d4f8d9a7bbf087c3561d5482fe45ecd51f3d4b2fdc61638df2c380e3c9c3d8fcc03eb3
-DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
 DIST globset-0.4.3.crate 22348 BLAKE2B 1ebe2fa2a8f730526cfabf23d3fff8390bf6152d039eab03afaf98557de13da50b84e291820ad13e0efbce01c4b0389748329c63c3e2b6d5d804315b8d514d47 SHA512 255ffa4234c7014fc1de961fabb2a8b8f3285d72f84ac03d89f613467594767ef424b84bccaa4c68ae289ae603de189ddd4c44b0d156680aed1252ef961f748c
-DIST grep-0.2.2.crate 3959 BLAKE2B 89778ec58270bce7dee7ba04e395f5522a3b7c31b602cde3f3fcae2af4a062353bd70de34fedc87e7a13e2607b4e8ddb40515626a465f039dbd4e82f5fa855a1 SHA512 de4bc3931921884c06cf53bcca6e0fa9b08c703bc9eea5446fc7b2bdddd7ba444feda545f48f323f6f60a6e2a11edeffe511e4b8afe020ed16eec1d1b3efd35f
 DIST grep-0.2.4.crate 3890 BLAKE2B d1d8ab33a8914e7ebd302ced46e24a79f3d1527ad8f549542dba1f45280c030ca493a0d242923545b6349493660bccaa14934bc820d05d3e823f3190bbac6a0c SHA512 c6983df9dcc268bc9835173189afc28ffec9dd234a0949389a40629e5644707b7c1b90025882c2580cc5f963fc4902070b191ecc6cacd602fa4c140ee8bdfbd1
-DIST grep-cli-0.1.1.crate 17335 BLAKE2B edb24fbdf4ffc6abb84359632419418e28cdf408e9be3f13a708c1fd9dbc710bc9e644d4603c7c872abd3fb4ad563a3d363e0f7a792fbe14514b2e0ccee0463a SHA512 c9f4ccde63e16cfe190786ccae82b4986fecd2d5c1f1c507ecf796d0f8511b79349e0482170bbd92f5865e7cd13655a708fa3b448259e38d8dc5fa215ba1a09c
 DIST grep-cli-0.1.2.crate 17012 BLAKE2B cd86ae2c715030c8a6e0188a6c408dc3e7a7fafa66c6dfd12c7073d4253d113f7a1bbd24066efe6cfb13aca21a9d302240c80dade186b6e61db19e52a472502e SHA512 1dcfd004cdddd02f4e77e96ca1d75009fb088b3b163c08a484b89d234e5262e655139f5f02c4471f9585e9655423eb7650f68c8ec7f6c316bf63b2e243bd3213
-DIST grep-matcher-0.1.1.crate 15577 BLAKE2B 60c4f3714e742008b16fb447536330442af1d613ea9a2f13dc0883beb7b6e2ad2589c2ddf956bed3d9c4d430fe7c26e914ed3e9b70ef0748ac48247c4c481958 SHA512 42e7966113c722646ed1c6bb4e7f9d00cb6c4ea2ee6f00543591c1765a028b7ea5ca4073f91a9148f2b0b6d963532119326a153ef75bd503954f6601a77acaf9
 DIST grep-matcher-0.1.2.crate 15521 BLAKE2B d68795e2369b621a9aa4dc0fd70c1ef2ce5cc19b83038f58173ce1fdd8b9459738da38877a7490e2bf150271297ff30d78ea34145ccf02691c54b538e122b03e SHA512 d948460d67f90a6cf289f2d704a3dab05f8005bcc24eb89266b03fc2b2c35f6aa81d73412302de8f48afc2562c8bbf3d0e5b94070bad2ebcc933b4eee8a91e3b
-DIST grep-pcre2-0.1.1.crate 7439 BLAKE2B 8aef9325cb006f08f421851a12f7ecb3f8fec34925c5a41c4fc6b20a5404299c030ed0bef8e22b59ed63fd0052d36e7ac7aa49cc6cc6b807f56e66f1262f485c SHA512 077e8241912ac865ff94659db7e111ee1093d77e013ba77555187c834c1cf246b7c3e353ec24c5900fd625d6f84eccc5d79ea8c6a70c91b55d09b5a95a694bbe
 DIST grep-pcre2-0.1.3.crate 7804 BLAKE2B 4dc462f9b527d6a0c6f3a0fd3ef396ddadea5e5ed87cbafc5d3169227e8d4dae3b48c955207d47633a3384e011868d0b97a1acb90bd6c1ac200f0e7e34c9afaa SHA512 49777885abbf028ac7845d76faf4d1f566d7551e71cdd9788bcc237f110d1f77fb438c42e965ec0b3b2943022acf0fd1b28f7b6e5ed3bf20525476eb9e9aa749
-DIST grep-printer-0.1.1.crate 41441 BLAKE2B a5c244f142eb43796340f1038e7dde253edea28894833e0601c18b6c1e841ffcb358b9465b823b93ec61c64ff690fb9e16e298e3e6e74300cfee90ea1c9d9343 SHA512 579b57bae2b0583b32658855960f974587ad462961d0853ae42c00bc53121892c3870bb475eb02707dc24a3d716cef6be941b5147b35e188f277c0d3898705ef
 DIST grep-printer-0.1.2.crate 43391 BLAKE2B d4690c3fdc0e5b518d2c4961dee160b939b9bef4be702555f9ecbbf8af5a68f62bf2e2b33f5e450e96f92cb0a93a3842adb9833ba89a141fe22c672e14df9e31 SHA512 a430f24e97e44c56c3faac2e49acb9ad96263614042f007252af944580726c38931f7fa272d0bc26d6d8b99bf47f9d55c3c3014210360f10290c16a6ee151a59
-DIST grep-regex-0.1.1.crate 22683 BLAKE2B 59c40a1d1d0da56dc282ab93273d8722bc665598135be34048f8d51ecfb080a796ecf087329f987bb7e4ed892f8d3b6b1fbe0ccddfdd581c773072a20c2e0d0f SHA512 281585dca0d8e42778bda7a23780ddef38d31145c36e3ea831b1edb98be66c87bba553303fb973af1211aef21d1deb11d2f9466947fb0622b2d1bf180af01a1f
 DIST grep-regex-0.1.3.crate 26614 BLAKE2B 01976b0626b596516090cf1397a2ae3752fbd609efb4568fad6e6f61f1a0b0bbcf73cb213106a33ec4c4c6c3ded126fe5ea042460e34eeb9293e6e96adec2814 SHA512 9d84fbbd703653a671340d1ba812331841d1c446f00170bfbe7df7775b9eb398693dea19c55db4a7d0f69de226d7ab73866519a81dfaebb65867a6597891f4d4
-DIST grep-searcher-0.1.1.crate 42673 BLAKE2B 7ae6e9df98061331c5a6e3d37febee36a4fe26fcca22ea65f4accd0bb2cdf07d9eac98b88f3d8645e193b3499ea556c182d0a62573009a4cc9aa2a6dbeae4e86 SHA512 523c8f994e01f34c403601795e6fedcc515e89f1f0188d2ced03f21c9abbe2aa61009705e393713b032a6346583f5ef79c722de6c58bca03f88f2ee283b3518c
 DIST grep-searcher-0.1.4.crate 42589 BLAKE2B 757398a8288e18ae67d7cb7d6f00f85b10fdf6992c055b2bfdbc4122c6d0962376eb29b1a4a8ca18dbe4b0b88e0f7bd2d2bb2695958394ec9efc077205ba8a22 SHA512 de61c95e66ec221005168bf0e855b800bccdef92c1c11153586d4577b286851534050b6976b14d45e3bcb12121085a5a1c4f71a057a3ed22a96b1de343609712
-DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
 DIST ignore-0.4.7.crate 46444 BLAKE2B 7809a535bc38a8e575fa5775545f913803442d21881a3db15ad82cc399b580942b93e8ac45c485fe4ca44b369eb57fa3f6150755338b58a721b6dcecb82ea594 SHA512 8db0fcaa966e81b4407700131f3b609165aa3db4fa046410a56f7e4f5a571f5f0bde399b022610f3967f0a640a1da5e268580b6d0e59b6f1be60687f0d3e9685
-DIST itoa-0.4.2.crate 10581 BLAKE2B 4ef219ac121ff82d0bcb9fbf7a0d44cb268b40564ba656d88ff52217061f33935172e23a76c5e7ee6c0531b4b0fcd551001ab951c0def39ff52350e0681c1b1c SHA512 d7201f9bb44f5dce15a90dedfbe6b722aadecf15c3defe1eb1fcb5f8fe64300a594c9acef4f14538129a787044374c71d69e69dbef76d1bb780309fe7d55a796
 DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
-DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
-DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
 DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
 DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
-DIST lock_api-0.1.3.crate 12167 BLAKE2B d01453c4232ccbab72706f4932af598cf6d6d15482c065f7e900f0246973a130d2db1d01779585a6b99ab9a36e074a787ee49d99947bebc2079201b380f985e0 SHA512 5c088cdc3a5321ac9e9f488acca11c554be5d91b2de0e48171d2ecba15d7e5960ee0a8ed82fef15377ddf17646ca350d9749b2579d5ec74cdb66ffd327e61c5f
-DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST memchr-2.0.2.crate 10092 BLAKE2B aa90acad8c25a67ceecaa5bef086cae873cc71336efa38dcc71e770808c2288538b88b0f561f405fcbe7e829dbf2dc86392bc975eedee8dba7645af64d2dfbcf SHA512 92dfcb5a60077e0906d17c76a5eb3203cbdeb066cda40a2c8eb2acaaec366ce45bf1bc57876ca7d0794be2aee639f296ccaf5c54a7e941875f3a78f0126ae9c0
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
-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.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
-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 packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
-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-0.2.0.crate 19322 BLAKE2B f5c8980788bb34c4874ec301df2a408fa144c4249583e59fafc5ea509834f9dd80bc6abc7f6a65ba9e480f2d9874686d710ba2bcf8053e75434ee6f7061e66fe SHA512 c8d6aa4e357c9b5cc7e8d527a0d0a605378f975f41fe0a5f4996175be1f620e8446bc7e6135927b50bf3687618671ca85bb2a67314b78989818efe30d25d3521
 DIST pcre2-0.2.1.crate 19394 BLAKE2B 49444b1cdae33b96bdb8bd40c94a7e57edfff0f733683ed7202d764df59952de4c3c70231caac87b6be63ad739dc615389486ee0ddfbe36c432dd3115a1fed1e SHA512 6e9a0d60c8bc633d4f19fbbb3934f86bd95e34dcfec8aad55dae5ebe4ed854dcb42ad265f4b0ed5c1a8683a032268bb38b2c3899d25428311cebf97789c62d0a
-DIST pcre2-sys-0.1.1.crate 2136686 BLAKE2B 78da08ef356b59e225696db956231cc1b04385c43aa0fff459e93872ca18714a2c07bf51cd2df28f3c446eda674c05a0f12cf91ce21aebf21031459b5f18da04 SHA512 7c859e0e7c7e62df1ddbef7d6a7f3938905aaaa2e6de6cbdc957c8fcdf5b5f3b3fb4a30ead84326d9ad13fa9581c0b8729d735678aa649b242d8e57055472adf
 DIST pcre2-sys-0.2.0.crate 2184217 BLAKE2B 1a82654b070e15563a1977097f30df0badd233844a7e0654117ceb9e6172f4ce1a50c057f6e6cc018729361ad64945ca648b5e19a0ac8f39215d64454cd8adf7 SHA512 23255712188fd517ca9cd0760c6da649006916b6e3b3295bc6078942706d622504da1b2b9c1199cd30208cc48aca08667b23941a357e4ac0f5fd20a1be3daeac
 DIST pcre2-sys-0.2.2.crate 2184376 BLAKE2B 7247cfd843a74de8f2486d9e029afdf3eddfae6307983f14ab0d9c48ec487c3eeb710ae0485eab10b5ef200f8e3d8743ac9f151a5f8e07cdf3c67651e73fb1d9 SHA512 cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785bf8adf9b3fa20e5bedebb958f950da7b69e69b0e135f46379ba370f51a2bb951d5959553f878ff6f5c4505d5e79 SHA512 645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
-DIST proc-macro2-0.4.18.crate 29919 BLAKE2B a8fc28a2b8d7fd6c3ea457d2877cc6707fec579766a37dc310039d66fd690c5c90412cc12857a816dcf2dfb6a7fa4086485525e0167e66869139a72a2df7602a SHA512 f6f9c715af1f39ed83aea15a8689e99e523c2b781d2f35c7ac15ef97a38220ce02e7ac1075a85e4bef53ffa682224cc0093aa9b94a664d2a944e6a3309550870
 DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
-DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rand_core-0.5.0.crate 19736 BLAKE2B cd0b6212ef01e703510ff0131c9745bf5da4f55d96e321f943527a39e57c8403d1b37bc790f6a09addaa85947f0c431a3001ff14beebe67193c5628d4270f393 SHA512 e98f9b93cf5a80c40c11e7e8faee351ef567ae7cf9db1b7789a61eea41d6509e83684da00284e6e3d0f52af08ce2a834339e652f1fd39d818a2827f6236f5d6a
@@ -124,81 +79,53 @@ DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d79
 DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
 DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-1.2.0.crate 245604 BLAKE2B 68951a1e686a4e7c1ba059e8d4c68bc44f59cf824d416d9430ca226c9bd52de42568a4ba041733a6f508711a94bf6f17fcf052683c2744885c98ca1c672ec0da SHA512 ed4317e4b91b91b4807daa56d8070a5cba5f99ecbaa23b78b92438d19415f38dc1befb11e8b5ade63cd1b392fb83778350583cf531c374303c6f3405e6b4784d
 DIST regex-automata-0.1.6.crate 92110 BLAKE2B c0ac8d3979c72be3c261a3e26c41fd04a4fa0c4e974a1cb4fac1857e74926b6f14734f14f65d43833b2f364c65de19504d6f9814213b81bd0f91fd41c49d5f50 SHA512 2e438167ef10459cb1f7ab7afe0297e3a93e34b8195d631206c804b4fc5498e03df243531df282928fb2b3bc4ab8dd0a15a101f9aa368c104fc24df190e85f14
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
 DIST regex-syntax-0.6.10.crate 276985 BLAKE2B 6cf614eff1c3db35fb60f206c927cbd8caf4ec4942089c9356414b0239f3fa060859cfcf48e18184ad8f3a0aeac71193ba0878f3179653fa626dcb3d40de5206 SHA512 30b5cc9887210c5594d57be7f05e25475b56732c9a0be02452aacf80b456f12450b63f4acbb67badb3ad16f22d244431f5bcf5ee30b9ce8f35dcdeddf3972175
-DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
 DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST ripgrep-0.10.0.crate 212925 BLAKE2B 389e7b488685cdc39f36f9884a6ac94fdb86dbf73f2e7c13202c5b893fc37327aa6ba6e5c7b9c08e0b00c644d35410cac5af51640770d0cf1869fead67833780 SHA512 d96c12be497999d0db777ca5fd33f907ed01cba121e3fb43a7a6a5f3176291f04b7bcd6e26f04f98b305cf50ac422a77a10d6a34c3a7510d233fa76228784576
 DIST ripgrep-11.0.1.crate 236512 BLAKE2B dc6033e5acd8bafce9cccd7cda5fda4fe4e84aaf672d6a78873d522bba50d006b22d246d0f1c6742ebdc21a5a000fd556324c1fa956ab61691005aad34cd4269 SHA512 91a06a11e94cfd595ac1cc5ed6db481cff8b319de4fb09d1d29e800b60f75a4e696df75f97e0e29d53d7d68fc3fd7cebc5ae16b1329214fb1383d454fb2b0864
 DIST ripgrep-11.0.2.tar.gz 461565 BLAKE2B 5a9bcb423c470e99cd9e9299fcb9f2cb2f663ad1e3b406f1abc6671e68d876e8cda1866983d96fc498498e796c1f3af16838799741ce87b0d5b400e440ca741c SHA512 62b5bcceac2ca4899e797799e67a8e45730f1bcb5115b48e9ebfe12d3b0e43921020f368e4328b0f5060ccdf0dedb8935857ece7126e05d9cbcca535cee68a92
-DIST ryu-0.2.6.crate 39911 BLAKE2B 3dda01a1da474c106d36f63dbc762f5b7eb37e5b0c545bcc4cc992ebabaf02e0649cbbb27f81971cd4c27cc51453f4981eac869768a0cdb31ece3a68a6f8976d SHA512 fa7596d53f3a16673df016aa75a4cc7a637456db595daeb9e4a0a393c7ab7d18b669bcd2886f65a4421897c0261ac57ff85d9c452772e172a4bb6c11b61a8f1f
 DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
-DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
-DIST same-file-1.0.3.crate 8995 BLAKE2B c2df54cdcbcaa3645bb17f3c78bf8f48711534c108d7439b791976224e126911b497049b720186fb5d97bb2207ca1407ed2c2a4f54014afe79ea77ab0c9a7715 SHA512 eba49f77a94d3f46cf063545f31050dcf67216ab7c723381dd75ec25aea22de217c2919ade87970922750bb53a5a6bc2ebed6fd68ecbfcce97cb987e69582402
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
-DIST serde-1.0.77.crate 72861 BLAKE2B a7eade5b92fd525c281ca664ce7cc8c0053ccfcb1ed84dbd6fae6578ad38af269cd8851f50b65a13f18c880a49726b8012d4af9eb54af9d19de2bb35d23d025c SHA512 0849ba48765586b0df9b49a6077cf05dc72ae15938dab8bc748e4488b64663caf7b3e8ae9540ea106fcf259278fda615ddb78fceaa7b9eccba1e71283d3cd8eb
 DIST serde-1.0.90.crate 71415 BLAKE2B 7793a7d5227ecfa4645c9ce6cd22e0d9c76b216012bc4028e4f940938e1e4921c337cdd27deaa3ccb54df9fe57bee7ffc35f2c2d69c98a6b8e0964d7831af60f SHA512 6ad37dc002a7b8db9e38590f70a9dc26a93a82a1f6d9414fc2a45dd2f57b974a947c1a4c350c970f69199de08d5a94cb6ba5b53c0cc7efa817e3442957638a5d
 DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
-DIST serde_derive-1.0.77.crate 46352 BLAKE2B 0eefd0947bac23c9de1660784b87bd8b58b73583556ef97dbb70622c63a24467555bcb5c5d6ee3bdbe2cebe02c8a85a5271483713bd91c9fdbe24893ad6b52c0 SHA512 6bb9fffcefc2087a1d70192ffef6f941984163b2c00cafd2f2896340fdea0e763b2ff2799af172bdd2bfc3e7dd49b2dc4a2c6ea582140e8f4cab88b63a0a624a
 DIST serde_derive-1.0.90.crate 48815 BLAKE2B f662383f4fe4cd5fd46f763bcd3228eb54ec681231e6749ffe9c3710e3ebc49687eb25435cf9b976322df2cc478d4c9febe1d1d770aa4f11c4102745f52162bf SHA512 50ecd5c54dda7708959a2163e365cff09489489893d421e5dda09bca8a6f824b42722af1eff76fcc93f8b9f507db33019f7eb743301025b3504e19ab3d64d015
 DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
-DIST serde_json-1.0.27.crate 65402 BLAKE2B 9b2a4723b49f80a3757b66ccc4e293100bde9c403ad2cac7b2b8976dcc6882c6b72c340207cb9f039af06984b619d844bb930cfd474d987497f6eac49fe2302b SHA512 36c19e4b3e7f0969fa13571b6a6334e3176eac204f74f91bb0345f7069f2e850dfbad86a17d36bade38eabac35cbe201f0f78481c77cdc34c0928202e8d0ff8f
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
-DIST simd-0.2.2.crate 37477 BLAKE2B 647b2bc68400f7a1dd126c1954254dca7914d7790a9a47c1685ffb59a42da13de0dc9736556671b844c556f8b6634d24558b30c33500fd518b60c733c13d1a21 SHA512 d4641898dabad23421575024d5240bfa1f6781c57953bc20ab22810ddb9dd015a48a3847ea307a0fe0e66f4099e4f2c7c95608c3813d391489c4745f50fbade1
-DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31
 DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
-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 strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-0.15.1.crate 142480 BLAKE2B bc0e334ff8e00003ff5d57faf0c1463f7677e1fa3199748295d932390b0167da21a368e5622cbf5b0a3c8910ee7eba37be1361922ea15e13f4d50163c49df3a7 SHA512 631cfa34619e514a976089924157ffc0100a9affc1ff8c41c2f867bf35749c129d68b67d78b3e0b3b131aef87c09537adf11408d06bce6bf14b01367441a0b58
 DIST syn-0.15.31.crate 146353 BLAKE2B 32501ffec548b675d405b24db7eeb53b04ccab9e58179aedd005094d13b42beadf831bf17d7e455cd6a9c7caf6c0df7ca8c345fb6b1a443c82a72b08314e4b24 SHA512 3c9ded90ae93d4634ddd10d51eaf08d89c5c0b1df67a8425299d9ff61ab09f40f7b0a9f222aedb276b231efd6f3c55776390c0d230fdcaa492167dc056c04ca7
 DIST syn-0.15.42.crate 185561 BLAKE2B 1c9bdd974393f020b6c56d78608349e52be836ca3a0f34f68a9c24107eafae02a32e998ceb5aa710be5f2b7101df71efba0bc9baaac36bc5c3ff156db5f879d4 SHA512 b2feecfb9d05e2d2a184d92ae78f873147e4950641dfc9300988d6974a85a63690c41bf22ecede2a2ac8e45ffe41b13011e5eaa82be5ce6037b40b9b247bd989
-DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.0.7.crate 23922 BLAKE2B ea7207d7a5c893751fedca320dc0b08c01de041eed2baf39c1e63f744b55ba3a823890d60fff504c1018950ff9e564eb17cc086f7c519279293570ef2e470751 SHA512 b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST termcolor-1.0.3.crate 14410 BLAKE2B 9870d48e19ebae86c90ed192bb5836803af952c9d24ebc509f62dd91202af10eca1fd7a8ec06a978fda0eb718eefdc398d70c07f3eeea36752d43b69a9c679be SHA512 403a0027b5e858a5b283a5b1f44dbb04207ea080ed9a4eb521f0f16e07292a29ccbd172d062b50bb2e41f03e4779d0d87ef21cd4c97a38b4795bb7b320224acd
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
 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.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 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 ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST ucd-util-0.1.5.crate 26284 BLAKE2B 229c82089b0b070a812df63122e1413d59662c24e02c81a4b4d2c6a71eadf7f09505ff47376f9aafab3abb47eea1c7d28be9eb9377338a63839a3285a0468cd0 SHA512 14de9b370a49fe6fcce871e223daa257ca5e50e3d8cdfa3c6800db89ec4a0e6bac55e2b73990768fbc2a13a16d77c8b59015c4c4fe413735e7c893ac3651f5b3
 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.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8-ranges-1.0.3.crate 8496 BLAKE2B 835ab4083ad965c8b17a1571a1629802b9f081a2c7a0fb1fdd55a2734b36c3e2397f7da708d8d8d81c10761a624d95acefb44d423ec7fee672da2c17ea1c015b SHA512 24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8
-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.2.5.crate 23985 BLAKE2B 9113b88c4742548040adaa9aae651599f1f3cfc41acb9d50cfbb5b32b379273f14786867d9dca0bf1be5c482379c3a60df6efe3e5521a2df327d64e34e144706 SHA512 2645ce9a0e665d0badf039df14da565e6f904e1b5443b4c60e97b05194e2c2798d8084a45bbd7edda56d58f2b37bbd8124656125338784f379e06fe39d38128b
 DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
-DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 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-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD ripgrep-0.10.0-r1.ebuild 2659 BLAKE2B 475772332840ff5192a16b30d1df0859f01e83d9b5e14d6883c03f11d49d84950b0d8956df9cfcd2ec75709abbda60e7555d37260fbe70194cbc28233a76faba SHA512 8f2a4a0ce6bc329e5ea1eb7a8746b5eb001e9245a9ae593db141a06e00e08dfd47876b88e1069c2ee8e1321fbfac7cfe2a7f12d24d29f05eee022389252bbcd1
 EBUILD ripgrep-11.0.1.ebuild 2593 BLAKE2B 405a168e0cb93f49863d8aee2a3649daaf34ca2ae6657f267fb2281297cab7ecac11449167fc1266f1b1ecf19655e9279623bd48942f043ed5be6e80f265d6e4 SHA512 5656d71145a10bd398b6d942562c7fa0f0c2673188a0720053ced25b0b839676e43e9aaa5fbd441e15dc77ff48e4bdd381457a4fd2325694a8b6317ecbddf67e
 EBUILD ripgrep-11.0.2.ebuild 2399 BLAKE2B 95504e8f68af5d4040cd0819fe14f5c506705ddeab1dcef248dd3dd044afce5974d2dff92cdce478ab349d3b7d9956b73f0d64c301dd25011dd434e7447ca11b SHA512 c890057a24fa0b55173b3148ccffa1efdd28ada81764313bada68b95924649f9d461332bee91ed662e22b5acbff1f2e40205d6fdc173921ec8d796c0a63c42e1
-MISC metadata.xml 837 BLAKE2B c7f5f0c13fdb6d695a24724c84105b873fb2674212896bf2184a9ceef2efe2fe98a17a6f98284eaa0776457ca18729a184eeb22d31214f0f77e30bca99f26352 SHA512 b45056a97c83bd9ddd5d49f94d5f5b1d3c00c53fe14263be8eff908b14a5635f9ff5151344ac7d8b656d9c62937b0d63f3a3a228ad3256da14fc7bae8981a934
+MISC metadata.xml 730 BLAKE2B 0355062074dfce2208602756187dad5d57f281271fb156c7cabceba38b3097b21b9ca46c713c7aac661249676de4e79fef92c9111c58e4dec70f0f9ae8618ee0 SHA512 683936fa04bc52eed49d0c8c64b15d22cc2583abff4d4549abd6b9156e33a0a80a5088802e5b321c40debd30ea70e1f93877f8caaedb164ae6c8a703fe961460
diff --git a/sys-apps/ripgrep/metadata.xml b/sys-apps/ripgrep/metadata.xml
index fe6ddd961327..e4eeb0a8f7c6 100644
--- a/sys-apps/ripgrep/metadata.xml
+++ b/sys-apps/ripgrep/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
diff --git a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
deleted file mode 100644
index a1e87e3b628b..000000000000
--- a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~arm64 ~ppc64 ~x86"
-IUSE="+man pcre"
-
-RDEPEND="pcre? ( dev-libs/libpcre2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=virtual/rust-1.20
-	man? ( app-text/asciidoc )"
-
-QA_FLAGS_IGNORED="usr/bin/rg"
-
-src_compile() {
-	cargo_src_compile $(usex pcre "--features pcre2" "")
-}
-
-src_install() {
-	cargo_src_install --path=. $(usex pcre "--features pcre2" "")
-
-	# hack to find/install generated files
-	# stamp file can be present in multiple dirs if we build additional features
-	# so grab fist match only
-	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
-
-	if use man ; then
-	    doman "${BUILD_DIR}"/rg.1
-	fi
-
-	newbashcomp "${BUILD_DIR}"/rg.bash rg
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/rg.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins complete/_rg
-
-	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
-}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index adb3d7ebb420..b02355529046 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -18,6 +18,6 @@ DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd
 EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
-EBUILD rng-tools-6.7-r2.ebuild 2175 BLAKE2B fa366fc1400dcc910e2ba860b782be8bd65aedbb49d332d7d601b42ab943de6bf97d40cfddc82e42051ffe0e463321ba636bf1d7fc6d26e264d8603738ddacfb SHA512 c88ab785faa70b88d38cf52e59298da211f1af45f06f9d831551aa3696f7dc90fd5d240ac642fefcf6b57af383585e736fc521e435d0611d1b0613b573ab29e7
+EBUILD rng-tools-6.7-r2.ebuild 2172 BLAKE2B 0b4a427915180a8aad92816d74470b1f77eb742f1130df682d5743a71eaf871c118f3a48523b05b36632ccf6766c33f8680eacda7000b443c7fc32df460d55ff SHA512 c1954f2eef54a321e7e0321835a62d63beaff4d7c734e9c929532679ff055e51bb5478252c91ca35554d5962f5badae44c390808ae19d301c4c985b6a7cfa057
 EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
index fc7e0779e3f7..e496621e1c70 100644
--- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index c00dd15f2136..2d49d84cee30 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -5,5 +5,6 @@ AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d6
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01
 EBUILD shadow-4.6.ebuild 5363 BLAKE2B 90361141986d5b78eee02f022665073d2af2970949a5406b9aee09b5a7abd7aa8397048596275daa3bba4547380764f2c5ff26d634cbf03f8c387274f016282e SHA512 95c2ab76e365f10cf57277708dca5a5b96b24f1d527cd86d1ab5209f04f51251b3eb123473c77558223ae8c08310af13d2f8fe6e7314f69055933af8a9001074
+EBUILD shadow-4.7-r1.ebuild 5280 BLAKE2B a50d1cbf84e8b5c1bf78ddd209da6d8754256c98cb10bf15af8b2eaf5291796f2ef5970bd5b775930ed164d571a02525e71433ac988e6855cd3355b226300e1d SHA512 1f86e9b1d2a6e2810bd4f9a2f9b8520953b26e9d2732a7ba4e47b81dfd9d99dcf28df19ef5b965803553e3b3e914fe2b3b7233a02fa5f40e080ae5409160cdad
 EBUILD shadow-4.7.ebuild 5345 BLAKE2B 185e09ffdbcc8c14117d79c4a5a6f39d6e1402c71524f73828acaf8feb678ca8cd3b3a5d05178b8e2b98dad16fe90eaaca30fe809e1e68fbd592c3f228dc6813 SHA512 ad37ab6100fce2c3db53f2e8d73f6be77a5afec76cd16b2b74cb2efb7b33b9d7f9af49309efc672df09b334bef4938d18232f9cc61b4b1ceb6215a7fb74dce2f
 MISC metadata.xml 425 BLAKE2B 363f3a5caf1aaf0ddc3852f11191d8c3b9168ea1196ebba22c235942c23411dee2197715a2a52f513323ed845b96c7bc58ce59e5f609449fad5b6e807960ff82 SHA512 23577cff767bb0330e95f0390e3d5b5c2c43096a7103f38a9b91755d443a1f68b6f933d9e5c61feb37926565fb00e00c0b2b2dcef54270d69a77fdd78b143abb
diff --git a/sys-apps/shadow/shadow-4.7-r1.ebuild b/sys-apps/shadow/shadow-4.7-r1.ebuild
new file mode 100644
index 000000000000..c0735c920ae1
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.7-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit +cracklib nls pam selinux skey xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+DEPEND="acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	nls? ( virtual/libintl )
+	xattr? ( sys-apps/attr:0= )"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+)
+
+src_prepare() {
+	default
+	#eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-group-name-max-length
+		--without-tcb
+		--enable-shared=no
+		--enable-static=yes
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with cracklib libcrack)
+		$(use_with pam libpam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_enable nls)
+		$(use_with elibc_glibc nscd)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chpasswd chgpasswd newusers; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chage chsh chfn \
+				 user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fb8820e34945..98ef0fb7ac29 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,6 +5,7 @@ AUX 242-networkd-ipv6-token.patch 6525 BLAKE2B 4bbf64154f96419df91caf03f827f37bf
 AUX 242-rdrand-ryzen.patch 16177 BLAKE2B 7d1d3709098a233ba58727788b77c30025c0497fff9abb1df007e21160da3f93a7e9d14b0eeb7e6855bbe5fa93abfeda118156cbba355fc2976c83debcbb91d4 SHA512 38d00535a118b060accb8ed4e87681bab5e547270ef7e0abcdcf4766367e22761ffc35d0db7c829e86e0ad45f13cf4c761e71cfdfc70c2675056ef217c85618d
 AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
 AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9
+AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
 AUX CVE-2019-15718.patch 1232 BLAKE2B e5be62414a1f9c19c8834e093d166a025fbd5215223845df365c70afb35487bd393bcd5463a046107e384a43976dcbb57e9e0a4013355558982abe8b6baf35de SHA512 45017c2c6ff5b16206e4c2e78c82c231372fd13c965a64908d70c0019a0894f1599a4412df3efc1ad6b799df018c05560fbbc8a24ffb86f793a149d9aec2080f
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
@@ -14,7 +15,7 @@ DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD systemd-242-r6.ebuild 14157 BLAKE2B eebb763acfe83ff486867663b3485605730725b00aa7e802624ba8f04bb64e4c4e269f617ab37b5322cd29d878aa4a604919993a9767ff99be4db325503d0edd SHA512 66804d5aa53ec07c841d0d6f6bf6eeb3e610b90f43e449f84550a67a8ead10bdef34a43df2839710e4f62410c94c72478cbb4b0ab3aa4d184d58628b50f94ad6
 EBUILD systemd-242-r7.ebuild 14195 BLAKE2B 96ca4520a2eaeca5c970adad294080b06c4e928b8369f52f55e7099116864ef76c38edc387c2315654213a98dc502fb7db9d6067c9baa9462ba204d18ea9ab42 SHA512 56bcdb8ecc8cca4e68708f7b17d57592d62ccf43dc4144505251d06f8763d1e9260a1c97547d2b7889119a1e81e890061d5e73786d552c6acd7175d207ca132f
-EBUILD systemd-243-r2.ebuild 14475 BLAKE2B da969d039ee702ad07128892a7d294593e4cb9ebfc2c155e1a45a7d562b293d54a6ceaf105b7bccdb5a9181bba220f5eefb5a31df0267241238ba0ac8c45c110 SHA512 caf293cfef2a8bf74ba0cd04bf97b4ee7b3561c7136164ef517ddb33a64ad840f90fec7c220f0582532ae04425b0e79e29487301b351a8bafd01ef9d96ed244e
+EBUILD systemd-243-r2.ebuild 14508 BLAKE2B aa8246f50f4c6c75965a66df4e1dbe7fafc741256f71cae3b35b91c25186fc5c79415cddcc58430d0d6e2e89ad7ddc41b93e9302f930859ad4e2f87da45d68e7 SHA512 124e41692fb8ac22c92b2d0d64e85e0fa27616853bb20bb67b8c5bf7167f51e796686fd1f6ac4067896717af11a8cec8bc08f8a51e348a6a9730f0ad096f8988
 EBUILD systemd-243.ebuild 14255 BLAKE2B bcdf5056bce2710f3c088dfdb686c001816ad5fae721c06153d0eab50ae610f49b6449f4d6b4cb0abe0546f38f76a169569886b0f2446d3248a6d8f0b4c1216e SHA512 b8459206cc0395c6755ffe74cee27e48913c979204dbb794c659ad7c2cf8005d75ff4dda5984f65341cf04b7370a8a3d83718b8f9dc7c9fc1958203f31338a52
 EBUILD systemd-9999.ebuild 14481 BLAKE2B a01bcb68d3642c895ba67dd0aa2b79b5ee897423c2ecb32ff17a95ab0e5dcbfb0098b27b3e7fa710004b012708c0b79982b9d0bf7a6bb7602e36ef250a297be7 SHA512 4ca46d3ae151b793bc8609289df63701cccb3e608e9254f315af4873b79ad6c7cffbb74dd6e8f7da782f0156ce578059b96b0f359508ef5f28a6f9e5444440c8
 MISC metadata.xml 2144 BLAKE2B f98da35b929799e76331e0f4957f175db15fd8766542058520aeeb1cc762f46c4e3c4d40b1dd21da50a3416807359c383e323e17de175a1439d7faa4bb4be0af SHA512 6e5847187232637a1de5f0d8fad2d6ad0515d537206ea3a7bd2ccd9f17e67789f5c80ebf295554aa135325f2e4260217de6e9a6a7f21dd70945a94ebfc3bf0de
diff --git a/sys-apps/systemd/files/243-seccomp.patch b/sys-apps/systemd/files/243-seccomp.patch
new file mode 100644
index 000000000000..88b129f77223
--- /dev/null
+++ b/sys-apps/systemd/files/243-seccomp.patch
@@ -0,0 +1,145 @@
+From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 14 Nov 2019 17:51:30 +0100
+Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's
+ __NR_xyz namespace invasion
+
+A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the
+same conditioning for all cases of our __NR_xyz use.
+
+Fixes: #14031
+---
+ src/basic/missing_syscall.h | 10 +++++-----
+ src/test/test-seccomp.c     | 19 ++++++++++---------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
+index 6d9b12544d..1255d8b197 100644
+--- a/src/basic/missing_syscall.h
++++ b/src/basic/missing_syscall.h
+@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c
+ 
+ #if !HAVE_KCMP
+ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
+-#  ifdef __NR_kcmp
++#  if defined __NR_kcmp && __NR_kcmp > 0
+         return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
+ #  else
+         errno = ENOSYS;
+@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i
+ 
+ #if !HAVE_KEYCTL
+ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) {
+-#  ifdef __NR_keyctl
++#  if defined __NR_keyctl && __NR_keyctl > 0
+         return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5);
+ #  else
+         errno = ENOSYS;
+@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg
+ }
+ 
+ static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) {
+-#  ifdef __NR_add_key
++#  if defined __NR_add_key && __NR_add_key > 0
+         return syscall(__NR_add_key, type, description, payload, plen, ringid);
+ #  else
+         errno = ENOSYS;
+@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip
+ }
+ 
+ static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) {
+-#  ifdef __NR_request_key
++#  if defined __NR_request_key && __NR_request_key > 0
+         return syscall(__NR_request_key, type, description, callout_info, destringid);
+ #  else
+         errno = ENOSYS;
+@@ -496,7 +496,7 @@ enum {
+ static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask,
+                            unsigned long maxnode) {
+         long i;
+-#  ifdef __NR_set_mempolicy
++#  if defined __NR_set_mempolicy && __NR_set_mempolicy > 0
+         i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode);
+ #  else
+         errno = ENOSYS;
+diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
+index 018c20f8be..c6692043fe 100644
+--- a/src/test/test-seccomp.c
++++ b/src/test/test-seccomp.c
+@@ -28,7 +28,8 @@
+ #include "tmpfile-util.h"
+ #include "virt.h"
+ 
+-#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__)
++/* __NR_socket may be invalid due to libseccomp */
++#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__)
+ /* On these archs, socket() is implemented via the socketcall() syscall multiplexer,
+  * and we can't restrict it hence via seccomp. */
+ #  define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1
+@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) {
+         assert_se(pid >= 0);
+ 
+         if (pid == 0) {
+-#if __NR__sysctl > 0
++#if defined __NR__sysctl && __NR__sysctl > 0
+                 assert_se(syscall(__NR__sysctl, NULL) < 0);
+                 assert_se(errno == EFAULT);
+ #endif
+ 
+                 assert_se(seccomp_protect_sysctl() >= 0);
+ 
+-#if __NR__sysctl > 0
++#if defined __NR__sysctl && __NR__sysctl > 0
+                 assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0);
+                 assert_se(errno == EPERM);
+ #endif
+@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) {
+                 assert_se(poll(NULL, 0, 0) == 0);
+ 
+                 assert_se(s = hashmap_new(NULL));
+-#if SCMP_SYS(access) >= 0
++#if defined __NR_access && __NR_access > 0
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0);
+ #else
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0);
+@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) {
+                 s = hashmap_free(s);
+ 
+                 assert_se(s = hashmap_new(NULL));
+-#if SCMP_SYS(access) >= 0
++#if defined __NR_access && __NR_access > 0
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0);
+ #else
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0);
+@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) {
+                 s = hashmap_free(s);
+ 
+                 assert_se(s = hashmap_new(NULL));
+-#if SCMP_SYS(poll) >= 0
++#if defined __NR_poll && __NR_poll > 0
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0);
+ #else
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0);
+@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) {
+                 s = hashmap_free(s);
+ 
+                 assert_se(s = hashmap_new(NULL));
+-#if SCMP_SYS(poll) >= 0
++#if defined __NR_poll && __NR_poll > 0
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0);
+ #else
+                 assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0);
+@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) {
+          * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On
+          * other architectures, let's just fall back to the glibc call. */
+ 
+-#ifdef SYS_open
+-        return (int) syscall(SYS_open, path, flags, mode);
++#if defined __NR_open && __NR_open > 0
++        return (int) syscall(__NR_open, path, flags, mode);
+ #else
+         return open(path, flags, mode);
+ #endif
+-- 
+2.24.0
+
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index 7b3083b2a5dd..1b32293a17b8 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
@@ -185,6 +185,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}/243-seccomp.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 1d4a7f959742..ef297ad78f81 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -3,4 +3,4 @@ DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf7
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 EBUILD the_silver_searcher-2.0.0.ebuild 897 BLAKE2B cad19264a03f7c682ba59e47dca17d0c0def14f283cfd81ee59690f131e48700f4adb36798fa483773a95d01cfc87b5adf5d98257224883a31677683ffe7d5c0 SHA512 41a9a129e15a31f3629f83a44b6f4373f2c0f85d8ced54d4f748c805ca0ea8675a7c9d754c5e7fa2a75dd03504c5d6afc324cd784aef721a6a78498ccd87f1f3
 EBUILD the_silver_searcher-2.1.0.ebuild 969 BLAKE2B 83b32f1a81ae5eb63492bedb0d78980b079c778b346ecb4a3ef61639d45126f5735242a5bfb422626b2fb2d6ee302e7a5adb53542e666972b3cf50015ff3c519 SHA512 decb768407cbb038ef06c98bddc5fad188ce0d5b86c88a4d41110568f56dc9f027be9d17caf76dedc9c77a075b1bd95968492802200983ae1993ba3f94591273
-MISC metadata.xml 347 BLAKE2B cec1df10eb40daa911db4a3b082a3d1e5f67a63d4326092bc337a5b2300c89b41205db84a6daf54c72d6ff775166d385717039cee458076d4b483a8c0a5112fa SHA512 56848f01fba3974410effc1dbc30118c77bf97cf09fead70be94f7360dddb80d47005ebb3b3c7d5accb97b24db3a3f7735cf0f40d7af13dde58b78a4bef768b2
+MISC metadata.xml 263 BLAKE2B 3d3cb735ca3d3b8c9ea8ca6b1d9adcb3739a33cce36af48db9e95b673c5e1d7b749148ceb39c57c74819d18f33f510abc41354c0c0c2a502afd611e3a2b0ecdc SHA512 96e459d527c00e92aab5ea5ebe3d078d8b505a3e9d9ab92878132f58d82cad6b1d3199d95cc96bb67ed9a9ea05a06ff31666feeac0fd2bcb71f2035d5e00eee5
diff --git a/sys-apps/the_silver_searcher/metadata.xml b/sys-apps/the_silver_searcher/metadata.xml
index e1e8e9cb619b..aeaf98a5fa65 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">ggreer/the_silver_searcher</remote-id>
   </upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
commit	b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree	16fe44748708acacd909d4e2e160a09a7f6d936a /sys-apps
parent	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)