Merge updates from master

2026-07-17 11:04:10 -04:00 · 2021-05-09 18:20:15 +00:00
parent 4fa7764f05 bc7199463e
commit 7bc3559e5d
31 changed files with 786 additions and 123 deletions
--- a/app-editors/visual-studio-code-bin/Manifest
+++ b/app-editors/visual-studio-code-bin/Manifest
@@ -1,9 +1,6 @@
-DIST visual-studio-code-bin-1.54.2-amd64.tar.gz 98888733 BLAKE2B a02fe21cbae80d479cebab17a3718b0f8980e5caab6abf6b33c44770a580a9cd4b384f21db367c91d3150ab4e4f299d404b8dc940bf721e773d39c4ba282f822 SHA512 80b9bd88524286715dccdd6afe0508247316a3fedbb35cd71a71ee4c3dff635eafc953879d39b3d9209030aa28a6dcdb80fe33228c22df2829e9997e979c9ab9
-DIST visual-studio-code-bin-1.54.2-arm.tar.gz 90226066 BLAKE2B fa7e076d6ab1168afbe0dad1cfeef752c8787f75e62a6d9140887fd9de7d8e728e8743d5473265a26747118016ad9c2f944242699707a362d4621332eb89e053 SHA512 0ed5c284f7d56ad09be76b7f53b3e8f11d9a74a0aa395b3cc74f4eaae73f3181bd532ccbeeee40bfbf913f516adf6a599ed4f9fe3de65820677e958fe4b6cad4
-DIST visual-studio-code-bin-1.54.2-arm64.tar.gz 103407705 BLAKE2B 0af7c16e0d184b3f836e9b5f4331c7227aebcec0e22ef1733899485faf343df0d3af5a3a333a88c95a0e0e57b611331aae9d9dcba88adf758880baae41fe04b2 SHA512 aca940cb68e664a7c2a6bacfac5f01c748fbaf8ed15f3c633c2f6bc12e1d42524235c7dc153f60e656017229248a7be03c2b3dbe32b69816e89071eb4876fce9
-DIST visual-studio-code-bin-1.55.0-amd64.tar.gz 97525604 BLAKE2B 732b7f0986ee8855cc84eeca3e6a8ead35c38454755146876f670dc5deafb334a4ab2862caa8602d3821ea5011d26f4d8a08d3152814a567b635d604ce149b63 SHA512 f4c159fbee0a22727326fbb692f0b6a6d409e8a15c2472dfe2e6467e440108089cad9b1ceb48aa25c85de6ee2bfe24879862b50c7b1eee810e3c5ef50f972ba3
-DIST visual-studio-code-bin-1.55.0-arm.tar.gz 88836120 BLAKE2B 67e988161b42a57cb67ab03181415c0f65bf3e1e6c036550f7fa15f033c3944357476d4b4bb4473c07ff9820c667a73e5451f280848d794ab9ac15209c67510f SHA512 177b8697a1e1f58aaa28987bf2728eab0d52858451d84b031d44ea9678e38c87a3d5b12837a829303a9f7e8d76c2b71cc48b32a18cf0c04739e036c9b6cff80d
-DIST visual-studio-code-bin-1.55.0-arm64.tar.gz 102041107 BLAKE2B d43a7bc4018ff05a7dc2efdb2e4ba1dd4865897726435a20ef9f12831b0e378918eb7774ac3dafaa474f18e485a66feb572842ec9196f7231f1be5671f1bafdf SHA512 1673c9bc4ea3619d62d5c503366babbd7f3c6a5ce7d0db42c26bd8d428ee961bb669177eec8a29748791023e992504a87bd2db46fbfe93015ecfcf99aae6dcef
 DIST visual-studio-code-bin-1.55.2-amd64.tar.gz 97507317 BLAKE2B b9278fe79e07a7884827a90c6d177819a8b81967cdfc1e9dc715c0d51a48e2c12980ebe994b64df125d33559a70beb38f6214c849a9204c82c75421438fbd70f SHA512 0f3727eb505b5ca2cdec8cc708ae88ba2028d068d7f69df35144b3c43dc8a1a5bbbd7471092cf8e2848018661496eb55442fb18e7e0595436f28502c94537556
 DIST visual-studio-code-bin-1.55.2-arm.tar.gz 88826643 BLAKE2B c128e483545bcd709783c3e5f323fe98d93f28a84d2eeb6651102fba91182264716208a23d284e4858d19f5c1602f40bffea60d2f4c6fb72aafaf5f44560ee8f SHA512 1fc03b563ec69d53429e4ae1d1c6dd60bf72c439c66c0300287c393acc224fd77f2a596fd90a23205007ba6e5bcea105009e971b19ad032db0ca66c45c171417
 DIST visual-studio-code-bin-1.55.2-arm64.tar.gz 102015928 BLAKE2B f55928101bf728071384747bdb70a82aad6e7bff9cf506d2284e48fac3e21acb64dbf34bdc9023dd4af82f0f53d51e2f0b985be9c76c7c10309673794d86430b SHA512 2e311c490fc01c9db00cc275d55f1f9c16a622259bd2f6e5e6a16c5bbfee7b06f01f35055eff97415f05c033112a0f3f48779c1d2c55a8685f00ad301da9bbaa
+DIST visual-studio-code-bin-1.56.0-amd64.tar.gz 104815337 BLAKE2B 35c6127eee1b49d5cd5f8a05cd8cdabaff462e888407ff0b01e9a836fa9cfb3d7730cba54a597987e99a6a71b02dd4d726c9e091f0f13e98ba4c7f52825e9fdb SHA512 07fe0dc5b4d523200cca1881f20ec0184fd05dcaa1cd182e98dc08caf1461f90c0bb1bde3d3a4f1c503a143788e635c02362f87c0299ec0df35f509b2126326b
+DIST visual-studio-code-bin-1.56.0-arm.tar.gz 95386242 BLAKE2B 10ef5ea2d7532ba94408ab5fa283e13265d03bf4b3d045daeb042ccbb98d9a6fea30d93c5d838b31066d97e89c32859e098e35f113d90b90dd696f8a84a5c803 SHA512 d363fa207fc2edcfa6f4260a8420b11b36ff1654dbd68462ddfa2334f294bd6d77747ce3c2aa701741ecc8ffc93c602da510617db9c8866b5f851f9757ed860f
+DIST visual-studio-code-bin-1.56.0-arm64.tar.gz 110173307 BLAKE2B 4467de717d2e8edeec08a3f6dc212e4a3f84dfc482804a162171614663e05c869fdfbe64abe34bc3185a0357a55289b19416419a1f62a61341e97d178d6921de SHA512 91d2da505913214a0f09fbacf45d4576a4f6ffe38dc2b653feea0bc816ad87089ff84f9a2129536cf4f902c86675447b19862658318f018a1bd45fe952f9fb58
--- a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild
+++ b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="MIT Microsoft-VSCode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret[crypt]
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libpng:0/16
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libnotify
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-QA_PRESTRIPPED="*"
-
-QA_PREBUILT="*"
-
-pkg_setup() {
-	if use amd64; then
-		S="${WORKDIR}/VSCode-linux-x64"
-	elif use arm; then
-		S="${WORKDIR}/VSCode-linux-armhf"
-	elif use arm64; then
-		S="${WORKDIR}/VSCode-linux-arm64"
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-}
-
-src_install() {
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}code
-	fperms +x /opt/${PN}/chrome-sandbox
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
-	dosym "../../opt/${PN}/bin/code" "usr/bin/code"
-	domenu "${FILESDIR}/code.desktop"
-	domenu "${FILESDIR}/code-url-handler.desktop"
-	dodoc "resources/app/LICENSE.rtf"
-	newicon "resources/app/resources/linux/code.png" "visual-studio-code.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "You may want to install some additional utils, check in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
--- a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.56.0.ebuild
+++ b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.56.0.ebuild
--- a/app-misc/watchexec/Manifest
+++ b/app-misc/watchexec/Manifest
@@ -9,6 +9,7 @@ DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clearscreen-1.0.3.crate 151886 BLAKE2B 2eee61e0c2d9dbfd525227ba4c8647b899f492729e5453bcabfd4fcc89d270963c96e60af56ddc498662a7951d6fcc5b97ef12927232991931fcfb309f4800dc SHA512 8fdc68026d49860f558bfb6521dc60d607c8f74642e32467676068138350f27bae99df7a461c0e3a01c97cb5ab098abf2ed319a69787c767f257419cd89a6458
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling-0.12.3.crate 18933 BLAKE2B 1f817e2f32b8fc6459cec4f05933ad734720ade175c9cd44767b3351f1c07f2a66dedf1c3ce40c14b30d2c18204355d6a2ad65b819c4ead143b4d26b1e6fbd17 SHA512 1e986c70d629e14d67ffee4e9ec1520c04f6f27599dc3a2df3312ace3ef81f435bff9a8573badb8385bddee188db8eaefa35f562fb83a14269e82c4a425eade0
 DIST darling-0.12.4.crate 19031 BLAKE2B 460587ac5f11ce01116da6c07c1bb0c94da24bd5f3003de028ff772af2111ffc3ec4db1fcb4e732763c441dd8c449297c778854f8b40387b311b3d5086263c67 SHA512 12358298bbbe4c18a6b8b1ff838c210806980973f7fa2307af97f0b33df2e3f1bb43dc2b990b5e8bbdd4f8ec97e1785ece556ada8ad6d6957f9dfb37316ab7a6
@@ -26,6 +27,9 @@ DIST derive_builder_core-0.10.2.crate 24691 BLAKE2B 4336ef5879dad9dc442b771644df
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
 DIST derive_builder_macro-0.10.0.crate 6210 BLAKE2B 6a8ad9113bc5685ec57ff0bab162bcf057e8179c0a6cbb3b484b763fcbdeed451f46e6418545f2751c30d8463b0d6dcad6b6a4bcafb8d5df901dd0fe64e8acd2 SHA512 2dc7a33d6009006f736fc06502377ef06b818280811fae3ec946bc80a77457f6b586c2cfe7bdeeb1dbc29d970319c0575d693ec679e27bd7e3c4a029c1a55b5d
 DIST derive_builder_macro-0.10.2.crate 6210 BLAKE2B 00de51ccd227cfaf16cf7f35c8144c7be63dca0584afcf528aae862cd15d73d4d59549d3f8dd39990fef43cdf601cdd5232cd8b9d0a925e28c1edc3ec505695b SHA512 36356bf7e2f6c56b0856c1df0c04388d8d0d1f6e5843396276c3cc2b2c39cc649d6cb08f54b91eb0e2fb3dcd30a9dcb29e98f769f840ca725c9e9a62dc3827eb
+DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST embed-resource-1.3.3.crate 10472 BLAKE2B fcb0e869b2e49a53644d4f2b6bf82be0b50b54c69905b650c3f4aa51d697dc70e47a095420045b7134c6116d1559556de13d959612225799ef0ae3ea894a772c SHA512 a979520d08c823e77d9d3ffdd3ded74c235c2eebe16aef07180f4c0b39ca2a603cb538c45f1ce76d28b682c33856f7f9a1dfcd4c0a1e31c054ca79facb5b2741
 DIST embed-resource-1.6.1.crate 12283 BLAKE2B d5d864f88e8304d9d590f9c34c77bb423a841b9827ec0fdc32eb8b3a65680aa8383b68d6d7b9a78ddfcdd4819d177183fe76732ac6c9c23b5eb964269fbbd140 SHA512 12ebaa77ede4c5e7ae2629e96c1ecbd9aa6cc1223e322363e56b517bca4a89d789bb67f6d28b7c2c54ade7a0442e6ad7d57dc79dff6e80909a6d87869b702fb1
 DIST embed-resource-1.6.2.crate 12401 BLAKE2B 6dd36525acac8f69146914d1d8788589a07589775d88db8df3fd14875c4946cacbe78be48e74e442d992d278a69262af131a9ec9ca546bcf711ae93cdbdc9bfd SHA512 4bfb51208acfd469e3eb2ac21a266d7041e62838fc7c505f1853cd5766c2ab00fd0c7aeac01dffbca05e28842d20120d19984ab6d2c7a023dad61a1d2ff30c6b
@@ -39,6 +43,8 @@ DIST fsevent-0.4.0.crate 7292 BLAKE2B e55fa22bca32165c17ab1cf623311de85d1c1cd78f
 DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d121b046b7b70b4ab6bd1913398967a1019422a0796398fc4f759cc2d326f656c003d9f2f47b63c884650d8513bd SHA512 4c7f96586c4564f804390c3ad22388456a138bef1902a5985463515ca9b56976fc14c993f08ac188897c449b2d2843890c2357398eb3ef5eb064326881e7167d
 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.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
@@ -68,14 +74,26 @@ DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
 DIST nix-0.20.0.crate 216983 BLAKE2B cb7dc3a6b61abb66645613f16a22b5f127fef38bff5ad40fa99ef50019bc40da7f40457af9dac08af5dd67644c2a102ee6ca99425077ac7e2024c89387587752 SHA512 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
+DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST notify-4.0.15.crate 54853 BLAKE2B 28eea05ff77e8790ce6e3acff74deafa95f119b5ee2af0a7e48d10ff04fb6bc1be9495925cea0fbaca3391a22b51e1800a730a0208f8a4a2b82ce5ed2a49fec3 SHA512 f1712718d00168fccea41aa5e79dd2c3551dd530781f4c589fa787237e6206b738e331dc9100e00d39dbe139230fdbe97b9bc73b076effbdf91f2815a1615398
 DIST notify-4.0.16.crate 53902 BLAKE2B 4155fc7986f6a5d617f5dc3e5a41c4b03ffb9df1aa1a4d948ea1cbe42f23d5348710bff55f6a70bffc171985568a6d4fe697bbf92226947153e9e959786c64bf SHA512 7c8ceda432db562d2d261ebf1b18a8ac323bb05d1a7df1caafdc5a0c409edd3a04d84da1761fea8ceb41e4717600c3572ac9257458af0a19b17004ec0496376f
+DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
+DIST phf_codegen-0.8.0.crate 3192 BLAKE2B 65c733fb896fa034c97482d122a2ed4c39d763cbb65ee48a229cdb320910aefeef125674bb1305a4a12f5fccefd71f859e33cb26c3e6be09ed8f776f9ff9b463 SHA512 6649779b50683b1b83c89da921ee52963fd517660540148e9ba4b59f9639c705e08400c4da972880ed161564816c7ad45704d6bd51d1429717137de8f46cb941
+DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462950f6280d9cbb8c8ae9253d3197f25b8173c202cdd51c4a2d3f422ca1d6f5c9055e7a87e45b2dc5fbe5aa6aa45ce SHA512 de045f47567defd43fe32fc62191a9a892e5a478e1a84b853cff3005e94967ded68e5770eacb43f2e97e58b8f4283327a38a3bdbd55e1d5c708dab601ea66270
+DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_syscall-0.2.6.crate 23631 BLAKE2B f594cc615c2c05a053598e6a1bec6488b7972dae2680afcc1012ccbae6cc79169775c0ec8a0ff526846b05222d5be18785d495b964ffbf97fe2e2812a29ea75c SHA512 91137f511d6fd9a7acc755c63703cfba021a2fbb8fec3ac25a4a4b2e67147f4d5dca6cb53c2d49ca0824af3b536c63f617855b08ab345b201070885e082251bf
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-1.4.6.crate 242248 BLAKE2B 4e54699a290fe8952f718709292c726167fa5064407dba2f9e8ed7ba98aee9333bb1ee807c104916b33cbb27eacc6e36b673a23ad0e5af8aefc189b4a5993ea0 SHA512 e789ee66bc37d44efbf9e9c210c3ddc371d9483d6f96d7367b861ee0e0abb5c8abf6ebcad9d3c3fb97f772a5ca91184ca6d36a1a78dd51b43f3279e4048c299c
@@ -83,6 +101,7 @@ DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST siphasher-0.3.5.crate 9455 BLAKE2B 73a09ba949dc4ea670a01e4cfc4f34d8f6ab53facd656beadda396fee087b36afd895e2acba5fecb796fb629b0f56bca84f971970c2f771ed84f74f667f9708d SHA512 4887f7b7b4c0df55c185249a16041052e16ad1f7c80d69ca69dba76af7b25095f2ace3d5b2a33346797f74b63c476a67055929c2856a6b4dff60e8fe2147f8ae
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
@@ -92,22 +111,30 @@ DIST syn-1.0.70.crate 232235 BLAKE2B 82419a782ae7b18aed56d2fb72c75fc327916f9e45a
 DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
+DIST terminfo-0.7.3.crate 48821 BLAKE2B 73c01dc5104a1df1a48ae7c407da7a5600598b86a9df82beb7da3d484c97d8bda3d18789dac558d64f27cb30de4a8d381f6632a09d4982731830b1d16aabb4ee SHA512 9382e8846401b9717dd6fd8ea223ce46a3534466a21ded2325b2d7525a685e6bb588e1110ca421b63982e1881ee3be94b89e594b56e24977e1a185fc361ac735
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
+DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.0.crate 15589 BLAKE2B ee13d0c15323c32d1fba2a952860042f4500c5809a62d27b33d4cfdd7be8099cd04041267bbb61c61bb84fea0892dd6e81b5ee7ec69b19334f31048d8b8c4989 SHA512 f4c4c080c25638c7ea5e96ac42d71bd92752e1fed92234f194d6b597b0f451dc19c44ae28f436aa93e5cff94bf2102e49dbec600d64d3c00c9bf03f98d3ad30e
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST watchexec-1.14.1.tar.gz 40128 BLAKE2B 52764abd1dc669b32a5903e4c4463a72670de511dd95d6d041174b5eed2616c453cfdcf5fc7ba997b73e981c378d9674cfee34690122e4cb693ca6ba816a94c5 SHA512 93cb5d2d34499f8214e5af2cad0491184d60e084b4729381a3fa73065612889519467f7977a96ffa8f8b4bebc82a0f453e3c62be2936903f5152e8ac1a061d73
 DIST watchexec-1.15.0.tar.gz 40407 BLAKE2B f737e8c84da491962f480149ffd02ccfe934423f223215f05b50104794d2901ccb7575a31de8e31f80e817f4a3d450549c633f6371dde6311707d717610dede3 SHA512 5384abd8807557446c1835ecccba058d6129b9738cb819dea28d9042a8c25a1318cd9a54155c6ea63cbb649f63439142005cc2531ea8881440c0496a8a228c25
 DIST watchexec-1.15.1.tar.gz 41762 BLAKE2B 8f575016ade0d391e01f237441f239e17618441a32d23f70ce40a991ee1d41fe0e000ec7c8303ee0cbba7a42a9ff963df48e508696f0f415d0e1ec4f3f802f32 SHA512 f57cc9af381974e50318840c4df318545207bef31399cb2566298795b7e1b85e815abee295ac0fc489df06fe94e2839b8c811a5339cdd2d27a98385d7a221e5a
 DIST watchexec-1.15.2.tar.gz 165409 BLAKE2B 5822960f044b02dc87289b592a461e3fa4314e7a2dc0bf1cad0b259d2cbced3890beda7685ab8262dcc5760fdf564ec2f5c14bafdf0bd2db0a5157c922ac138e SHA512 ad744cb6a8d789ac19b03c1c7c37c41c030afcd212dbdd62815c128af49ed720a161ebab20f31f8366205bfc608614f71e97815718c75b097f6151d29f2ab2bb
 DIST watchexec-1.15.3.tar.gz 165411 BLAKE2B 39ceec055886eb13c971a29cad4851042a0ecbb6d04b5d8b1a3e0b3ea098fcb06aca658fd3d3c6bb38aaa86c5f6c1bcf292ae5f2aa99932da86c1299ae7eb262 SHA512 4e8a16c96b7450a2af3f74c19a351a0eef35ff5841e6eab5f4591558b986ea9a5179c98a279d037845d1e771196d61768eab638d081ee3d27cd609904c436f53
+DIST watchexec-1.16.0.tar.gz 167728 BLAKE2B a9ff05f82bea185a5365052525a061d3d8602e87d637b41c0e1a0608d4790b5d251e08f92fba4475eed06b78227d5d49a51b633baf75074cb73ec1f8d4e20c58 SHA512 d3873c02fdec4e0f64b8325be828f12738d14ac5e7df8f849d40f03b70dd9c0a777ad658672e972d416f6d98a717e900fc873d07b58733d3a4b77ac8cacb6082
+DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
--- a/app-misc/watchexec/watchexec-1.16.0.ebuild
+++ b/app-misc/watchexec/watchexec-1.16.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.15
+bitflags-1.2.1
+bstr-0.2.15
+cc-1.0.67
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+clearscreen-1.0.3
+darling-0.12.4
+darling_core-0.12.4
+darling_macro-0.12.4
+derive_builder-0.10.2
+derive_builder_core-0.10.2
+derive_builder_macro-0.10.2
+dirs-2.0.2
+dirs-sys-0.3.6
+either-1.6.1
+embed-resource-1.6.2
+env_logger-0.8.3
+filetime-0.2.14
+fnv-1.0.7
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getrandom-0.1.16
+getrandom-0.2.2
+glob-0.3.0
+globset-0.4.6
+ident_case-1.0.1
+inotify-0.7.1
+inotify-sys-0.1.5
+iovec-0.1.4
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.93
+log-0.4.14
+memchr-2.3.4
+mio-0.6.23
+mio-extras-2.0.6
+miow-0.2.2
+net2-0.2.37
+nix-0.20.0
+nom-5.1.2
+notify-4.0.16
+phf-0.8.0
+phf_codegen-0.8.0
+phf_generator-0.8.0
+phf_shared-0.8.0
+ppv-lite86-0.2.10
+proc-macro2-1.0.26
+quote-1.0.9
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_pcg-0.2.1
+redox_syscall-0.2.6
+redox_users-0.4.0
+regex-1.4.6
+regex-syntax-0.6.23
+same-file-1.0.6
+siphasher-0.3.5
+slab-0.4.3
+strsim-0.10.0
+syn-1.0.70
+term_size-0.3.2
+terminfo-0.7.3
+textwrap-0.11.0
+thiserror-1.0.24
+thiserror-impl-1.0.24
+unicode-width-0.1.8
+unicode-xid-0.2.1
+version_check-0.9.3
+vswhom-0.1.0
+vswhom-sys-0.1.0
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+which-4.1.0
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.8.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo
+
+DESCRIPTION="Executes commands in response to file modifications"
+HOMEPAGE="https://github.com/watchexec/watchexec"
+SRC_URI="https://github.com/watchexec/${PN}/archive/refs/tags/cli-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+LICENSE="Apache-2.0 BSD CC0-1.0 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-cli-v${PV}"
+DOCS=( README.md )
+HTML_DOCS=( doc/watchexec.1.html )
+
+DEPEND=""
+RDEPEND=""
+
+QA_FLAGS_IGNORED="usr/bin/watchexec"
+
+src_compile() {
+	cargo_src_compile --manifest-path=cli/Cargo.toml
+}
+
+src_install() {
+	cargo_src_install --path cli
+
+	einstalldocs
+	doman doc/watchexec.1
+
+	insinto /usr/share/zsh/site-functions
+	newins completions/zsh _watchexec
+}
--- a/dev-R/cli/Manifest
+++ b/dev-R/cli/Manifest
@@ -1,2 +1,3 @@
 DIST cli_2.0.2.tar.gz 116357 BLAKE2B a6eba3e12e63ea37dcd139c1e70d318f0478e6b3ce39c6172d85fe64d622366c58878c6d80da0afe52ce2823e156f5007c33576e937418f3460260528788a515 SHA512 c5a398a35bfbc43b618b97477ef97785c674c1aad03fcbf20786f1eab057cd5f21da430ffa69161d14a331b2e538d8dc75b6a3a2699db799b1441dce31d3761e
 DIST cli_2.3.1.tar.gz 134171 BLAKE2B d8de88269c28f0982814c03be70a5e2410e3c8e8f4db814592318c4c3c2002b727ed9aa02fe138db46e64f21e158bddadd15482bbb7ff31775faa9ff37e99ed3 SHA512 37cbe182ae855f06b75dcad589b9bb35d44b2ea3acb8ffdbcb2a0b704168d8a72c72daaa5d2ca98f2cd0dc2f2def7de43760552edaafa1e21929e313f93247c8
+DIST cli_2.5.0.tar.gz 158156 BLAKE2B 7d62691bfccc458956c5d0d7f28f44485025dcf6f4cdb7974037db63102c048fb867a46f9b25447ad4711fb0d1f40d44fe1adef7b7cd918b81fdb638b240a322 SHA512 de61ae17dd8d2b5557ac90c69ba6d31c477b0dc76cc28912c20102032e6ced0205c22e4b88828c511e029afd519e246e1956876590ad9ec715df9396c539b6d2
--- a/dev-R/cli/cli-2.5.0.ebuild
+++ b/dev-R/cli/cli-2.5.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit R-packages-guru
+
+DESCRIPTION='Helpers for Developing Command Line Interfaces'
+HOMEPAGE="
+	https://github.com/r-lib/cli
+	https://cran.r-project.org/package=cli
+"
+SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
+LICENSE='MIT'
+KEYWORDS="~amd64"
+IUSE="${IUSE-}"
+DEPEND="
+	>=dev-lang/R-2.1.0
+	dev-R/glue
+"
+RDEPEND="${DEPEND-}"
--- a/dev-R/dplyr/Manifest
+++ b/dev-R/dplyr/Manifest
@@ -1,2 +1,3 @@
 DIST dplyr_0.8.5.tar.gz 1378766 BLAKE2B 5093e178aa882913800d07c502aa3e3107d4152060e0070229091e483164493a94b1bc37f6f00d97641133b01301c013e81df38c8108954bce431447c298dd73 SHA512 08269e59c43aacc5959d516c1fed45d3dbbe0912aa92263ff8eda6454f216a739ea5989088852cf2ab60bf06fc8aea524557258df786e16b81f5f785cb627105
 DIST dplyr_1.0.5.tar.gz 949019 BLAKE2B bbe96dc33004e286662149e4787abedf510f052f791e66481f95201c10396aabc5d6c70c173507924192dc642e1ebc0b5ac9c402092101b70a200bdba0f79669 SHA512 13e505b73d7e9dc5664154d483fd677e4bc245123685a3817d64646e78eb2ccef9cc1080f23ba7d9dd7a58ee59c025e9ab449d48c095717f662c1adcc49a4282
+DIST dplyr_1.0.6.tar.gz 954401 BLAKE2B 02b5fd32ead06504ad69b074bdc0ed6d105d3655a16420aec6a0397e9a4ef77e7d0318af199ca98a333fcd3d3a6cbe37e55be651023fcc130d1affbc47a09aa5 SHA512 e09f5c3b5e215926f7c96eeb705e79db73eae147f557c386bc18e47f0407bac4c1c795c842aa1e152707ae3f2d7de21f8e9984ea9fc9a59addb1cb04a6f65d89
--- a/dev-R/dplyr/dplyr-1.0.6.ebuild
+++ b/dev-R/dplyr/dplyr-1.0.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit R-packages-guru
+
+DESCRIPTION='A Grammar of Data Manipulation'
+SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
+LICENSE='MIT'
+HOMEPAGE="
+	https://dplyr.tidyverse.org
+	https://github.com/tidyverse/dplyr
+	https://cran.r-project.org/package=dplyr
+"
+KEYWORDS="~amd64"
+IUSE="${IUSE-}"
+DEPEND="
+	dev-cpp/plog
+	dev-libs/boost
+	>=dev-lang/R-3.3.0
+	dev-R/ellipsis
+	dev-R/generics
+	>=dev-R/glue-1.3.2
+	>=dev-R/lifecycle-1.0.0
+	>=dev-R/magrittr-1.5
+	>=dev-R/pillar-1.5.1
+	dev-R/R6
+	>=dev-R/rlang-0.4.10
+	>=dev-R/tibble-2.1.3
+	>=dev-R/tidyselect-1.1.0
+	>=dev-R/vctrs-0.3.5
+"
+RDEPEND="${DEPEND-}"
--- a/dev-games/godot/files/godot-3.3-fix-llvm-build.patch
+++ b/dev-games/godot/files/godot-3.3-fix-llvm-build.patch
@@ -0,0 +1,36 @@
+diff --git a/SConstruct b/SConstruct
+index c30f533..388be69 100644
+--- a/SConstruct
+++ b/SConstruct
+@@ -174,6 +174,8 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in Zstd library", True))
+ # Compilation environment setup
+ opts.Add("CXX", "C++ compiler")
+ opts.Add("CC", "C compiler")
+opts.Add("AR", "Archiver")
+opts.Add("RANLIB", "Random Access Library Indexer")
+ opts.Add("LINK", "Linker")
+ opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
+ opts.Add("CFLAGS", "Custom flags for the C compiler")
+diff --git a/platform/x11/detect.py b/platform/x11/detect.py
+index ba5fb30..d907701 100644
+--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
+@@ -129,7 +129,6 @@ def configure(env):
+         if "clang++" not in os.path.basename(env["CXX"]):
+             env["CC"] = "clang"
+             env["CXX"] = "clang++"
+-        env.extra_suffix = ".llvm" + env.extra_suffix
+ 
+     if env["use_lld"]:
+         if env["use_llvm"]:
+@@ -189,10 +188,6 @@ def configure(env):
+                 env.Append(CCFLAGS=["-flto"])
+                 env.Append(LINKFLAGS=["-flto"])
+ 
+-        if not env["use_llvm"]:
+-            env["RANLIB"] = "gcc-ranlib"
+-            env["AR"] = "gcc-ar"
+-
+     env.Append(CCFLAGS=["-pipe"])
+     env.Append(LINKFLAGS=["-pipe"])
+ 
--- a/dev-games/godot/godot-3.3.ebuild
+++ b/dev-games/godot/godot-3.3.ebuild
@@ -56,12 +56,11 @@ BDEPEND="virtual/pkgconfig"

 PATCHES=(
 	"${FILESDIR}"/${P}-fix-llvm-build.patch
-	"${FILESDIR}"/${P}-fix-CVE-2021-26825.patch
 )

 src_prepare() {
 	default
-	rm -r thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zlib,zstd} || die
+	rm -r thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die
 }

 src_configure() {
@@ -74,6 +73,7 @@ src_configure() {
 	# Remove builtin third-party packages, link with system ones instead
 	myesconsargs+=(
 		builtin_bullet=no
+		builtin_embree=no
 		builtin_enet=no
 		builtin_freetype=no
 		builtin_libogg=no
@@ -93,6 +93,9 @@ src_configure() {
 	myesconsargs+=(
 		# Mono bindings requires MSBuild which is only available on Windows
 		module_mono_enabled=no
+		# TODO: land embree library (https://github.com/embree/embree) in guru
+		# so that we can enable raycast module
+		module_raycast_enabled=no
 		module_bullet_enabled=$(usex bullet)
 		module_enet_enabled=$(usex enet)
 		module_freetype_enabled=$(usex freetype)
@@ -138,6 +141,6 @@ src_install() {
 	insinto /usr/share/metainfo
 	doins misc/dist/linux/org.godotengine.Godot.appdata.xml
 	insinto /usr/share/mime/application
-	doins misc/dist/linux/x-godot-project.xml
+	doins misc/dist/linux/org.godotengine.Godot.xml
 	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
 }
--- a/dev-lang/gleam/Manifest
+++ b/dev-lang/gleam/Manifest
@@ -55,12 +55,14 @@ DIST futures-util-0.3.13.crate 138948 BLAKE2B bc19faa2167da4cc2612cece11a9935211
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST gleam-0.14.4.tar.gz 256185 BLAKE2B a3271ec372bc823ecd866050181d9e7e4ae79faf00ce1406be674652e82866fa165d9173bf738742b49b2c4b0daad82536ea7c9b6838316692b7649d17c438cc SHA512 47b8d028f749bc5f5c92b6b126daaf3ffcb5850867dfeff4498f4174364c1709ee31133861f4bfc96661d1afced732541037e2553fc7aee555773028f9433bb9
+DIST gleam-0.15.1.tar.gz 268807 BLAKE2B ab437351196c5e86083da3add9ec1c64351c6ca440b143bf4c138e0a8a2aff7848f06c86ae0387bb3967d68d0cde2d019d73949cca1c78710d754adc477049a2 SHA512 8b18f8c8de8f6554379fbcff06195ce202a38729f761d78320793e9737572e97b1b799d559c0cd221476ef3ea07047bf890f4c5756a0ba9a19f74cc1cc870677
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST h2-0.3.2.crate 158590 BLAKE2B aa10bcb70279be4034b6eb6e9084578c0da3851025f6e45f13ae5785c6618d00db021f021784448228624ab43023d38a49c3b51ab6a3917231446a078eee069e SHA512 0b85b011ddac37dd7f3c7b7b36a453418fe63632e77f163ac32816d58b9537b28d49e31fc2e117bca53970ac613e67d0093374bcf57c0492b8200d3b8b27d39a
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hexpm-1.2.0.crate 163791 BLAKE2B 458ef234c7fbf6d9b44b8d11e2313c7b19c5dc55f7c335b0c2554dd63df0a9790149090b941f70c82824b5f9814477c176113ac33ecb1d4f012dc09ebf9bfe7d SHA512 d379dae612affef00a2e71a2551775173004b812d1960690dacb07f98e5cdfa8ebbb1c5f2c455d9e05befa5c6747e4500df03e59ce4743ff9b2fb81d2c3f8cd1
+DIST hexpm-1.3.0.crate 241723 BLAKE2B 3714dc324978e2de33e4bdfa1db04519ef09b6f7e65451d5722d24e25f14cc6c3e919a5ebba136e0a59b7ecaed48161a65e9bb00ed5260c879b54b2531610d88 SHA512 f1aa49bf66c40485ee4f86c9424b881ab102db5ab81bcad41c53c61f35fb9553023ada07f910e8904c65b6b3bfadf01ff3b27528aa3314b33ccba002b628d8b8
 DIST http-0.2.3.crate 105044 BLAKE2B 09fe8f34e326833490d33dfce68faac450b7d29b374a38de1b8c19c652d9fe85078ff890908e775d5a2c91e322cc96e1685d7fbb1f778fd5cc662734723dd383 SHA512 55a5a19489b263b5703c7acde376d67fce8be3c563c3ca5c6a2d0c6f0d7987e3bc869fbf6bdcec18633a256fd02e8b87aef2a6675aaa2cb55a4dcb60b13e3483
 DIST http-body-0.4.1.crate 6792 BLAKE2B 462329c293946394b5bcf5deec9ab13a9afc34beaeff85bd7bc9cf23e09f0903d4d1921d648a732ffbb9a5d2893f1c1dfa3478ffd375d840cbaee2c803a971cd SHA512 1c26d924feb0a7f713e5726d51158461849a4b273881ae4e53904e284488f31b01e941a3a4e9ed6e07b5f248a8e476fd6bc4038706aaad31d8489fa14d5e50b3
 DIST httparse-1.3.5.crate 24018 BLAKE2B cda285741546f46ff297c8b866f3b107f683abf474de559966ec2bf6be9b0292463831583273fd97d8ef90693c2ceba4756a82d0020ff366e47e8b95e621f82d SHA512 80b73562c99cb82341f400bb2e66a70eed0c02826749fc545f56c97e33aa6634a26d358f0d381596428bf57eb1fd7d5ea0c4f2bc233e915105e03771c11128b8
--- a/dev-lang/gleam/gleam-0.15.1.ebuild
+++ b/dev-lang/gleam/gleam-0.15.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+	adler-1.0.2
+	aho-corasick-0.7.15
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	arrayvec-0.5.2
+	askama-0.10.5
+	askama_derive-0.10.5
+	askama_escape-0.10.1
+	askama_shared-0.11.1
+	async-trait-0.1.48
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	bitmaps-2.1.0
+	bitvec-0.19.5
+	bstr-0.2.15
+	bumpalo-3.6.1
+	byteorder-1.4.3
+	bytes-1.0.1
+	capnp-0.14.0
+	capnpc-0.14.2
+	cc-1.0.67
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	codespan-0.11.1
+	codespan-reporting-0.11.1
+	core-foundation-0.9.1
+	core-foundation-sys-0.8.2
+	crc32fast-1.2.1
+	crossbeam-utils-0.8.3
+	ctor-0.1.20
+	ctrlc-3.1.8
+	data-encoding-2.3.2
+	der-oid-macro-0.4.0
+	der-parser-5.1.0
+	diff-0.1.12
+	either-1.6.1
+	encoding_rs-0.8.28
+	filetime-0.2.14
+	fixedbitset-0.2.0
+	flate2-1.0.20
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fs_extra-1.2.0
+	funty-1.1.0
+	futures-channel-0.3.13
+	futures-core-0.3.13
+	futures-sink-0.3.13
+	futures-task-0.3.13
+	futures-util-0.3.13
+	getopts-0.2.21
+	getrandom-0.2.2
+	globset-0.4.6
+	h2-0.3.2
+	hashbrown-0.9.1
+	heck-0.3.2
+	hermit-abi-0.1.18
+	hexpm-1.3.0
+	http-0.2.3
+	http-body-0.4.1
+	httparse-1.3.5
+	httpdate-0.3.2
+	humansize-1.1.0
+	hyper-0.14.5
+	hyper-tls-0.5.0
+	idna-0.2.2
+	ignore-0.4.17
+	im-15.0.0
+	indexmap-1.6.2
+	ipnet-2.3.0
+	itertools-0.10.0
+	itoa-0.4.7
+	js-sys-0.3.49
+	lazy_static-1.4.0
+	lexical-core-0.7.5
+	libc-0.2.91
+	log-0.4.14
+	matchers-0.0.1
+	matches-0.1.8
+	memchr-2.3.4
+	mime-0.3.16
+	miniz_oxide-0.4.4
+	mio-0.7.11
+	miow-0.3.7
+	native-tls-0.2.7
+	nix-0.20.0
+	nom-6.1.2
+	ntapi-0.3.6
+	num-bigint-0.4.0
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	oid-registry-0.1.1
+	once_cell-1.7.2
+	openssl-0.10.33
+	openssl-probe-0.1.2
+	openssl-sys-0.9.61
+	output_vt100-0.1.2
+	percent-encoding-2.1.0
+	petgraph-0.5.1
+	pin-project-1.0.6
+	pin-project-internal-1.0.6
+	pin-project-lite-0.2.6
+	pin-utils-0.1.0
+	pkg-config-0.3.19
+	ppv-lite86-0.2.10
+	pretty_assertions-0.7.1
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.24
+	protobuf-2.22.1
+	protobuf-codegen-2.22.1
+	protobuf-codegen-pure-2.22.1
+	pulldown-cmark-0.8.0
+	quote-1.0.9
+	radium-0.5.3
+	rand-0.8.3
+	rand_chacha-0.3.0
+	rand_core-0.5.1
+	rand_core-0.6.2
+	rand_hc-0.3.0
+	rand_xoshiro-0.4.0
+	redox_syscall-0.2.5
+	regex-1.4.5
+	regex-automata-0.1.9
+	regex-syntax-0.6.23
+	remove_dir_all-0.5.3
+	reqwest-0.11.2
+	ring-0.16.20
+	rpassword-5.0.1
+	rusticata-macros-3.0.1
+	rustversion-1.0.4
+	ryu-1.0.5
+	same-file-1.0.6
+	schannel-0.1.19
+	security-framework-2.2.0
+	security-framework-sys-2.2.0
+	serde-1.0.125
+	serde_derive-1.0.125
+	serde_json-1.0.64
+	serde_urlencoded-0.7.0
+	sharded-slab-0.1.1
+	sized-chunks-0.6.4
+	slab-0.4.2
+	smallvec-1.6.1
+	socket2-0.4.0
+	spin-0.5.2
+	static_assertions-1.1.0
+	strsim-0.10.0
+	strsim-0.8.0
+	structopt-0.3.21
+	structopt-derive-0.4.14
+	strum-0.20.0
+	strum_macros-0.20.1
+	syn-1.0.65
+	tap-1.0.1
+	tar-0.4.33
+	tempfile-3.2.0
+	termcolor-1.1.2
+	textwrap-0.11.0
+	thiserror-1.0.24
+	thiserror-impl-1.0.24
+	thread_local-1.1.3
+	tinyvec-1.1.1
+	tinyvec_macros-0.1.0
+	tokio-1.4.0
+	tokio-native-tls-0.3.0
+	tokio-util-0.6.5
+	toml-0.5.8
+	tower-service-0.3.1
+	tracing-0.1.25
+	tracing-attributes-0.1.15
+	tracing-core-0.1.17
+	tracing-log-0.1.2
+	tracing-serde-0.1.2
+	tracing-subscriber-0.2.17
+	try-lock-0.2.3
+	typenum-1.13.0
+	unicase-2.6.0
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.17
+	unicode-segmentation-1.7.1
+	unicode-width-0.1.8
+	unicode-xid-0.2.1
+	untrusted-0.7.1
+	url-2.2.1
+	vcpkg-0.2.11
+	vec_map-0.8.2
+	version_check-0.9.3
+	walkdir-2.3.2
+	want-0.3.0
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.72
+	wasm-bindgen-backend-0.2.72
+	wasm-bindgen-futures-0.4.22
+	wasm-bindgen-macro-0.2.72
+	wasm-bindgen-macro-support-0.2.72
+	wasm-bindgen-shared-0.2.72
+	web-sys-0.3.49
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	winreg-0.7.0
+	wyz-0.2.0
+	x509-parser-0.9.2
+	xattr-0.2.2
+"
+
+inherit cargo
+
+DESCRIPTION="A statically typed functional language for the BEAM"
+HOMEPAGE="https://gleam.run"
+SRC_URI="
+	https://github.com/gleam-lang/gleam/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+RESTRICT="mirror"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSL-1.1 ISC MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/gleam"
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS} --cap-lints warn"
+	cargo_src_configure
+}
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,3 +1,4 @@
 DIST anyio-2.1.0.tar.gz 95186 BLAKE2B 5dcb110e0e3d543525bb5081c948124e0e0f6bb0a80038104a8ab793ecf961a56d56576ad96a78b0fb69f3c7731dea3d9573b757f859ee8e61e65490432b9b69 SHA512 923467cdfbf6d0f427345704e99aec44cafc21f78a8b3b88d1ca9be93fb52a77d472229a242664977a873faf05c7c47a44a55aa4d0158959f60bf4ac8a46cdeb
 DIST anyio-2.2.0.tar.gz 97217 BLAKE2B 7b50d997fd83950d16c0e562519b60dbef32bfd6d21e61583a83dd94edc26e27fcd26c7c630f22daaddebea5e148487db1a8c81e0bd82cf4641812dfac8807de SHA512 bca1265eec30830bea5f6fe15f3059793599e9c47d292b3008fcd86c802d76bd692f1a340fd6e3b0aa2401c38576459e516b3defa1ddf8353f18d51280fd73ab
 DIST anyio-3.0.0.tar.gz 116952 BLAKE2B d797afbd372d7e0ba3b9b5cd0c7df6d8c8a91e8616aa9af9abf6c7e20cb940592a50d6534eed63619c7a4ead5e431ba12238a0e8b78cc00949b0944012d687e8 SHA512 e677506cb5edfa86381a6e309fd6c1393d4280d3b31e2382b4adef1aef08b678a2418cbf669e9c5607f855066e72fdb9b3dbd196db10aa42a7ef6445ea737fbd
+DIST anyio-3.0.1.tar.gz 117725 BLAKE2B 9e9eb02e2891c59a82015db9a6be6e8d4e17dbca10dd72d4510572e11d88687fcbc0f3de571d7c58643cf9191591e655693c58ce73ce45fb1ea1b06e8a0dc5ec SHA512 e063727824c3cd53f4de4bf128a8b6b355b582ed7df533fb73a3306b1e561c096ecea24c6abb367a557516b1470e4f5122458a64f6c03257e4e54452cc5c84e1
--- a/dev-python/anyio/anyio-3.0.1.ebuild
+++ b/dev-python/anyio/anyio-3.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+# Build with USE="-doc" first because of circular dependency
+# otherwise one gets the error that sphinx-autodoc-typehints
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+DOCS_AUTODOC=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/curio-1.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.16[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
+"
+
+BDEPEND="
+	${RDEPEND}
+	doc? (
+		dev-python/anyio[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-autodoc-typehints-1.2.0[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv \
+			--deselect tests/test_sockets.py::test_getaddrinfo[asyncio] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[asyncio+uvloop] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[curio] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[trio] \
+	|| die
+}
--- a/dev-python/hunter/Manifest
+++ b/dev-python/hunter/Manifest
@@ -1 +1,2 @@
 DIST hunter-3.3.2.tar.gz 535119 BLAKE2B 25551f04d0b2dafa6875c5c5660d2c57417bdc113960ec2b8d224c88a6b9d08b38bfbbb2deb516e7a36704164318137f5675409850c2eeff2c486a819731c756 SHA512 e3b5e7a3729074cf52a7a209e6f54a1319b3e94ff50abe4e6d8f00f3953720e3c2380de066c2a0a4e56c7a348fdd947425ae19c8907bd420d10ffb271bc07516
+DIST hunter-3.3.3.tar.gz 535662 BLAKE2B f2aa247eec34de982ab56430a0517c483609edc72d3d366a725dabf28ff6621a49411dd41a7ae16846960bb22ec4a7dc1cdb2b528a620e9eac9dc26dabec6213 SHA512 661b0f33653a6175f2172e45386c822552464a06129e2f5c8d4b88f6142a4aecc69bd657dc98ef7ffbb3d93cde537aa3a2e5f68bbced6f03b6514d39cfb99df4
--- a/dev-python/hunter/files/remove-setuptools_scm-upper-constraint.patch
+++ b/dev-python/hunter/files/remove-setuptools_scm-upper-constraint.patch
@@ -0,0 +1,15 @@
+--- a/setup.py
+++ b/setup.py
+@@ -163,10 +163,10 @@
+         ':platform_system != "Windows"': ['manhole >= 1.5'],
+     },
+     setup_requires=[
+-        'setuptools_scm>=3.3.1,!=4.0.0,<6.0',
+        'setuptools_scm>=3.3.1',
+         'cython',
+     ] if Cython else [
+-        'setuptools_scm>=3.3.1,!=4.0.0,<6.0',
+        'setuptools_scm>=3.3.1',
+     ],
+     entry_points={
+         'console_scripts': [
--- a/dev-python/hunter/hunter-3.3.3.ebuild
+++ b/dev-python/hunter/hunter-3.3.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Hunter is a flexible code tracing toolkit"
+HOMEPAGE="
+	https://github.com/ionelmc/python-hunter
+	https://pypi.org/project/hunter
+"
+SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-${P}"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/aspectlib[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/manhole[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/remove-setuptools_scm-upper-constraint.patch" )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs ">=dev-python/sphinx-py3doc-enhanced-theme-2.3.2"
+
+python_prepare_all() {
+	# all tests in this file fail
+	rm tests/test_remote.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		"${EPYTHON}" tests/setup.py build_ext --force --inplace || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}"
+	epytest
+}
--- a/dev-python/hunter/metadata.xml
+++ b/dev-python/hunter/metadata.xml
@@ -67,7 +67,7 @@ From the other perspective, you'd be wondering if you could use Hunter to measur
 In other words, filtering events is the main selling point of Hunter - it's fast (cython implementation) and the query API is flexible enough.
  </longdescription>
  <upstream>
-    <remote-id type="github">python-hyper/hyper-h2</remote-id>
-    <remote-id type="pypi">h2</remote-id>
+    <remote-id type="github">ionelmc/python-hunter</remote-id>
+    <remote-id type="pypi">hunter</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/schedule/Manifest
+++ b/dev-python/schedule/Manifest
@@ -1 +1,2 @@
 DIST schedule-1.0.0.tar.gz 27992 BLAKE2B 620afa1d78065f189799e4deaae8a627d1698292cf885acdacdfd6688b8774ed155a13c8213bb0f6dfd70dec5e17ea317658f5d78e6cbdc87d670003c218e154 SHA512 79e350d5e5083bb6da70bbd12f4e8895a08fc79088f042fa9171aec48b8a45985f1638511136be2ee8f4aa92d6992978f8c85560867b6fa88a07383e952c8c4b
+DIST schedule-1.1.0.tar.gz 31873 BLAKE2B 6e33e862f94c72f32ae3bba566ad4a64428cc90f80ed6ff8d577a29717b3cc5f3c91195742cedfedbcc4090d955f343097f53ed69e9922775969c854780798ce SHA512 3fe06e334ed532f013aeb806b7beacd9418c4dbbcb80d4b27090c08178f1874694ecfced24eeddc8450e99a80831d68b34a4a3b2638a870f30f53f570650795c
--- a/dev-python/schedule/schedule-1.1.0.ebuild
+++ b/dev-python/schedule/schedule-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#pypy3 fails tests
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python job scheduling for humans"
+HOMEPAGE="https://github.com/dbader/schedule"
+
+SRC_URI="https://github.com/dbader/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pygments
+
+python_test() {
+	epytest --deselect test_schedule.py::SchedulerTests::test_until_time
+}
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 9b54cac..c31e575 100644
+index 9b54cac..a610bcc 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1,60 +1,59 @@
@@ -86,7 +86,7 @@ index 9b54cac..c31e575 100644
 +	$(AR) rvs libusockets.a *.o
 +	$(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
 +	sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
+	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > usockets.pc
 +
 +install:
 +	install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..c31e575 100644
 +	install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
 +	ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
 +	install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+	install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
+	install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
 
 clean:
 	rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..c31e575 100644
 +	rm -f libusockets.pc
 +
 +.PHONY: default install clean
-diff --git a/libusockets.pc.in b/libusockets.pc.in
+diff --git a/usockets.pc.in b/usockets.pc.in
 new file mode 100644
 index 0000000..b818020
 --- /dev/null
-+++ b/libusockets.pc.in
+++ b/usockets.pc.in
@@ -0,0 +1,12 @@
 +prefix=@PREFIX@
 +libdir=${prefix}/@LIB@
--- a/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
--- a/net-misc/purritobin/Manifest
+++ b/net-misc/purritobin/Manifest
@@ -1 +1 @@
-DIST purritobin-0.6.2.tar.gz 18849 BLAKE2B e8fa83913d82ccbdc42c9b54f1e0b801203151b5ea89ad94bb2eaaf964cbc594e2cc8fa651dd61d14ee33729fd52fb5475cbc2003edbf766d831f48ca25c1753 SHA512 52d751808070eb46c683115f1981131386114d1a1450ab24c1ac7b341d1c6cbe3319cf55b5a85bf35a0903d1cc4cdb144f6bbe2e5b72bcc358c5f6fccdae5553
+DIST purritobin-0.6.6.tar.gz 19433 BLAKE2B 3a54915968baffd53eef3430268047d9c67d6cff226d52e6f514ed456acd62d75c17f091bf0c3f3571a5715c45001c09287dfe591ba1447c7abdfe74e474db67 SHA512 b08fd8c087e7ff95bd980749e0b404836542343ba69808cf2a8aa0915a836272a621de75267e52756e8571bf165158db9d8d0e7c5a5442b10568f4951ada69a9
--- a/net-misc/purritobin/purritobin-0.6.6.ebuild
+++ b/net-misc/purritobin/purritobin-0.6.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="minimalistic commandline pastebin"
 HOMEPAGE="https://bsd.ac"

-inherit systemd toolchain-funcs
+inherit systemd meson

 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -35,17 +35,15 @@ DEPEND="${RDEPEND}
 BDEPEND="test? ( sys-apps/coreutils )"

 src_configure() {
-	default
-	tc-export CXX
-}
-
-src_test() {
-	P_DD_FLAGS="iflag=fullblock" \
-	default
+	local emesonargs=(
+		$(meson_use test enable_testing)
+		-Dtest_dd_flags="iflag=fullblock"
+	)
+	meson_src_configure
 }

 src_install() {
-	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${ED}" install
+	meson_src_install
 	insinto /var/www/purritobin
 	doins frontend/paste.html
 	keepdir /var/db/purritobin
--- a/net-misc/purritobin/purritobin-9999.ebuild
+++ b/net-misc/purritobin/purritobin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="minimalistic commandline pastebin"
 HOMEPAGE="https://bsd.ac"

-inherit systemd toolchain-funcs
+inherit systemd meson

 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -35,17 +35,15 @@ DEPEND="${RDEPEND}
 BDEPEND="test? ( sys-apps/coreutils )"

 src_configure() {
-	default
-	tc-export CXX
-}
-
-src_test() {
-	P_DD_FLAGS="iflag=fullblock" \
-	default
+	local emesonargs=(
+		$(meson_use test enable_testing)
+		-Dtest_dd_flags="iflag=fullblock"
+	)
+	meson_src_configure
 }

 src_install() {
-	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${ED}" install
+	meson_src_install
 	insinto /var/www/purritobin
 	doins frontend/paste.html
 	keepdir /var/db/purritobin
--- a/sci-electronics/dsview/dsview-1.12.ebuild
+++ b/sci-electronics/dsview/dsview-1.12.ebuild
@@ -47,9 +47,11 @@ DEPEND="
 "

 PATCHES=(
-	"${FILESDIR}"/${PN}-1.01-viewport.patch
-	"${FILESDIR}"/${PN}-1.12-desktop.patch
-	"${FILESDIR}"/${PN}-1.12-cmake.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-fix-qt.patch
+	"${FILESDIR}"/${P}-fix-segfault.patch
+	"${FILESDIR}"/${P}-fix-extern-c.patch
 )

 src_prepare() {
@@ -79,10 +81,9 @@ src_configure() {

 src_compile() {
 	cd "${S}/libsigrok4DSL" || die
-	emake DESTDIR="${D}"
+	emake
 	cd "${S}/libsigrokdecode4DSL" || die
-	emake DESTDIR="${D}"
-	cd "${S}"
+	emake
 }

 src_install() {
--- a/sci-electronics/dsview/dsview-9999.ebuild
+++ b/sci-electronics/dsview/dsview-9999.ebuild
@@ -46,12 +46,6 @@ DEPEND="
 	${RDEPEND}
 "

-PATCHES=(
-	"${FILESDIR}"/${PN}-1.01-viewport.patch
-	"${FILESDIR}"/${PN}-1.12-desktop.patch
-	"${FILESDIR}"/${PN}-1.12-cmake.patch
-)
-
 src_prepare() {
 	export CC="$(tc-getCC)"
 	export AR="$(tc-getAR)"
@@ -79,10 +73,9 @@ src_configure() {

 src_compile() {
 	cd "${S}/libsigrok4DSL" || die
-	emake DESTDIR="${D}"
+	emake
 	cd "${S}/libsigrokdecode4DSL" || die
-	emake DESTDIR="${D}"
-	cd "${S}"
+	emake
 }

 src_install() {
--- a/sci-electronics/dsview/files/dsview-1.12-fix-extern-c.patch
+++ b/sci-electronics/dsview/files/dsview-1.12-fix-extern-c.patch
@@ -0,0 +1,42 @@
+diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
+index c433a28..7f23e36 100755
+--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
+@@ -19,9 +19,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
+-extern "C" {
+ #include <libsigrokdecode4DSL/libsigrokdecode.h>
+-}
+ 
+ #include <vector>
+ #include <assert.h>
+diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
+index ad943ac..733497f 100755
+--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
+@@ -19,9 +19,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
+-extern "C" {
+ #include <libsigrokdecode4DSL/libsigrokdecode.h>
+-}
+ 
+ #include <extdef.h>
+ 
+diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
+index 79d3cd8..80c4c44 100755
+--- a/DSView/pv/widgets/decodergroupbox.cpp
+++ b/DSView/pv/widgets/decodergroupbox.cpp
+@@ -18,9 +18,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+-extern "C" {
+ #include <libsigrokdecode4DSL/libsigrokdecode.h>
+-}
+ 
+ #include "decodergroupbox.h"
+ #include "../data/decoderstack.h"
--- a/sci-electronics/dsview/files/dsview-1.12-fix-qt.patch
+++ b/sci-electronics/dsview/files/dsview-1.12-fix-qt.patch
@@ -0,0 +1,13 @@
+diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
+index 921d3db..16cdce9 100755
+--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QStyleOption>
+-
+#include <QPainterPath>
+ 
+ #include <math.h>
+ 
--- a/sci-electronics/dsview/files/dsview-1.12-fix-segfault.patch
+++ b/sci-electronics/dsview/files/dsview-1.12-fix-segfault.patch
@@ -0,0 +1,22 @@
+diff --git a/libsigrokdecode4DSL/instance.c b/libsigrokdecode4DSL/instance.c
+index 5ede710..5d96701 100755
+--- a/libsigrokdecode4DSL/instance.c
+++ b/libsigrokdecode4DSL/instance.c
+@@ -370,6 +370,8 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
+ 		}
+ 	}
+ 
+	gstate = PyGILState_Ensure();
+
+ 	/*
+ 	 * Prepare a default channel map, where samples come in the
+ 	 * order in which the decoder class defined them.
+@@ -389,8 +391,6 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
+ 	/* Default to the initial pins being the same as in sample 0. */
+ 	oldpins_array_seed(di);
+ 
+-	gstate = PyGILState_Ensure();
+-
+ 	/* Create a new instance of this decoder class. */
+ 	if (!(di->py_inst = PyObject_CallObject(dec->py_dec, NULL))) {
+ 		if (PyErr_Occurred())