gentoo resync : 24.03.2018

17 files changed, 184 insertions, 687 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1f1a90cad79f..a796db3c05f5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index 942cabc0d632..d8368d91f2ef 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,6 +1,4 @@
 AUX pick-1.8.0-cflags.patch 204 BLAKE2B 1760b019fe93b1288ba12c01557b6de9e43adaca2c437d6e519acdf660fbf621d10d602da9a31e849e044df4964de320a9b5ba4611d0edde46277fac605f5df1 SHA512 63d5700af23b717641845db6c5d6e2bc6d94f1af4108b28fd7243fd7a46af5687371513fd9e423896b5c6e6245d5c575da5b4645d2db2cdd7c1fff10244fca26
-DIST pick-2.0.0.tar.gz 107860 BLAKE2B 95fccada43a7295876cc1d198c77eb9f2479d75e4b420cbd20e576dbb30962b34fe82811ff9d13f110b317d4d0f31143e39e092796f66e38fb509a0594719228 SHA512 ac5783902895fd76b5e936faf811c40b46ceb136a2383c4e1fc714f5e59c77f41591694241d9a42807cd78aabfb4d3a237d41f04e1c941e5aac40fe9ddfa4545
 DIST pick-2.0.1.tar.gz 108010 BLAKE2B 3fae7cfbbcf6913af9cf695e44f171aef58737038e94c779f0cedbe2e386577b4661cc9a55ad657b1a11873fc06bdb7bdc8eac032b6ca584778fe695f8ad4e68 SHA512 616c7889e2ad5d5bb267f683530327e9e121a678db4bd04d5cd720bb8bd81ae14e6bd83e342b33863ef18bd10943e6bbdef177c9639af513456e0146f9b73226
-EBUILD pick-2.0.0.ebuild 547 BLAKE2B 6e3e7ac4dd81c7511dfdba5716cc00b4439904ffc7e00552eab3bf46875dc8b644fdf5777c92552f7b7f659c991ac370cb5dcfa942bb24e3a2d4548cc1235de3 SHA512 f12167e04fee7a4fb0e38a796271afd6c334e9756a1c0a15ad2ee91f41da324df760ffdc64d6921c5b9b8bea46a335ba66e849051a21af79b7c52ad973de8730
 EBUILD pick-2.0.1.ebuild 547 BLAKE2B 6e3e7ac4dd81c7511dfdba5716cc00b4439904ffc7e00552eab3bf46875dc8b644fdf5777c92552f7b7f659c991ac370cb5dcfa942bb24e3a2d4548cc1235de3 SHA512 f12167e04fee7a4fb0e38a796271afd6c334e9756a1c0a15ad2ee91f41da324df760ffdc64d6921c5b9b8bea46a335ba66e849051a21af79b7c52ad973de8730
 MISC metadata.xml 331 BLAKE2B caa7ff5395d6d05faf4752c4ef3d7e5b12c3171e8a3b7d4fd5f5af95c9242edb4083c23a7905e5208ab0898f76d7332d6353ceeaf8c6a257acf1c0639b4a10fe SHA512 1cb3d78ef16d0587d81c649e338e4ff6136e57f6a735198a790935ed3b301292caad7dd1040e532f4892d65f12b9bc36050b18676014feeaccd463d65d04f5df
diff --git a/sys-apps/pick/pick-2.0.0.ebuild b/sys-apps/pick/pick-2.0.0.ebuild
deleted file mode 100644
index 88c100aa3408..000000000000
--- a/sys-apps/pick/pick-2.0.0.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/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index e7f148410cc2..04814e5e78f6 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,4 +1,6 @@
 DIST portage-mgorny-2.3.24.1.tar.gz 1239318 BLAKE2B bfa8418ade600835c90378177bc6cd91f6c17e02c0e05b0829f4ee3b500ce3275fcb76424e19af5618026daa7b79d402aeb0d9f2133e7db09cb8983eeb355427 SHA512 04e3d5ee08f78ba3bb8045c36e7e81b06b7a0aff65a22c82cd2ca6fc0ab9f7b63a49c7eda9048d15fbc9c8d1a898c0d038f7cac2f4daf6d68bb799a9303d74c1
+DIST portage-mgorny-2.3.24.2.tar.gz 1239343 BLAKE2B 701c90d333c10976f11910babed4b002cb545561c931d635973cf9b455a247b050b098c61fca0b20a5a8d70d4478a9daddacc826045e74c52d45878260431c93 SHA512 0319a973a26650ce182c0e1f997399f0c3944474ad5c8c2f88b9588ffbf99ccd12bd84e7537f8368f8362a098a72d177fc3c844e2afc086f95094baa27d97b93
 EBUILD portage-mgorny-2.3.24.1.ebuild 5451 BLAKE2B ca175205856228d36517a41420a5739832bf0919ad18d3af8f86ac05c75df3a0a371417c0541ce9caeee804ec519724675149713c495261db67f078daa9e8e25 SHA512 0a4261c22521ce902df520f254607cfa80019ad91d89eec1bf6ea8517062615a2c9272ba9de477c0509e09aafe7615772b5e4b157c3c8002d6e1b4945ac146b9
-EBUILD portage-mgorny-9999.ebuild 5336 BLAKE2B cc3ca9683fdc7f0efd4a77683ceb592529b4dddac021d9fa59bc5a04e1114269c3cd1c85f1550e697cd0240cabf23dee5c9f47d4a86d625633cef23bec050e70 SHA512 f17ce5ca089622f0f06f6fd9617b03c12e23ce81df1897d04952c674fb041582286d8bcad2b473ddb467151d9036e179fde630b9225fb80f128ff7da313077fa
+EBUILD portage-mgorny-2.3.24.2.ebuild 5467 BLAKE2B e9128167ffd714269124199116d31bb4cc582fd36aee26c8da10dd40fe1e27b8f8aa1e1b2f0c51660c54259ca7f0c39ed431e3e0d432224e2813019fa1e5f6cc SHA512 18a4d5a807e0f13199d6256e5218af8cf6b247a519b330ca19a0d6de714d386c8a12713fce86d1628a7c4fd6f65eab249c4bc4231a37a6e9c5c059e9aa5c52a8
+EBUILD portage-mgorny-9999.ebuild 5352 BLAKE2B 6ecd0c3f4c4eb308a6eb5c6867402f231ba0233c6e8ef224e6ec2185c77475fd6bc114bf8622fdb28aed5b06af705d4956608ccc1b22402eb1fe50763773e209 SHA512 65c03a6f7e8047b8b51a9761625b291a027f2745b4ac6b10c2323710ca91bd1cdc17e29dbc61c7e0c16a44691e5daab32e3f71324b32928c2277d14b8542302d
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.24.2.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.24.2.ebuild
new file mode 100644
index 000000000000..eb3315f80c86
--- /dev/null
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.24.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
+HOMEPAGE="https://github.com/mgorny/portage"
+SRC_URI="https://github.com/mgorny/portage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/portage-${PV}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch"
+RDEPEND="
+	>=app-arch/tar-1.27
+	!build? (
+		>=app-admin/eselect-1.2
+		app-crypt/openpgp-keys-gentoo-release
+		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		>=app-portage/gemato-10
+		app-shells/bash:0[readline]
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+		>=sys-apps/sed-4.0.5
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!app-portage/repoman
+	!sys-apps/portage"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+	)"
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	if has_version sys-apps/portage; then
+		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
+		ewarn "please note that Portage will abort upon having to unmerge itself."
+		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
+		ewarn "point, so you simply have to restart emerge and it will successfully"
+		ewarn "clean the old package afterwards."
+	fi
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py ||
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py ||
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "${REPLY}")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f make.conf.example.${ARCH}.diff ]]; then
+		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_configure_all() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		portage-ext-modules=$(usex native-extensions true false)
+	EOF
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+
+	keepdir /var/log/portage/elog
+}
+
+pkg_preinst() {
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
index 49017fa930ba..b2b9f73c5ffd 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=app-arch/tar-1.27
 	!build? (
 		>=app-admin/eselect-1.2
-		app-crypt/gentoo-keys
+		app-crypt/openpgp-keys-gentoo-release
 		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		>=app-portage/gemato-10
 		app-shells/bash:0[readline]
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 5c54cd28038f..69fb6684c8cb 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,78 +1,48 @@
-AUX ripgrep-0.8.1-bundled-deps.patch 767 BLAKE2B 957959ddc7c1b81519de1ab522c8dda6828acf39f9f8cb0e33db3f8762c15190bf536d74c36e4564059a54ad79323c28077260990cd026aa03b24093ec338caa SHA512 7640f6441c09759b727efd1fc25c10c09d929af4c7a28ccf61f9cc141611a274b52af5763a77598f718ea542a2a00f9d8b73d371412fb3e176577f21b6299ecd
-DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
-DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
-DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
 DIST atty-0.2.6.crate 5617 BLAKE2B 52274b58d4ae19cdd57a85a46449be32ac4662da6ce746382eff30c75729dbb5e50a9e9ad59f11b11f6d40b7ec2bc261e290f33127de62636c7f249c174bc4d3 SHA512 ae0aa91616571391eb4a2cc46b4765784dcd96b514fc7c3b64f756d1a180f95c83b9d14086f872fb7466be0e623f44a1a3170e786d7fbff5bdd949ef0cd88997
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
-DIST bytecount-0.1.7.crate 10121 BLAKE2B 2960616fed29dc32393190759027d718836eacf334c29142a31ba4970842ac0b1d8859cb936f5a0a1635d9b5faec5841aa40b18c9acc1a47f8b86302e9b1c013 SHA512 2482f06b62699251c70f45a67c29efa3cfce74568d261105ab14134853396dd6ee9a35ba29dd28e3b8dab4f1398f55708c4f648590330c8aea753ab27cb59c3c
 DIST bytecount-0.3.1.crate 12347 BLAKE2B 31d4d72e7edd37b78232db9b7a0ad2ea2fd18596891e43cff7f00438f5e033d5b3f901e6750fa179dc4d313424afb4dd853d3f5714a0d14c4faaf83958eb961a SHA512 09f2fda4bcddffc94f9e1f60afe478ba988c74276196e003f652229d7979491b1dc29686d3d11e2a9015b628638288b6dac23b27b157ae1025f64b05c35a5e19
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
-DIST clap-2.26.2.crate 182509 BLAKE2B 2bf91bd56d44edc6864a59576625cb2a04476e1f4246d0032ca413b6a43492d4de8bfec1ad05396fe5da9182a2c021331ad0efda76961af8f36c163a0fec5325 SHA512 15745452263c8b39fed61f12c5f36413a4064f726262bd4cd432baa873d2c820b702d2bbff645e65a0c2fb8e054b6f0a51b0047a21c40749c9c0f631003959ea
 DIST clap-2.30.0.crate 190562 BLAKE2B f97f4eb85f5a6775a42f112bd26c48561bf8ae41016b638b4f0fe0c18987896a1a3918f41211330f617b44a40c7ae0a2ccdd107e6f3bbdf53bb6c035439f4139 SHA512 2a4af4035dd92adf00e183d15528ed658ce7dec6d9df592565fbcc86e94b1b41ce9f11996da64a655a85909fc89c9b9404ec9b717bbca78c14d96e85916480bb
-DIST crossbeam-0.2.10.crate 32993 BLAKE2B 10bc4519c091251798a838a9ed3404f84b6af950e88209b6ce7607f5ee1105fdd1ea4c81f788321455b3bf5c6169e7296757a73619ee837ee4ac799fa1c64b7d SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2
 DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
-DIST encoding_rs-0.7.1.crate 1220716 BLAKE2B 2984bb16d93e323086076ef08f0290cf036e3cb3d57fc5c4f5575d6302236bd0f1d914c8016b4c192a1eb91622319f1d5a3498b05ba2c038ba843a441ad4f33c SHA512 272e4b5a5d2dd091bf33f53baca2e2afe2b9b3d77325aa6fcf27bbef5bd8f7ef5a47a443c6633fa6fb4793f990d1fb75f0c02f2be6f2e3d385bdf546b2c28a44
 DIST encoding_rs-0.7.2.crate 1241345 BLAKE2B f3aea266a3cd48027405d537e8bdf45b5b1084ab2d9d30a17dfdc23806607fc4eae4ecbd20d6faf667084d401f58fbe0fb53babc2aadbbfcdb30b81bd91a325e SHA512 92633620eb915ec3a4b1cc3d9d3ac38134827fa5f750eb7415e31e97c99e65e8532393090202a6a5a86979ac64127a7e8531b7c736f1109f47ea303bcb4f81ee
-DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
-DIST fnv-1.0.5.crate 6295 BLAKE2B f8c6cb514301864a6c61b2831195bbe97c849aff8b867b837b5af91a9bb49e2499625a636d2b4148b294f7061b783713780d393ae3c0d17e8ba55e00a74bf112 SHA512 a851ed060bf49224436acb1b5cc3125d30a3b527be9d7abd09f4170eee6243de8067b0bae5b136e62fdb8ee026e42a150109e90fcdf4cc4258f4de045d6069a8
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
-DIST fs2-0.4.2.crate 12815 BLAKE2B c84f4eae016ae1424e63f6c2b5a6c1deb2aa1343b0bdbf732041e737da7701fdb1228a5750cb1994375e78fbb324fbb425de26e11f0aacdf7e10e0cb10cf4084 SHA512 626c5edadaf356ef9d13ac042ef517f317a376fefc76163e3dc7573eff024323a2ea0f9c1582db5d797eb2ea64f2d27e7877e774154f5d5dadc506c926a5dfef
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
 DIST grep-0.1.8.crate 236744 BLAKE2B f119476878826f0b410770db4b95fa65fdc89b461f6ecdc43d15013d9fc82d91117b76fba6150c193633667243b3e49f88499cc532a3cac21565bd3e68217abc SHA512 d0a4e9dd51402ed8036aa5d2cfcdb184538d2bf0c81baac75c73e80d05945a63cb08a931d87fa526695af93271cecaed6650a045904ceaa05ed6e06fd23e537b
 DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-0.2.9.crate 11024 BLAKE2B 1ce03ae2143f64f01606435e5989331b4257b9fea8d878fb2b078bf4cb58132a51d252abef5c776169d8828871aa9e9be629a96d907c52407f2d59384861d1cb SHA512 10a75fc071f58fd9cf4d87619ff32e94b2d53da0f414e48319c4f15c1120c018ece698a396f538f60504c85f2faa5da3e48fd17c0fcfb8f575352c70f79c9ba2
 DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
-DIST libc-0.2.32.crate 228762 BLAKE2B b143575c02182abdf765805d879bad92b1b5901eb828774eb0803b08e0bc8af5682ce6aedd3d6d7d68443cf875ffbb0bee026023b957b198b04464559363e167 SHA512 73115eb14e2c90757c5075c86582bb463860f4016e5c3e9a0187b63ec93ee279da8f6146f2eef7914c72c1e6fbab3362dc9b789e2706d15d9b8a486e8311b088
 DIST libc-0.2.36.crate 310575 BLAKE2B cd61236a99ce86b18329e0bfc34b738b6133a38e90d4a1a257b2739ec0e91e6ff24243f6b2b7e1c5ad3b4aa1301da42adc81e67769698f11928ee712ec31e70b SHA512 97995c49322f5a3c93df2db08b7372ba3a6da0edc9247cbd3bfb58f9b01315953596154c97c5bca1517b56b8e35e8d03bbf89f9b980aff724977b98bc0d938ed
-DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
-DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
-DIST memchr-2.0.0.crate 9824 BLAKE2B 7e8c47b8ec9465d9c91879a1ac28d8a31b0f8a6e40e4553329d84de8817b2333dda4e234f02ad3fd61e6c68031842a79fca971826b39afbe2fae66f682735fa7 SHA512 de1ba67ccd342cd0b5cc493b5eb67e0e4ef90d0da0c1ec035ae5daaf778fc8d16eaa620d2cdf2100f45a3861640ea174eaeb9012571c90d47e2e925300665b46
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
-DIST memmap-0.5.2.crate 14465 BLAKE2B b9b4c5e0aff4867d1988f51aab57fad96b1430f5d0f8515d69214dfcbab6dd4ddb89042bf345ee2de9a84a7146f82c86f7c832cfe4d7b7a3af53948381f8f95e SHA512 c2ccb0afa6795831f1a032c4995d74daeb3bd739059146007b2524ec066517f39f7a2fcf56e69d17a5d091511011b9c0794a8e3ada7322dfc5f20a3d9f6c1b05
 DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
-DIST num_cpus-1.7.0.crate 9626 BLAKE2B e099f897fc49d9123507f78cec7c52074629eeb6ba953be5af92f7a83942d69817c55792ce7fc4564b278d79867f145e42ceb7bf559f6790241d7949f3815657 SHA512 467500989a9b1fab4922c4db049a735a6fb7ac07cb92be2ce2bbf6e0c2ad4e3be5e1af33bdf2b9d160cab5ee5a4f292addea1180d5c2a940abd85f8e624d37e0
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
-DIST redox_syscall-0.1.31.crate 13420 BLAKE2B 5e533c5db7dd026c490c4250761d105592a2958aba4643d50642d7e543f2850d09b8debadaebf1a7a5f4bcf4c9584bed3f7f6776d075681a4038d3bc53ba9499 SHA512 162655d5ba07857183a75bd7aaa3e190e8d1c2e80002319e5006a67c09a105fb3f3726fed1a116b7284712bf6a2bfde1607cb8b576251233c12b69582969a9f1
+DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
+DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
 DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
 DIST regex-0.2.6.crate 197800 BLAKE2B d135424d756eee989ad9a9180882c773fa4f399cb7f99b454c1b7ce3f2d66ce8daaa19f989878e5676b70f8d5dc2cac30773654156d8cd4b410bef44bc1276d5 SHA512 69c84096834b794227e4937db7598f35e8c489ef8445d3b5f3c0b2a73fe54be029f6db609b046441fda6374485c16943197f7416ed9545c784d14fb61c9e804d
-DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
-DIST ripgrep-0.7.1.tar.gz 474458 BLAKE2B f75d74f7340b07acf7df2ed13b2a1fd2409a7e126c975d0f73e1fadf386d5a69fcb1947e244ece8827938dca0d6eef0d790337b0ef41fe3e19f2b0f0d1b29323 SHA512 1d2c5b1085ebc6b2b0d1cd330583f8d09bae0789590ff3a8bbb7f79c36b106b9f4fb3c880a225fa4f8565cee55e38514db0e7751f1d14a76005ebfa7c7127e5f
-DIST ripgrep-0.8.1.tar.gz 521088 BLAKE2B 4133448f49a9f50cd1da749e3a4c93f64fb9a0cc5522b924197c70178dc4f5ae4b903dece61ca127bfe31eb5038d3587fc1a6807fe519a7abf78fb9b5ed0d518 SHA512 4554f1744c6f8dec9ca8efa80320b69cacc03c52dfa36014994dc7217ed109863798e6c89e80e05926fc3288e4afc44b94e7cb810b1046bb24507f39827a5f95
-DIST same-file-1.0.0.crate 8746 BLAKE2B cc117106dc71ef7129866bff11246e7403919879db288e17ca500cf57160ff04e931fb69aa571532ae6b307364cb9d5055a57e8821b0c52e1cbd14dee0d4cb2d SHA512 75dac7dfec4f3732410b1264d8394d20860c993ac5960888f9ed1acc5f730c16215311a5e13ddc5d4f126e8cbfd8e1c5510bdf6c0be8bedfed19cdf3394d6ffa
+DIST ripgrep-0.8.1.crate 199607 BLAKE2B ba936fb5ad1072d45314abe67f916121e9082cb5fc58779b213ee75db4164576de683c7b616f4558d779dce29944904db510ba3b3ea38432686ef13a3d85af85 SHA512 bd1575d0b2efc9799ad00bf931fee61e5a475db9725c9587f9f157e0dcb6c958defb09ffa4636965806481a09e3d3218b820f601d931bf5a9b8bcde92956d9bb
 DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
-DIST simd-0.1.1.crate 39577 BLAKE2B 99f41c79ad02f4de5dace61aa1024dbaa4350060858b031ee415cd135bba76a2a037e499ebb512a61caac40fc4091f406030b45ed85742181ba76f7aacc0b677 SHA512 ed58383bbee3d0a5bc537629cdb242d5ae8ff46d4e8911df16e34a9fe9da693f1347b89f77614d1835391f57c27176824c46feb9733de89915ed4709217466f2
-DIST simd-0.2.0.crate 35102 BLAKE2B f80a1fb4597474a8145f69efabd0c9fa39fc60a4cafb0fac247f2b7ee94c1be2d9173dde78fc51dfe4dd040a7360ef2fe784d2c845e5d689e61ce6d444b337ee SHA512 97538d8811d6627d5c8c32bb59783aaa906887fb320679144d50330e520e85bac7060d7d4e4e7074097ae8928aab66085500344bcd5c4dc8e195e339c7b4f2fb
 DIST simd-0.2.1.crate 35716 BLAKE2B e34e1e937ed92e921603f7aa4b78283a01ee9246c9033c7e16cb95e2585c9145a591ac4f9786f0c51d0b303637203fdf9a0354a0ebc3d658c47edcd055a98546 SHA512 2bf1c2f830d10f60e62def7c5525598e121124e8a4fe1125419c0da3ed97bceec9909550eee171a335ec9c6944958ce5581ae53baad47cccddd234d2b7801535
-DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
-DIST term_size-0.3.0.crate 9932 BLAKE2B 226f2cdf0cbda83803ab1fa8666c8f7be91f5e57b04367203417baa288793b4779a4d5f1cc5d95e40181d9acf8575632c735b13a1805ed9a23bc438ba221f003 SHA512 a466470372c09a6152f1fdaa3d631395410f4db938d0ba1db1695d66bf1620177f4dab4a9aade47de1d48019712072bfc91630cf4c088c56a5775f4d27dded8c
+DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
 DIST termcolor-0.3.5.crate 13539 BLAKE2B d5b9edfa562321ed1efd0d26d634c327d0256f09a0d8d1eb5b35b6095561756a4a374f5b43b5384faa8ca321882b8f2598692734b02909884911dff9825bda8c SHA512 3057a20b5aee2a745180c51605469f7b27c0c15b3073b2ce901558cab19893b4cf2afccf95128596a709464c281e08a66b7ae7bf1d28e64da4fb221865733277
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.8.0.crate 14903 BLAKE2B 9eacdf4437c2ddccfe256e116d3c4c038aaa28ebd1e67e16d2f40158153115192d4f6a6ff43dda98adb4e49c5e2a7ec096e7f903d2ed591b7f1ff58fc67220b7 SHA512 1648a496cfebedbc6f81b150a2315a9ba588e5b10eab652c27e2d33ce265115aff9036bf3c263a656065c037e66e5a899462a6ff12b1b3a10ccea2fa0e3ba018
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
-DIST thread_local-0.3.4.crate 11760 BLAKE2B 7d1c7bc70d6f35a04074ae6d25d14b07f4f48742a8090a1465d2b6cfc9a80e50a737cc75d65f4bd1de226c341d10d630092fee3be74daaada88f567767217403 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d
 DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-2.0.1.crate 21483 BLAKE2B 012487a663fbe0ac53dce67d6777c8968c9f32756d1fdc8832083784fd067ce1b55862811d8953f7510d61e5d0dca7969ccbfa5079744860c474ea3e1ba6ce5d SHA512 54ca4b7dd89569de8710af7ad06a631e5693ca7ddb368f1d893d544547de5e073f862324796b66849e46af9c8b0ad3fa98f81a381db8e2e394502a79be1aec7f
 DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-EBUILD ripgrep-0.7.1.ebuild 1284 BLAKE2B 8a5f52fe898761f38cda43fe315c16683f796b55d79d61105f908dd12d64ad40b04bd6787c40a6440f97165380415c45b4eed5e9588b7795b6b48eae6e38a405 SHA512 d0484855abfbaeab6f1167d2ec284847944702356200d11daef215a2a5f7791c2d74918f56eec541772f42fc7d1315c2c71afd9e9bdcd2e3e2b011bb5487cdc9
-EBUILD ripgrep-0.8.1.ebuild 1640 BLAKE2B a441b1bc4fe0c439894b8a6ee864393523fa225af4ef310f73e586354a0435b4c04e42327cb75b862cc270f57a02130cdd81a28826a5ef0ae1d25dc4e29e0ce7 SHA512 5404f6f9762160b536c740bd2d45b116a31d287aaec4018ff01ded8757b7de05d6fa7528af3725b0312e1edb257d839069c90b31ae0e1bb11defcc84492ea67c
+EBUILD ripgrep-0.8.1-r1.ebuild 1528 BLAKE2B 57a1799d3cceb5a1605ed94512edf5f1cf9e4e30bbf8af7f60524989da7ad26e3f2a4aa1cc4ec1ef6e5f9cf6605895c30feb4f10a6e5ec5656e1d6704fc2f178 SHA512 486a5e5a6b8319b8509acab50cc0000484ff6819585a6e89a13b007e5d104b2313432ba9763ee5c1b956851f1236b2344041132411991c4d719ee758836be4f1
 MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/files/ripgrep-0.8.1-bundled-deps.patch b/sys-apps/ripgrep/files/ripgrep-0.8.1-bundled-deps.patch
deleted file mode 100644
index ed83151fd6b5..000000000000
--- a/sys-apps/ripgrep/files/ripgrep-0.8.1-bundled-deps.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Use deps from crates instead of bundled in the repo.
-
---- ripgrep-0.8.1/Cargo.toml
-+++ ripgrep-0.8.1/Cargo.toml
-@@ -29,16 +29,13 @@
- name = "integration"
- path = "tests/tests.rs"
- 
--[workspace]
--members = ["grep", "globset", "ignore", "termcolor", "wincolor"]
--
- [dependencies]
- atty = "0.2.2"
- bytecount = "0.3.1"
- encoding_rs = "0.7"
--globset = { version = "0.3.0", path = "globset" }
--grep = { version = "0.1.8", path = "grep" }
--ignore = { version = "0.4.0", path = "ignore" }
-+globset = "0.3.0"
-+grep = "0.1.8"
-+ignore = "0.4.0"
- lazy_static = "1"
- libc = "0.2"
- log = "0.4"
-@@ -47,7 +44,7 @@
- num_cpus = "1"
- regex = "0.2.4"
- same-file = "1"
--termcolor = { version = "0.3.4", path = "termcolor" }
-+termcolor = "0.3.4"
- 
- [dependencies.clap]
- version = "2.29.4"
diff --git a/sys-apps/ripgrep/ripgrep-0.7.1.ebuild b/sys-apps/ripgrep/ripgrep-0.7.1.ebuild
deleted file mode 100644
index 5aba68b30836..000000000000
--- a/sys-apps/ripgrep/ripgrep-0.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.3
-ansi_term-0.9.0
-atty-0.2.3
-bitflags-0.9.1
-bytecount-0.1.7
-cfg-if-0.1.2
-clap-2.26.2
-crossbeam-0.2.10
-encoding_rs-0.7.1
-env_logger-0.4.3
-fnv-1.0.5
-fs2-0.4.2
-kernel32-sys-0.2.2
-lazy_static-0.2.9
-libc-0.2.32
-log-0.3.8
-memchr-1.0.2
-memchr-2.0.0
-memmap-0.5.2
-num_cpus-1.7.0
-redox_syscall-0.1.31
-redox_termios-0.1.1
-regex-0.2.2
-regex-syntax-0.4.1
-same-file-1.0.0
-simd-0.1.1
-simd-0.2.0
-strsim-0.6.0
-term_size-0.3.0
-termion-1.5.1
-textwrap-0.8.0
-thread_local-0.3.4
-unicode-width-0.1.4
-unreachable-1.0.0
-utf8-ranges-1.0.0
-vec_map-0.8.0
-void-1.0.2
-walkdir-2.0.1
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
-HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/rust-1.17"
-
-src_test() {
-	cargo test || die "tests failed"
-}
-
-src_install() {
-	cargo_src_install
-
-	doman doc/rg.1
-	dodoc CHANGELOG.md README.md
-
-	insinto /usr/share/zsh/site-functions
-	doins complete/_rg
-}
diff --git a/sys-apps/ripgrep/ripgrep-0.8.1.ebuild b/sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild
index 2e72324c71a9..27998b14ac3e 100644
--- a/sys-apps/ripgrep/ripgrep-0.8.1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.8.1-r1.ebuild
@@ -14,6 +14,9 @@ clap-2.30.0
 crossbeam-0.3.2
 encoding_rs-0.7.2
 fnv-1.0.6
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
 globset-0.3.0
 grep-0.1.8
 ignore-0.4.1
@@ -23,13 +26,17 @@ log-0.4.1
 memchr-2.0.1
 memmap-0.6.2
 num_cpus-1.8.0
+rand-0.3.22
+rand-0.4.2
 redox_syscall-0.1.37
 redox_termios-0.1.1
 regex-0.2.6
 regex-syntax-0.4.2
+ripgrep-0.8.1
 same-file-1.0.2
 simd-0.2.1
 strsim-0.7.0
+tempdir-0.3.5
 termcolor-0.3.5
 termion-1.5.1
 textwrap-0.9.0
@@ -49,8 +56,7 @@ 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="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
@@ -60,15 +66,6 @@ IUSE=""
 DEPEND=">=virtual/rust-1.20
 	app-text/asciidoc"
 
-PATCHES=( "${FILESDIR}"/${P}-bundled-deps.patch )
-
-src_prepare() {
-	# remove bundled libs
-	rm -r globset grep ignore termcolor wincolor || die
-
-	default
-}
-
 src_test() {
 	cargo test || die "tests failed"
 }
@@ -77,7 +74,7 @@ src_install() {
 	cargo_src_install
 
 	# hacks to find/install generated files
-	BUILD_DIR=$(dirname $(find target -name rg.1))
+	BUILD_DIR=$(dirname $(find target/release -name rg.1))
 	doman "${BUILD_DIR}"/rg.1
 	dobashcomp "${BUILD_DIR}"/rg.bash
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 07d7826528b8..fb6e898b78a6 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,13 +1,6 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
-AUX sandbox-2.10-disable-same.patch 2547 BLAKE2B 72976e698d1e95cc9153745744e3e9790ade9923ade2459b66969fdd04b0532fad70f08babaf5bbf2240deba9fb92a4a1090cfaec7b2d9a85d6d98adb23926f9 SHA512 bf005fbde7b6ba88df36bb75064658764e488dd2f3c96a6f92c69ad3f2e8d2db12ba2c7bafa9656326b7fde73301c330f68bd064efa0fce2a7eb28fff6ce0a1e
-AUX sandbox-2.10-fix-opendir.patch 3311 BLAKE2B d8a604720da1c623e7299215298d6ce3502b58641006e2667047a2477a85e4c071426ae30e5f0a436dfe3d74cc4f34de7fab6729dafec6acddb44974edffe619 SHA512 5c0650d6838b8171a87409ebd8565a90a42603874893708c2cdee5b50535e637f145fa2e51142db857c35a9bc11713b45b7e50c31f96f9ecd6ba342ce8d87928
-AUX sandbox-2.10-memory-corruption.patch 1515 BLAKE2B 2c0ef4ca1899efd2d525aafb26dcb7ecaf40c3b107e38e3c5d1a39455dd2cd36f8ac8fff43bb1dec22b910e479f328fa139a02f5a8f584ecefcf0ed86e60ad6a SHA512 1eb650824cc7a876fabef382cafb451a507326a8422fb7bb5014699046b64ea8f4cf2bba9efcb75d7a2eac4eff493d06153422f85c119f49635ac0840071660c
-AUX sandbox-2.11-symlinkat-renameat.patch 3418 BLAKE2B 4864dd5794abbf70d70f30949ee39921f9dafea4445f4cd49d88a5bef9b19769ed0c2c37a7a30fd6e241c159b21aad4f6465ef159ec1652cbb0d4a65e6531869 SHA512 cbefae8aa9c289db0bfe7b2429f64aa4c437be0e269eaa657eb3b22a3086db1fca45a624cb181978b4157f0cb9b475b4ece2eb9337285bf8bede709ad4431c52
-DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
-EBUILD sandbox-2.10-r3.ebuild 2156 BLAKE2B fecdef4a769d481e6479c82c341626de5d935f031b33df13eaae51b2041e0793a9854f3726ae90586586dc7d0008230f7ba6ae948c48d145d5c05bd4fd0aa027 SHA512 a08a00c80dcd282c929078c7c3afed16a7c30d710294e1621cf2ca1841f01f95872dd92a0bea1f3d7bb8850c05cffcefb68c58a36c9b1eac1960d1d4b04e3224
-EBUILD sandbox-2.10-r4.ebuild 2222 BLAKE2B 5f0e178bafb0f28dcf320452c64317d9883afee0a68c09190e3293bd857b5ee816e4656b01b5e1dbb7664802d0e13a05540ab4ba61a04c93788dc1d21cee7c95 SHA512 dca8808e22888f5542a1233604a84b0a5e9952bf6e8792b24a716e477b254fc90ac1efc0cff0eccf832f10026cf56341011e227001c70f0d5eaab36c89b5a23c
 EBUILD sandbox-2.12.ebuild 1928 BLAKE2B a7a78a1e8b6513b88b79ed395caa976601698355fc839004ae132b5a94e33295e4edc9d41e6c8e056c8fa0abee3c2199bc3a5fa09394ab58c5f60133c0b18b1e SHA512 f3e73bc7fb6b73490d395fe109bfbb35986720b8fafbdb3a1d8885a3388e4561b5e7f92a06c19909dca4e985923059743bbc0d060da39d1dc3031a8218a6e48f
 EBUILD sandbox-2.13.ebuild 1938 BLAKE2B 26db9bc8c8334a4a20bcb09765861f6ed6b6a3da6edd02cc9438943fc18271a9ffa90a26d37e2f648cdd5073a22de71decc21417db1ea331833f11d146f5ce4d SHA512 11cd256384d562de308cd579a04c3742dc436a8e3f4e30cc66d837373c2352b99b23bd4fbfee6fa61b74b7e1eaae95b7ffec1f0fb9785979b783c17f420cdbe7
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/files/sandbox-2.10-disable-same.patch b/sys-apps/sandbox/files/sandbox-2.10-disable-same.patch
deleted file mode 100644
index 296b322b0c50..000000000000
--- a/sys-apps/sandbox/files/sandbox-2.10-disable-same.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 7a923f646ce10b7dec3c7ae5fe2079c10aa21752 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Dec 2015 16:08:16 -0500
-Subject: [PATCH] libsbutil: gnulib: hand disable same_name usage
-
-We don't provide same_name because the one caller we don't use, but it
-relies on gc-sections to avoid link errors.  That flag doesn't work on
-ia64 though, so we need to hand delete the one caller.  Ugh.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsbutil/gnulib/hash-triple.c |  9 ---------
- libsbutil/gnulib/same.h        | 25 -------------------------
- 2 files changed, 34 deletions(-)
- delete mode 100644 libsbutil/gnulib/same.h
-
-diff --git a/libsbutil/gnulib/hash-triple.c b/libsbutil/gnulib/hash-triple.c
-index c3b6d9f..06cfbdf 100644
---- a/libsbutil/gnulib/hash-triple.c
-+++ b/libsbutil/gnulib/hash-triple.c
-@@ -24,7 +24,6 @@
- #include <string.h>
- 
- #include "hash-pjw.h"
--#include "same.h"
- #include "same-inode.h"
- 
- #define STREQ(a, b) (strcmp (a, b) == 0)
-@@ -52,14 +51,6 @@ triple_hash_no_name (void const *x, size_t table_size)
- 
- /* Compare two F_triple structs.  */
- bool
--triple_compare (void const *x, void const *y)
--{
--  struct F_triple const *a = x;
--  struct F_triple const *b = y;
--  return (SAME_INODE (*a, *b) && same_name (a->name, b->name)) ? true : false;
--}
--
--bool
- triple_compare_ino_str (void const *x, void const *y)
- {
-   struct F_triple const *a = x;
-diff --git a/libsbutil/gnulib/same.h b/libsbutil/gnulib/same.h
-deleted file mode 100644
-index ee313c5..0000000
---- a/libsbutil/gnulib/same.h
-+++ /dev/null
-@@ -1,25 +0,0 @@
--/* Determine whether two file names refer to the same file.
--
--   Copyright (C) 1997-2000, 2003-2004, 2009-2015 Free Software Foundation, Inc.
--
--   This program is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation; either version 3 of the License, or
--   (at your option) any later version.
--
--   This program is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
--
--#ifndef SAME_H_
--# define SAME_H_ 1
--
--# include <stdbool.h>
--
--bool same_name (const char *source, const char *dest);
--
--#endif /* SAME_H_ */
--- 
-2.6.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.10-fix-opendir.patch b/sys-apps/sandbox/files/sandbox-2.10-fix-opendir.patch
deleted file mode 100644
index 2ff89bcdfcba..000000000000
--- a/sys-apps/sandbox/files/sandbox-2.10-fix-opendir.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 3f668dc6ba1910085e61b3a24167ab1352c60d92 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 11 Nov 2016 12:34:48 +0200
-Subject: [PATCH] libsandbox: do not abort with a long name to opendir
-
-Add a pre-check for opendir that catches too long name arguments
-given to opendir, as it would get messed up and abort before it
-even gets to the open*() syscall (which would handle it correctly),
-due to opendir going through before_syscall/check_syscall, even
-though it isn't a true syscall and it getting cut to SB_PATH_MAX
-inbetween and getting confused somewhere.
-
-URL: https://bugs.gentoo.org/553092
-Signed-off-by: Mart Raudsepp <leio@gentoo.org>
----
- libsandbox/wrapper-funcs/opendir.c           |  2 ++
- libsandbox/wrapper-funcs/opendir_pre_check.c | 26 ++++++++++++++++++++++++++
- libsandbox/wrappers.h                        |  1 +
- 3 files changed, 29 insertions(+)
- create mode 100644 libsandbox/wrapper-funcs/opendir_pre_check.c
-
-diff --git a/libsandbox/wrapper-funcs/opendir.c b/libsandbox/wrapper-funcs/opendir.c
-index 7670775..70c2692 100644
---- a/libsandbox/wrapper-funcs/opendir.c
-+++ b/libsandbox/wrapper-funcs/opendir.c
-@@ -10,4 +10,6 @@
- #define WRAPPER_SAFE() SB_SAFE(name)
- #define WRAPPER_RET_TYPE DIR *
- #define WRAPPER_RET_DEFAULT NULL
-+#define WRAPPER_PRE_CHECKS() sb_opendir_pre_check(STRING_NAME, name)
-+
- #include "__wrapper_simple.c"
-diff --git a/libsandbox/wrapper-funcs/opendir_pre_check.c b/libsandbox/wrapper-funcs/opendir_pre_check.c
-new file mode 100644
-index 0000000..60c869f
---- /dev/null
-+++ b/libsandbox/wrapper-funcs/opendir_pre_check.c
-@@ -0,0 +1,26 @@
-+/*
-+ * opendir() pre-check.
-+ *
-+ * Copyright 1999-2016 Gentoo Foundation
-+ * Licensed under the GPL-2
-+ */
-+
-+bool sb_opendir_pre_check(const char *func, const char *name)
-+{
-+	/* If length of name is larger than PATH_MAX, we would mess it up
-+	 * before it reaches the open syscall, which would cleanly error out
-+	 * via sandbox as well (actually with much smaller lengths than even
-+	 * PATH_MAX).
-+	 * So error out early in this case, in order to avoid an abort in
-+	 * check_syscall later on, which gets ran for opendir, despite it not
-+	 * being a syscall.
-+	 */
-+	if (strnlen(name, PATH_MAX) == PATH_MAX) {
-+		errno = ENAMETOOLONG;
-+		sb_debug_dyn("EARLY FAIL: %s(%s): %s\n",
-+			func, name, strerror(errno));
-+		return false;
-+	}
-+
-+	return true;
-+}
-diff --git a/libsandbox/wrappers.h b/libsandbox/wrappers.h
-index 0aa58bb..bf5bf64 100644
---- a/libsandbox/wrappers.h
-+++ b/libsandbox/wrappers.h
-@@ -27,6 +27,7 @@ attribute_hidden bool sb_fopen64_pre_check  (const char *func, const char *pathn
- attribute_hidden bool sb_mkdirat_pre_check  (const char *func, const char *pathname, int dirfd);
- attribute_hidden bool sb_openat_pre_check   (const char *func, const char *pathname, int dirfd, int flags);
- attribute_hidden bool sb_openat64_pre_check (const char *func, const char *pathname, int dirfd, int flags);
-+attribute_hidden bool sb_opendir_pre_check  (const char *func, const char *name);
- attribute_hidden bool sb_unlinkat_pre_check (const char *func, const char *pathname, int dirfd);
- attribute_hidden bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd,
-                                              char *dirfd_path, size_t dirfd_path_len);
--- 
-2.9.0
-
diff --git a/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch b/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch
deleted file mode 100644
index 7dd27c9d2246..000000000000
--- a/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 529a388ebb1b4e9d6ad8a1bb61dd8211833a5976 Mon Sep 17 00:00:00 2001
-From: Denis Lisov <dennis.lissov@gmail.com>
-Date: Sat, 19 Dec 2015 19:13:58 +0300
-Subject: [PATCH] libsandbox: fix old_malloc_size check on realloc
-
-Realloc uses SB_MALLOC_TO_SIZE assuming it returns the usable size,
-while it is really the mmap size, which is greater. Thus it may fail
-to reallocate even if required.
-
-URL: https://bugs.gentoo.org/568714
-Signed-off-by: Denis Lisov <dennis.lissov@gmail.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/memory.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libsandbox/memory.c b/libsandbox/memory.c
-index 8581128..a2d69a2 100644
---- a/libsandbox/memory.c
-+++ b/libsandbox/memory.c
-@@ -40,7 +40,8 @@ static int sb_munmap(void *addr, size_t length)
- 
- #define SB_MALLOC_TO_MMAP(ptr) ((void*)((uintptr_t)(ptr) - MIN_ALIGN))
- #define SB_MMAP_TO_MALLOC(ptr) ((void*)((uintptr_t)(ptr) + MIN_ALIGN))
--#define SB_MALLOC_TO_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr)))
-+#define SB_MALLOC_TO_MMAP_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr)))
-+#define SB_MALLOC_TO_SIZE(ptr) (SB_MALLOC_TO_MMAP_SIZE(ptr) - MIN_ALIGN)
- 
- void *malloc(size_t size)
- {
-@@ -57,7 +58,7 @@ void free(void *ptr)
- {
- 	if (ptr == NULL)
- 		return;
--	if (munmap(SB_MALLOC_TO_MMAP(ptr), SB_MALLOC_TO_SIZE(ptr)))
-+	if (munmap(SB_MALLOC_TO_MMAP(ptr), SB_MALLOC_TO_MMAP_SIZE(ptr)))
- 		sb_ebort("sandbox memory corruption with free(%p): %s\n",
- 			ptr, strerror(errno));
- }
--- 
-2.6.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.11-symlinkat-renameat.patch b/sys-apps/sandbox/files/sandbox-2.11-symlinkat-renameat.patch
deleted file mode 100644
index e33011f74959..000000000000
--- a/sys-apps/sandbox/files/sandbox-2.11-symlinkat-renameat.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 4c47cfa22802fd8201586bef233d8161df4ff61b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 10 Mar 2017 10:15:50 -0800
-Subject: [PATCH] libsandbox: whitelist renameat/symlinkat as symlink funcs
-
-These funcs don't deref their path args, so flag them as such.
-
-URL: https://bugs.gentoo.org/612202
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/libsandbox.c |  4 +++-
- tests/renameat-2.sh     | 12 ++++++++++++
- tests/renameat-3.sh     | 11 +++++++++++
- tests/renameat.at       |  2 ++
- tests/symlinkat-2.sh    | 10 ++++++++++
- tests/symlinkat-3.sh    |  9 +++++++++
- tests/symlinkat.at      |  2 ++
- 7 files changed, 49 insertions(+), 1 deletion(-)
- create mode 100755 tests/renameat-2.sh
- create mode 100755 tests/renameat-3.sh
- create mode 100755 tests/symlinkat-2.sh
- create mode 100755 tests/symlinkat-3.sh
-
-diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c
-index e809308d717d..de48bd79ba53 100644
---- a/libsandbox/libsandbox.c
-+++ b/libsandbox/libsandbox.c
-@@ -650,8 +650,10 @@ static bool symlink_func(int sb_nr, int flags, const char *abs_path)
- 	      sb_nr == SB_NR_LCHOWN   ||
- 	      sb_nr == SB_NR_REMOVE   ||
- 	      sb_nr == SB_NR_RENAME   ||
-+	      sb_nr == SB_NR_RENAMEAT ||
- 	      sb_nr == SB_NR_RMDIR    ||
--	      sb_nr == SB_NR_SYMLINK))
-+	      sb_nr == SB_NR_SYMLINK  ||
-+	      sb_nr == SB_NR_SYMLINKAT))
- 	{
- 		/* These funcs sometimes operate on symlinks */
- 		if (!((sb_nr == SB_NR_FCHOWNAT ||
-diff --git a/tests/renameat-2.sh b/tests/renameat-2.sh
-new file mode 100755
-index 000000000000..d0fbe8ae4574
---- /dev/null
-+++ b/tests/renameat-2.sh
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+# make sure we can clobber symlinks #612202
-+
-+addwrite $PWD
-+
-+ln -s /asdf sym || exit 1
-+touch file
-+renameat-0 0 AT_FDCWD file AT_FDCWD sym || exit 1
-+[ ! -e file ]
-+[ ! -L sym ]
-+[ -e sym ]
-+test ! -s "${SANDBOX_LOG}"
-diff --git a/tests/renameat-3.sh b/tests/renameat-3.sh
-new file mode 100755
-index 000000000000..9ae5c9a6511a
---- /dev/null
-+++ b/tests/renameat-3.sh
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+# make sure we reject bad renames #612202
-+
-+addwrite $PWD
-+mkdir deny
-+adddeny $PWD/deny
-+
-+touch file
-+renameat-0 -1,EACCES AT_FDCWD file AT_FDCWD deny/file || exit 1
-+[ -e file ]
-+test -s "${SANDBOX_LOG}"
-diff --git a/tests/renameat.at b/tests/renameat.at
-index 081d7d20277e..eec4638deeaa 100644
---- a/tests/renameat.at
-+++ b/tests/renameat.at
-@@ -1 +1,3 @@
- SB_CHECK(1)
-+SB_CHECK(2)
-+SB_CHECK(3)
-diff --git a/tests/symlinkat-2.sh b/tests/symlinkat-2.sh
-new file mode 100755
-index 000000000000..168362e8806f
---- /dev/null
-+++ b/tests/symlinkat-2.sh
-@@ -0,0 +1,10 @@
-+#!/bin/sh
-+# make sure we can clobber symlinks #612202
-+
-+addwrite $PWD
-+
-+symlinkat-0 0 /asdf AT_FDCWD ./sym || exit 1
-+[ -L sym ]
-+symlinkat-0 -1,EEXIST /asdf AT_FDCWD ./sym || exit 1
-+[ -L sym ]
-+test ! -s "${SANDBOX_LOG}"
-diff --git a/tests/symlinkat-3.sh b/tests/symlinkat-3.sh
-new file mode 100755
-index 000000000000..a01c750dd2b6
---- /dev/null
-+++ b/tests/symlinkat-3.sh
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+# make sure we reject bad symlinks #612202
-+
-+addwrite $PWD
-+mkdir deny
-+adddeny $PWD/deny
-+
-+symlinkat-0 -1,EACCES ./ AT_FDCWD deny/sym || exit 1
-+test -s "${SANDBOX_LOG}"
-diff --git a/tests/symlinkat.at b/tests/symlinkat.at
-index 081d7d20277e..eec4638deeaa 100644
---- a/tests/symlinkat.at
-+++ b/tests/symlinkat.at
-@@ -1 +1,3 @@
- SB_CHECK(1)
-+SB_CHECK(2)
-+SB_CHECK(3)
--- 
-2.12.0
-
diff --git a/sys-apps/sandbox/sandbox-2.10-r3.ebuild b/sys-apps/sandbox/sandbox-2.10-r3.ebuild
deleted file mode 100644
index 49e172c3c527..000000000000
--- a/sys-apps/sandbox/sandbox-2.10-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-memory-corruption.patch #568714
-	epatch "${FILESDIR}"/${P}-disable-same.patch
-	epatch "${FILESDIR}"/${P}-fix-opendir.patch #553092
-	epatch_user
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	local myconf=()
-	host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${ED}"/var/log/sandbox
-	chmod 0770 "${ED}"/var/log/sandbox
-
-	if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then
-		local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-		if [[ -n ${old} ]] ; then
-			elog "Removing old sandbox libraries for you:"
-			find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then
-		chmod 0755 "${EROOT}"/etc/sandbox.d #265376
-	fi
-}
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
deleted file mode 100644
index 29827378c0c2..000000000000
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-memory-corruption.patch #568714
-	epatch "${FILESDIR}"/${P}-disable-same.patch
-	epatch "${FILESDIR}"/${P}-fix-opendir.patch #553092
-	epatch "${FILESDIR}"/${PN}-2.11-symlinkat-renameat.patch #612202
-	epatch_user
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	local myconf=()
-	host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${ED}"/var/log/sandbox
-	chmod 0770 "${ED}"/var/log/sandbox
-
-	if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then
-		local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-		if [[ -n ${old} ]] ; then
-			elog "Removing old sandbox libraries for you:"
-			find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then
-		chmod 0755 "${EROOT}"/etc/sandbox.d #265376
-	fi
-}