Sync with portage [Mon Feb 1 14:32:27 MSK 2021].

4 years ago · 87fff3e1d4
parent cec5f4bf92
commit 87fff3e1d4
455 changed files with 2239 additions and 6944 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29283 BLAKE2B d8cfa8b48276a078db88fd60ab85af6a224617971d0d73f7740e77fef97a92d8ed64b44d3ad9607f0e488da36f5d09e8e4cecb80dd11440e1760cd79a55ff7e9 SHA512 8ca1a55c15fc03eb2e953d5a5de339b0182acd2dc117695ade85eef9e84a6127f64607eb9f7248067e92c89464e1a84f7cad89ee80f2626f723923e2fe191554
-TIMESTAMP 2021-01-31T20:38:30Z
+MANIFEST Manifest.files.gz 29291 BLAKE2B 22569c3607efda973f03b894a446a34fae922ef11648ad2728ce125da6f385621a9054ba461555782542137a37fe33881f5566c3831eb239e830403cf0e03cc0 SHA512 268381f81e9bce9d86ecad9ad17559e048bb18e8eccb4587216eed293eb80910a933139d52a6678170b165c248ee0904e1f85ba0cd478e412c9f438a14a62085
+TIMESTAMP 2021-02-01T11:08:28Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAXFUZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAX4SxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCDVA//XqDgIxnq6V77bTnNLYQfIba2PRLcs6c4lXGsWQT/HScBUkig8wQKoW/6
-PMui3zugtTGEHEj7t53AzynRguT7PdQ73fRvyzyC6lPe7zyiC0hDiNl3Xyf06fJ+
-yAK+ika2QmjDWg2OwaKKXxQZUv89SdiHi+GiAykvGFbHw9xQ6xEGdrmKmh0pv1xg
-kouY/A97K/WQeccd78Ygu01zw6w2I1hziSuYFeThgVlEAAyKx30ocLez+I6r3ORw
-Sles3qLKzdF+WGcUSKv2leKvYg5GAjxscEmgqUz+kRVfyhXSme+DkHJtHkhQ3mGy
-ynWIgUTKhK8rNejf9/lpR0iKBusa0XowVSXpNdi5NsSIq0DGgFp0NFj1O4l3BBl5
-9iYwv/UBN9fT4t52Jay4O++tUs/uqJ8HpHn6xTLyRV5foTFcHYlGdc74WBwJZUYo
-PZwX4xo0worgDWMh2dVmnBInBmiJZtGyKJ77bBIWD7HQHLbhNRy1yhX8lAQPzLLK
-W9EJJEo7nNGoafgFSykgnFWgTUb2s8ekQa6MfbS1ekOQKACB130TCZXpwuUlL1zc
-sIdWcAkvKUONmZLzuFztpAGYBVCJ9ElX0l+M0EIRAHp3yJk8i12QoZm0jAaVCBWv
-DAJtvoBROc1fz0VQMOpGmWc5mGhTReALxiTQGn6AJuVQc9cGajc=
-=zAPP
+klD7Bw//d86W/9YZkgh4rtI/vUC8o8WZKovhT+eEirlEcPmWscCWVsaSgrjQSOyr
+6+vpC4mncAXIddVxEQLqx1kDRtJPXRePLS5Z+U/HATuE+AtGwI4sfhEcvm5kG4r/
+5Ut6+BeFum8DbxGSNv45uOa/lDmb0kxSpYr9/WQSRP2pEIW4s4cY5j6wkmp7S6zz
+9NIDDdnVagNtSaPH0EkUH+OwHNvhaJx196ZAItcr7f72RrViV0ogCuRr2MU/vGEu
+I4DyZzTFX+wO5jgrKFxKx4Osbr03AOjkWKXQv2zWy+bywS1Oz9bZD5Lh3NFI+Q4y
+kiWCq3u+pelIzlOv8x/ovP9vFg/zjtKmHUMp90mL+/o2XjS0sZoQKdZPx9vbzXdy
+bpIBW8yvUNTIoIbBa1gV7qUR4lZoTmMs2CX/WACmsfvph91dOYuAGnh1gzKSL5+B
+iaynuE+UWxLfUxs68/g9Bf46L3b7llxwk64TkeMFZv1OHKrT+YGDA2hAOAlF5c0e
+CMMkHzO4newMpEstX7ytrZuI/3tVlTdouciR7nagCQ+jz4F4uwN4rmmUqOo+gZtD
+LiaKwp5T6a1rYrOcj7N/Y6vypuxxJP5OKSaea8xTap9Tne+Z08Lgy+fGTgfJbveq
+CG1zmVkKaPmoF2WA1sH7gotpMfXhEGH+4FbxKPZ+ledqSQebGhM=
+=2k1R
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@ -4,5 +4,5 @@ AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f
 AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
 EBUILD caribou-0.4.21-r1.ebuild 2405 BLAKE2B 4e8e631ab0c172aa61337109ecc24f99da4147e8dc316b3176b82d838f6aac40a1f5c19807edb1acc897aa956a1325d8e01bd1fffb9d47d63d868be9c13964da SHA512 d7388c863fc514054b1dd52485ac06d410191c0f619bc1d7c3331209f281c4ef1feb07311d0657425c7cd90c816f087722958e64f370005b8d9a97a035d4f346
-EBUILD caribou-0.4.21-r2.ebuild 2583 BLAKE2B f30ed047db82376da1bc0752ec25313ca45b0d28b9f95b6a1121cda2c3609125af56d9d39da5a852e5813bd03f7f44d03012e7201d23bffbdf7838a772e62df8 SHA512 8d6441c20d575e09fd106915fb16e8d68f3c2aeb1e9cc3e8a517226690d000d1a2e972e9858171fadb567b79a85a6e71092666f01179c7ee2b6ee5f7528b0e53
+EBUILD caribou-0.4.21-r2.ebuild 2582 BLAKE2B 7fb7cfc2354bb9f945a23e93b0a4cdd85c1b8d653e4b4387940ea455224fb16794c273b4e1e5a82d01818363bb355f2e6f601122f3342583b2adaa2e44e4d5c6 SHA512 5abec28e094a414a73552a7c36fdfb415f47b7160c41749b484a0bd4ad81aebc66c124945d52798971f37721fc9c1c60874caa0249ca0f7603baa71fd971ea9d
 MISC metadata.xml 809 BLAKE2B c09e4f2616b808ebd600f0d9cd6251c08eff8e2c6b03251469e20c75f8aabb0d0d1058951ad14c48aa6e9072e9e61ce95dad8e6da8ea1a9eadbad775c8864390 SHA512 70a858f1ce80ad2dde3f688ef00803be1716bcd2d0e9900e497e1691d3eadbb414756a4c64966be6697cf9b76c9c5298732bb0ab5e2b9ea4309bc8a8726eef04
--- a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"

 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@ -4,6 +4,6 @@ DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc
 DIST OpenDoas-6.8.tar.gz 32307 BLAKE2B f199e20ccd33ed215b280f325d10c36f1449a605aa25ca92c39b43e6d9118a2c2b09e351712489028a06e9c2c087593888a93bf0377a15d1b710c9d6f659cf81 SHA512 4a57079bba353247e645bc07a5d4e78fd01471d193e83751fd87b72cffa4e152c0f7ea172563f767a7193b14489f57bc066b4fee50842d30b5b7f7ce918434bb
 EBUILD doas-6.0.ebuild 757 BLAKE2B 6f1834ea1c4e299ab6a589263515894a7ad89810763cdf92bf4a6eecd168f9ee08aeb714828d8874f1c338bd1c8f2144909a3b44673444cba487fc8a87fa5aab SHA512 ac5f759a089d384f82ec637fd969f1b5367acb3f4706599d29a899b566384200c81df71539d4e92a93710424cc8f20c70009b14cb7c0498518ea69b1e9159d5b
 EBUILD doas-6.6.1.ebuild 810 BLAKE2B 5d80c92a11f4bc1d8f8d83d1639d18baec626306e784e1b0936909f28288a4054b3ab635ae8ea30ae3df769df5edf882f05471ab015f9d2c94189515923ced1d SHA512 dad89ad3615ed6d9c8df7c11ac253420ebeaf6abba28da7a1ae25b202d909305f42ab3c5f5d0902b7b5ceaf326f912e853f663f7748a5ef345866e6dfd5cb0f3
-EBUILD doas-6.8.1.ebuild 1298 BLAKE2B 76194f60c28e2d39f9e82d36ffd23746c3287a4b1de76dc6201dfb18420d6e0ccbb0f5268816fc733d043544b71bae663e71ea4e9f407bcfc329a9856de600e6 SHA512 9e611fb642b2ed3365ec58e69dd5899953c25176685d9ab2dcf14ba2accf6e326b8022cf5f0f70a89d26da85b1afba7168920e57b2a1173696a00a8222f5ae1a
+EBUILD doas-6.8.1.ebuild 1295 BLAKE2B f569ad7f0e6c28c0f213a80ba365c7838966e2ca15bcecfa6c42fcdd3cb71bb766cfe0adb4b82ad6ce32d6ce688c49c1da21f1f5a199b8c98d5b97e820bdb661 SHA512 6fdcc87a201f33f528f4d3002cdcbfe30cf19e5e7832efb24142dde4410ba4a0bb0661149cbb91a03bf736823b4fd1a3bcb86012cf7ff402dac1e0c0fdc7c6db
 EBUILD doas-6.8.ebuild 1298 BLAKE2B 76194f60c28e2d39f9e82d36ffd23746c3287a4b1de76dc6201dfb18420d6e0ccbb0f5268816fc733d043544b71bae663e71ea4e9f407bcfc329a9856de600e6 SHA512 9e611fb642b2ed3365ec58e69dd5899953c25176685d9ab2dcf14ba2accf6e326b8022cf5f0f70a89d26da85b1afba7168920e57b2a1173696a00a8222f5ae1a
 MISC metadata.xml 527 BLAKE2B ec5f403c54f18989467cc64c023cc86f0ccdf3f4d974db83a0a0ed660b1f32caac090b43317e5e2b4de46fd7c92a38d622735f9718b0680020557d378a290630 SHA512 1cc9427b113968557fc9764a552138e5a17ed44ef1ed20cb087a8fb60865b8d3e9331baf1d172180409ff636143ad23e1a6d3e5de6af4a8e7b8a7b9bbdfac718
--- a/app-admin/doas/doas-6.8.1.ebuild
+++ b/app-admin/doas/doas-6.8.1.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc"
+KEYWORDS="amd64 arm arm64 ~ppc ~sparc"
 IUSE="pam persist"

 BDEPEND="virtual/yacc"
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@ -1,8 +1,8 @@
-DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf SHA512 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
 DIST keepassxc-2.6.3-src.tar.xz 7562816 BLAKE2B 1b33850ed996a2f07b1665309bb4680329a0f858d89e9e89f7ca39a84f27f1a4364bd8526d1907b4fc4d5dd586b3dc48d9d9b6235b78b52edc4db08ca72d79fa SHA512 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558
-EBUILD keepassxc-2.6.1.ebuild 2063 BLAKE2B a42e9515621416fe81b1724db430fa5d601fedd7de2830acf9d9993c9486206bd76d13c5f10c3040e7fd37b518f543ea03173cc2a64c36eab10bce13c0d628dc SHA512 c699ed6e099a04e8a3748ecf6b586ffc4ba1f46dcf5644bb89fb3ad37b8506e47cc1e41fd7d98a0689fbaa80fb6c08ecde1db2cffc868199b124a8ba76a307fe
+DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
 EBUILD keepassxc-2.6.2.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b
 EBUILD keepassxc-2.6.3.ebuild 2065 BLAKE2B 9acee41f6a44dfab875466c68104c75395c878c51746dfcb2d4109fea79f46d8828b9856ee370e612abacaec1a3cfbd8779cec0b072d82ea8d9de0fab562536a SHA512 fbf3880f1a66356f1700a89dbf3d33814862a4cfdb2b8a51c7182afde6e405a88960a1a7aec987ee54531d718faf02a111afe5088f386a28f160e9f16a18a4e1
-EBUILD keepassxc-9999.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245
+EBUILD keepassxc-2.6.4.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d
+EBUILD keepassxc-9999.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
--- a/app-admin/keepassxc/keepassxc-2.6.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.4.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake xdg
+inherit cmake flag-o-matic xdg

 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	fi
 else
 	inherit git-r3
@ -69,6 +69,9 @@ src_prepare() {
 }

 src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
 	local mycmakeargs=(
 		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake xdg
+inherit cmake flag-o-matic xdg

 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@ -69,6 +69,9 @@ src_prepare() {
 }

 src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
 	local mycmakeargs=(
 		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@ -1,5 +1,3 @@
-DIST system-config-printer-1.5.13.tar.xz 974532 BLAKE2B 44e748d2fc20edefe58e1c8dd3781aff28af93e57356a9969e051813bf4f04f72c4e895b587e86614df6fb4984a4d610e8e1a1e17777801ae8912b6904679c72 SHA512 f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
 DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
-EBUILD system-config-printer-1.5.13.ebuild 1942 BLAKE2B 26bd1079a01eebc8f49335d5756f310471b686bfe8966d5b993040c0636d6eaafee272eb8da305b07df0a8880e1db4899fdb61f9cd929ff1c829dc1e07c667f3 SHA512 e25caad24daf23975975b52bf2ea241e06b462573dd0e2129cebb9de467c94e035e5f3e64914d68123d0da8f40276071d9600888992b57ad9b316556a2bf1ab3
-EBUILD system-config-printer-1.5.15.ebuild 1943 BLAKE2B fb4b08219ad0a2bdc3efbf2428f27166463e01b54fd02df366e57f18a8518ae7d9ec60cbe95c4f8f8ef104f769c29610a4ec033c5b003c50984acc238c5f6588 SHA512 b8a374a81f1655394a3030dc8752229ac793cc2e86277920efa6a4c4dab2db33fc439b07b59100ed3b4f49ce6cb7029d4eaad8c71d927039ee88d138c4172615
+EBUILD system-config-printer-1.5.15.ebuild 1942 BLAKE2B 466e1c61ee073d76ee62706cb036d9d06ba3a5c5558e7d9146651617406deabe23430302eb2309424234c1a889b96cdd956d13d4a0ebd2aff61d8f9b5364402b SHA512 5157020f628fe7859f370ecf4b6673d7c62501416a0d95b571a0061d42f3f9dae0d151481c1e6da9e3f51289387d60a3f250b2d71a541ac94e254df451412ccb
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
--- a/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-inherit python-single-r1 systemd xdg
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
-SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-perl/XML-Parser
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( net-print/cups-pk-helper )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-nls
-		--with-desktop-vendor=Gentoo
-		--with-udev-rules
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"
-	python_optimize
-}
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/contest/Manifest
+++ b/app-benchmarks/contest/Manifest
@ -1,5 +0,0 @@
-AUX contest-0.61-fix-buildsystem.patch 581 BLAKE2B 9a11fb9b24a674a7bea0c40b9100fa3813954b853cd133cf69b90b0a3381a20ef289793939834c777140709082b262715990900af16c422442fc2215be2922f2 SHA512 35abe08432d62020a1c9daa2c9bae18dd2d8db99d3f938f9eb423d89b30c9d67441922bef5376c9e4b5be1744fb62b6e7c0163033f006225638f95c097f484a3
-AUX contest-fortify_sources.patch 376 BLAKE2B fb2ca7869fc19304c14aa2e52e0d3986f2021703800f547af5f88b866978a016e82b2e2911192465d7836bbbc297ab25f7d7d3499759ee9ff915ee28a2e0e089 SHA512 71bb1d0b594bfa2342622c5495ea0306829ced109fd606bdfb5e1aecc17b11270235f83606961067819097863ba3bff66e5c37c5496028ccce3f1701ee9bdb2f
-DIST contest-0.61.tar.bz2 29204 BLAKE2B 76e19365026b63f4a37c45905769f28c921455cb4020666898efa332d88627d85e5044f385556f07325537b6b4f80079b301fd9915f068754dd80d815092ff86 SHA512 34fb83a3b37d67d9729ce14fdd066010c7360a401d21f3566be8dae7271a30f01cc5b84092405ddfb6961a2284af0a18ce6709ab6d4ab68607aa98f975815131
-EBUILD contest-0.61-r1.ebuild 748 BLAKE2B 381d04337604a40818acdf923dc9303dbd77c04099b1a798744e19ddbffc9bde50c7676be5e73c2a08c4b21fc55cc8eb5a3f19b15aba3adef8fcc09bc6176662 SHA512 0eee6b57d027845e57afb4535ef91c233652803c91f7f0830ef4573b48f95526e403f13627e442419f42232aceebd3be2125e5cb1382529f15e6b883b6266543
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-benchmarks/contest/contest-0.61-r1.ebuild
+++ b/app-benchmarks/contest/contest-0.61-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Test system responsiveness to compare different kernels"
-HOMEPAGE="http://users.tpg.com.au/ckolivas/contest/"
-SRC_URI="http://www.tux.org/pub/kernel/people/ck/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=app-benchmarks/dbench-2.0"
-PATCHES=(
-	"${FILESDIR}/${PN}-fortify_sources.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-)
-
-src_prepare() {
-	# fix #570250 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
-	tc-export CC
-}
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin contest
-	doman contest.1
-	dodoc README
-}
--- a/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
+++ b/app-benchmarks/contest/files/contest-0.61-fix-buildsystem.patch
@ -1,22 +0,0 @@
--- contest-0.61/Makefile
-+++ contest-0.61/Makefile
-@@ -1,8 +1,8 @@
- INSTPATH=/usr
- BIN=$(INSTPATH)/bin
- MAN=$(INSTPATH)/man
-CC=gcc
-CFLAGS= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
-+CC?=gcc
-+CFLAGS?= -W -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations \
- 	-g -O2
- 
- ifeq ($(shell uname),FreeBSD)
-@@ -14,7 +14,7 @@
-      list_load.o
- 
- contest: $(objs)
-	$(CC) $(CFLAGS) -o $@ $(objs) $(KVM)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) $(KVM)
- contest.1.gz: contest.1
- 	gzip -c contest.1 > contest.1.gz
- install: contest contest.1.gz
--- a/app-benchmarks/contest/files/contest-fortify_sources.patch
+++ b/app-benchmarks/contest/files/contest-fortify_sources.patch
@ -1,11 +0,0 @@
--- contest-0.61/bmark.c	2009-02-27 23:13:44.000000000 +0000
-+++ contest-0.61/bmark.c	2009-02-27 23:12:44.000000000 +0000
-@@ -47,7 +47,7 @@
- 	}
- 	/* child */
- 
-	if((tmpfd=open(TMP_FILE, O_RDWR|O_CREAT|O_TRUNC))==-1){
-+	if((tmpfd=open(TMP_FILE, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR))==-1){
- 		printsys("Could not open temporary file\n");
- 	}
- 	if(dup2(tmpfd, TMP_FD)==-1){
--- a/app-benchmarks/contest/metadata.xml
+++ b/app-benchmarks/contest/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@ -19,8 +19,6 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
 DIST krb5-1.18.3.tar.gz 8715312 BLAKE2B 4f6ad4a529e7578e83d82b43c2cada33bce1dca5081ec826ee06a713f82520b783f72ec56d2ce289e10d1ddcfaa079491e43f21c035b214d244bb80e6b2a1c9f SHA512 cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01
-EBUILD mit-krb5-1.18.2-r2.ebuild 4407 BLAKE2B 11eb4671f85a6685e8017c49d3a55cb315e26a55430c900c9191249468a15ede542deaddaa30c395f62f97747bb6307944bda497792a03b7358f3ffb9d34304c SHA512 3daa206ed5a5c8b79366282bc809ff7eea00097038977788a1d3dd36f90372481bd1cb489846a0830165066308dad4391d6a2edddeb87ed2936e8dbaa6cf48e6
-EBUILD mit-krb5-1.18.2-r3.ebuild 4461 BLAKE2B d189955cf267681df9377d53272d07e450796816fe89641ad1032f169d46fe0f2f76461d3aaa09101b93d18a5441eaf49e74d116cb4dad8d2330dffb5a38931f SHA512 c8de8e923f0a4cbd6f130861d3a42025b692ae419d96762d50b641f6238c167c1996a2612e33d74d139d4766ecb12d83adc8629f933d8284fc5ff33a98612683
+EBUILD mit-krb5-1.18.2-r3.ebuild 4453 BLAKE2B dbde801fa1451ccb417f4b67ec6d08d45acf19ba31a6d18121af689c06eccdc8f6aa4f2140663be9c03f54e6b246babfa6a7a5837197f538996ff2dc565fa92a SHA512 1f8760c67d84a53551feb56e933913d14b4ac2efc7f574b726eb246e0addb7a9a5671104aca772796c3a9b6bae7a4f6b95a0eed9157c7f6c3aed18b5b948eb16
 EBUILD mit-krb5-1.18.3-r1.ebuild 4425 BLAKE2B 882d05e11f6fac8466defe58176f0c70a67319ab05909f0dec32f5f29d471ea9780b2fa39c6b001488751492a8141cafbbd9dc1a1f0a6146b24f5ad58798e292 SHA512 29caa7dd8a1b3f1cece63cfff348e851809da318dc85550df7c9cd924abdcc3bd1e6a6ef1f3d2d170b4aa2d0a9f778fd298d838862fcc431857e289c93e2d77c
-EBUILD mit-krb5-1.18.3.ebuild 4379 BLAKE2B e0cd5aefed3c0be6cfe3169a529451ef57205d767d56c8f5733ab74ef651c68bc33d837f9f81f4eada854502ea0e3b735f8d5c80bc09bb35fb72faeafe7744d4 SHA512 e800dc2d76190c7705c121e4ad87487c943272281b74e3c3888406a6c8dbf9f5fb7acfb3044f2bbdb43190a436b371072c64ace80d31f5c8738019762c6f1bbe
 MISC metadata.xml 823 BLAKE2B b1e312e7d7d1dde62a6260572d68c5c9df90a00c9ca7d43939df0ce7c6e528ac8dfcf839827938f783c241c19255660e1e7806210aaf407a6e86cbaeef24295a SHA512 844715444284f5c7f1a73ed15c0ebe0b5dd8c96c3aa7e6450f465e2a2086509c04d637f139ede5e427972d4b1bb298255388f50978b41de875b47ee40251451e
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
-	"${FILESDIR}/${PN}_dont_create_run.patch"
-	"${FILESDIR}/${PN}-1.18-libressl.patch"
-	"${FILESDIR}/CVE-2020-28196.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath \
-		\
-		AR="$(tc-getAR)"
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"

 # Test suite requires network access
--- a/app-crypt/mit-krb5/mit-krb5-1.18.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.3.ebuild
@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
-	"${FILESDIR}/${PN}_dont_create_run.patch"
-	"${FILESDIR}/${PN}-1.18-libressl.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath \
-		\
-		AR="$(tc-getAR)"
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@ -2,5 +2,5 @@ AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f96
 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
 DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
 EBUILD bluefish-2.2.10.ebuild 2556 BLAKE2B 910fea9618911f35362e3162fb4c16e1eea08c954898500bf30256b49c194513aef6185b506d91fa1996b795d9dbfc96a4b14411ab677c364c4bf3bf176a6598 SHA512 e84bd7bc879ec41696fceb944a525d8d6b7ffbe0a339f1c6da3c20cd96bbfa551a832800095d794a4c0837aeeb359371db6d7698de01130459be375dd855eb04
-EBUILD bluefish-2.2.12.ebuild 2621 BLAKE2B b966f08b414d5ff14b122bfb523148eac36a2fd013a4a410d36b732c3b1f432e00d6b03774b2e40036faaff94154495d813dccf52a9012eb43274d5e9d608651 SHA512 50b04c1ed5b327949ab31fe2663ecc57d6f01fd2ab766086169466f0a49f25a25f07ae2584d060442485ba60f00939937feba59454fd469b0c6da5da506bf137
+EBUILD bluefish-2.2.12.ebuild 2620 BLAKE2B 20d6281daa0cce509710909c66d2fc3017e40daa7778b02a49af992ad7af0a66b93028e306818a129c84514ea8171e09fa6e186b2a7c6021939c1da131ceb862 SHA512 c6ba924903b8b011d56798c9f3f1c127b788164bf5751adbcc18663dd2e753d802dcc216660ec7e586b97055eb58e8efecf2a9a02b0e503737f0ecded62bc69d
 MISC metadata.xml 386 BLAKE2B d8663af89654394ea695c309c2ebbf2d3beba02463b2e57a0f91d7699af0e6457fa0ef0aa238f76359d3531bf4831475978fdd8ab4eb943dccc295e294b2eb4d SHA512 589c6c5db0ad2b93d2b44284faa19845b48e790252ecf5983fb3ba2c2b749894a382eea6dffe053413c0b29b86063a8906b88ae6f165b1cc9fc79742ae2fc188
--- a/app-editors/bluefish/bluefish-2.2.12.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -14,7 +14,7 @@ HOMEPAGE="http://bluefish.openoffice.nl/"
 SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"

 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="+gtk3 gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -15,7 +15,7 @@ EBUILD emacs-24.5-r9.ebuild 11064 BLAKE2B 230c4e7f4a42442abb9c5dd1b00e5d07c3c180
 EBUILD emacs-25.3-r8.ebuild 11406 BLAKE2B 491e985bbef6ebb2b9fb59fb1c93934814439d6e01a7e1c96fe755f50974366afd86741b65743c36cd4f7cd5ba436768ff0ac6809a8ed4a53a9b8138df96b7e9 SHA512 6883b698c30ce51b5cc4aa65e001201567dc46182cc001ccbb6ae2fbec7d89689fa6a3c25ba9c93801dfb43073ceda4a83cfbe29261e3bfa620fd939b7669127
 EBUILD emacs-26.3-r3.ebuild 12224 BLAKE2B 0a6e7b4a2efa929000bebfd1a507d5862c5216b256719256bd5c63c4728d3b33204f7abf37108eb613fce89843ea283c51f8e07fb34dc671d6aa3cdfe3164256 SHA512 fb60f96f86d7b051cf0a8009365973e8275f14245e4b1bb1937f491b467c300405f3439c8c3c2eb5fefcc881f2b7fc726b090816711bec4094f8ea497c8bfec8
 EBUILD emacs-27.1-r2.ebuild 13769 BLAKE2B ea25627394cbdd0ba574631df460808dd13965846424a937f1cadcaa5345fea05b05820af6bbe4db5dd2478fed88d79002b60ce5a8a04de555a6e4b2e992e26d SHA512 1e73bf9d4ec1492654b007cf1211f0f2a9a5ee8fda0928fe18006b18c215f94d1c1e388a0607e8d1afb2608c6484b5978e444a7dfd6ff41537e93d698cebdad4
-EBUILD emacs-27.1-r3.ebuild 14748 BLAKE2B e179da1911c4b54cb5ed29d5e49a55b589d496a73bf01c2ab764d841d0f9297bbcdf6b153e4c658e188aaffff5cfd93b533fc39ebc9a87b9f447895709808904 SHA512 335ce4b318c0d2146f1189cf05cd3d80ef0dae775a5a82b66ede93ed035bd9a9251dcc95cbaa321b00f6f05633cb5dc1daffdf63745c34983985ec0e744af67b
+EBUILD emacs-27.1-r3.ebuild 14747 BLAKE2B 2f52016cd3242617f44db118ffea3e2ffc72a72af78868904867bc642d3aef298bbdd779112ff08ca444855367e8e673f25ed61fdc96f3c32abd229379b75b5a SHA512 7f2e6fdd3efa2b79c1751bc7eebff1e17e562813cdfd315571f424d88e0e37c841d690dafdf0934a9cc9e57f9e39e76fb35954bbfa90946251c7ff92ce25a6f5
 EBUILD emacs-27.1.91.ebuild 14710 BLAKE2B c369d96259b7f1699916a82e795132d9b5ee382241d45a6fe55d6f86333a073e83b6976ae0525eefb2f5d1fa045783a6340095197dbc59b613d6903465cc2582 SHA512 2c044cdd45c21f330e31ecf114b7f82b0cf9e6d5a8108456a3ee47acc081f9737245894b66134f3956c152a20e407314bac0b4453dd3dbf1761f77e0b9606da5
 EBUILD emacs-27.1.9999-r1.ebuild 14709 BLAKE2B be4d4e9455f17dccd45d6684bc7df95256d4420c95818f504117cef09abee3d59498e92aaed141bdbe2e4343758425ec3fc9ecaf3cc6e3397c9ca06eebfd540a SHA512 b9bb10eac9c6cb4df462fbaa9884e73fd73f1bf69324380f27738a5644090d4df8d82228acc6ff6a945b34ec6ebff3e3a5728fbd725b451c177d2ece5fb842b9
 EBUILD emacs-28.0.9999.ebuild 14680 BLAKE2B 41e448cffe10be975b6a3d6efd8442870c355cc167fc39da0d85fcadd482f8f2e09536cd80db555d5fac1c03521e182a8ef26e72de93b129ed83364314c4d8bc SHA512 6a102ceab1d4636a01add3d4f778ef99257d7cc366340f6e3a4db15ceb4eff0ef6df05d7eb1ca989896d8775ac39212c9bb55ea8e8eb560f0f232c2462dc0fe2
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@ -4,5 +4,5 @@ DIST chkrootkit-0.53.tar.gz 40483 BLAKE2B ee78afc5bb5453fe7b30d966988060a68b7286
 DIST chkrootkit-0.54-gentoo.diff.xz 4848 BLAKE2B 25d1736bb839533fae36550518b311e52bb38f8a562a63d40629789dc9497b6e71dbc306d1f845b6a5cd586468afa6a7ac4ce8b6f1bfb40d7ac9b0331a55def9 SHA512 6c972b081794681b61b7c67f9a5762ba5d2c0c731c9a2bf9f75e715984edf7022ddcd44d34803eacb58a59e8b21932ffb586cc9fb7998a43393367c2530e353e
 DIST chkrootkit-0.54.tar.gz 41461 BLAKE2B 61384fda7db08ca2a52ab060ee4ea3edb7311cb9908599a511459dac22340f28e75d732b10d827aaeed89a1ecb6fc7f69ab8fef970aae5a73bae8c7949944831 SHA512 fe8955ac33abaabf304f5580b6f12929f8bf02329ab442380eaa6298440cf1cb0eee2db8e5667ea7d78b89ee2bceb82c10ebb732a71d6bcdda9400569cd587fd
 EBUILD chkrootkit-0.53.ebuild 1283 BLAKE2B ae35c2cee390c85e97e2263d278a0e73379bd328788c9db725dab8e22ba3670bfc25b3549b0b5d6f35ccc1b2bc4569637833c9a0278850ecc231ea4c635ff55e SHA512 07c43b378a3c40d2dfd02ac0a1996c5dd17c576b386f4de61d0b76d555f0f7b4f02ed07426203c2d48d5fe776f9c6a522fc9f9b40f923017bdc6d720ef7bcb3d
-EBUILD chkrootkit-0.54.ebuild 1287 BLAKE2B df8b6e18b91cfa306e4b1e7d03dd294dce85f1d82b446c0cd4fc5fd2cb53f030e3ac8b641bc68c93f39f385f601a65ca7c7e879f449f4fa7841ee59d02906706 SHA512 d6d67879dc13d429069e2c8336ef866701bf5dbd4a624ab677692a28df071528a73e6e4383ec15f05d282d45a29118338d31d8f12abee2c97300446b605d8d27
+EBUILD chkrootkit-0.54.ebuild 1286 BLAKE2B 374ecf72f9171b95c50ec0c41501b865e159c03c2493d2cd71442930368cab2ae30f91efc7cc8dd58605b1fee148b6cbcacc23b00bd908a98b31fb7616745f1c SHA512 4dbf2467f4d357366ab8fd3cd2ee44c5ebbf6652bb038793391a4cf0ba9389fdbfee397a73eab65f3fffc3f15e44075a7cc51810346bf1bf0d74ba89878e0887
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
--- a/app-forensics/chkrootkit/chkrootkit-0.54.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.54.ebuild
@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
 IUSE="+cron"

 RDEPEND="cron? ( virtual/cron )"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@ -1,6 +1,6 @@
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 928 BLAKE2B 9078bc61209a7b7cf91003c5087254a1cce151b1940dd7735802bb013ec2715f3def56be4da494e207cb1171a4e68d6126dfb5b6928fa4828c7a983bf15e11dd SHA512 f6509a52425db0874528e17b17f976fdca7204cae3f41f69db0b97e39d32e4d72d01a96e5dcc06ccca26b7fa660819e69848667c5ff6c971f10731818111ceb7
+EBUILD figlet-2.2.5-r1.ebuild 927 BLAKE2B 62a7221cd33888c2f78ed86a9d07ff34405a43c334ef71e1f1d3170ae1b4d46e32592717e43e920353e3c97548e4d35c228f06214d57d48591e65bde378d38f2 SHA512 3004779a6f0a1ef6e5e0ffe1b6d3fa4cffaf32aa96bd7899dfdf8716196a49591aaa0002a4b23ea3cf2807d141f130c568a9de6b33bdc584ee6451b6c26ed13d
 EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 src_compile() {
 	emake clean
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
--- a/dev-haskell/hgettext/Manifest
+++ b/dev-haskell/hgettext/Manifest
@ -1,3 +0,0 @@
-DIST hgettext-0.1.30.tar.gz 6289 BLAKE2B 1da585c19bdf8882249b22cbf9d65056b6b5856d4207578f48aeabbebb9ef68fdfff2cc29d275c74b42a0e1e54edbc4652a7cbaba1bcf59a2c6e52502636440c SHA512 f37c580e4e0e60691b86a6fa392e2809ef132d394507879adec2bd498bf0f678217d88475f261a1d359d36ffbd08e6177194a65872854d14f8f9d071f2f91af9
-EBUILD hgettext-0.1.30.ebuild 703 BLAKE2B d216dab0f3fccbf1e89a1a2c4d44c1b4f3050ec29029f7b96abebcac23689017efdfe068430d27fa0997273018c76aa9187680b950aec35375cf5c660e08d7c2 SHA512 c1a8978dcc7c6636a28af106f12d0496c7fed6763645838ee214ca5e6a75f408fee2d43a8c29003052bbf878b44ef888670b6143c220fef522e677e23b8be869
-MISC metadata.xml 329 BLAKE2B bcff0c1997ac323a93759b785cb3c6e1842a6cd30098e3502886c285093f093c0f4da97a1488805edfda4645b0b128717c45e6d7f74e28aeeab8681da9c61033 SHA512 f5355f81daadfb078e8a7954778b290f0d933ee6c22f5b21531292d5da494fdeec3b8c091b1707e3cd9d762a32ae81b1eccd2ab07c12da4a7dcd0e58b82b540b
--- a/dev-haskell/hgettext/hgettext-0.1.30.ebuild
+++ b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to libintl.h (gettext, bindtextdomain)"
-HOMEPAGE="https://github.com/vasylp/hgettext"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/setlocale:=[profile?]
-	dev-haskell/uniplate:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@ -5,6 +5,6 @@ DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf181191
 EBUILD protobuf-java-3.12.2.ebuild 1396 BLAKE2B 77fe72f17c38e32636c675c393768be36c5ba6ad9594db38a6abfce618117ea6ed84f350d68e702cddaa8bf5ced10514d5852ad3935375c35d9ad4d430af5f47 SHA512 b4a79a688be8818c0f7ca3ceee0fabc7eb8ee4b3480194c7113babb8fc5c7f4270e029df57eb8d96fd077c4e131b2e2de5ebd11eeb7b355ad72ee16fe6317751
 EBUILD protobuf-java-3.12.4.ebuild 1478 BLAKE2B 8cdc4e335d0cb6b9e5002fc6ac099c03efda106e0f5af768a9a9745e7c45d17554bc0482b363696bfd4569a3956a86ed1fd8a74d5f9f0ceedc0ecf3850c9b83d SHA512 1ac0ce79cfe4615719a86d1ac7e09827777e8ce4a60999ad480d71d9c8d90acb02b3cfc57bf7d5b4139364fefb897e93fad214e675b94d99a9e6e93f6ce8a106
 EBUILD protobuf-java-3.13.0.ebuild 1477 BLAKE2B 669066ea60706166627b293179241302d89a4b7241e438a7f98c49992b5283eb201df25b0ee93273276324c3974e64062c80b108168e64606258e2d59f6e30f4 SHA512 a4883fd56780e65ea4cdb48a8e830a996c1bab4b92ab7a5faec99bc0e6711ddd03b094e5607a23bdd8d946161282ea12f19920f14943542c085256e6d2f8131c
-EBUILD protobuf-java-3.14.0.ebuild 1480 BLAKE2B d1052d92692f2530b184c584c498b63edc2ae4a6be063e8312d985ff2a012abc2fb5f7bdd00d031f530ae7513d4da3a31512101b206a30a6afeb7662837319da SHA512 30adfd4334cad13014f8681eb7690a5f892bb14cbc8198787a74a5b26f919bc9b61f1e11cae7516db48ea6a8309cd126ea1f5ceea7ced8617c2e59c2488995c5
+EBUILD protobuf-java-3.14.0.ebuild 1479 BLAKE2B ba2a301f0159cc457d54e16053acc95271d904d0669cc1898dee4f840e9bd020cc88f0734f2ac04333bbbf43b55ea89ced283be8872b55320b8ad9c5e29df499 SHA512 4284ac6287b4536700efd32aeab677934e320ec1308a93d12e151f1c1a14688ddf27cb2567771df301f3b3628a500fca44c020631651698fecb6ad0cb1647c27
 EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B e5d0f477b6bf5ba696b07c2ea7e85c56d47027f42041230496c76705e5df4a986278fe08ea5d802e25595bfdd052a9a09435d196bc8eee67b5993bf3f6a8a452 SHA512 bdfe81f22c4a512704e5b41abbb84bb9196552a38f4df0a305a6a63a80383a9bf33f62dc48230ca39befa734150443d5e7415bf328e3c6d7ec4b1eee9c09f293
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@ -23,7 +23,7 @@ fi

 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""

 BDEPEND="~dev-libs/protobuf-${PV}
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@ -9,16 +9,12 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
-DIST apache-tomcat-8.5.60-src.tar.gz 5837412 BLAKE2B 0c2200412900f7f6d318051333b15b8c6236e00f6194c21fc45bb95b565c4146e2682b879f3a293de3ab65524013f786a7f69dd7e91f1c4cc903179075253cc4 SHA512 43222e5d04b3de400429d6f1792d418172b6ff15dcc17e392cd66a5444d740a323b9c426a9f39678b3460452545fda4d784f56961d5ea56b9c0e1ca466d49040
 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
-DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb224cfeca5218d53c943c24db8a342cb54a7658016e127a0719b0206b9cdc14c73b8066f335400202710d5a82ea3db91cd4b2f6 SHA512 d70314124ddd901892fb92163ba78d719d875582704868870c74b94163da96e56f17eadd1a833a64058467f0de9c39ccb3f8892970221fb946d8a645db174218
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.107.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb
-EBUILD tomcat-servlet-api-8.5.60.ebuild 3006 BLAKE2B 7608f3ce7ecb52570528e05e040ec079b76970fd4dc408e481842d005bbcd292b5db0a45985b3833d3f2129ec8e69792d225b6bbac2f474e9221ffb38af4667b SHA512 e21868d016e2ce116be08ed06827f59da07dc3bf4ca0f0ffd29369c3b8865ee3c73ff0aeced838cab3cbc7defabdb637ae13ff77f083de8bb1f46f7da4e16539
-EBUILD tomcat-servlet-api-8.5.61.ebuild 3007 BLAKE2B 081ed70f1ed5aecfb0b1ee103a58a1d1b3f51b275a82d13b56212d1ac097c5c9170c75ca855ef9e5c202d5861614f90827b3933becd0e4a7e4493176b391090c SHA512 950f61e427bbb65c5abfa9ab660943a2453697edf9282bd0ac4d795e188b2fb842b89add347d6299ef18714182c55a3bd8270e61a606ae43332606ec6dc6c6f0
-EBUILD tomcat-servlet-api-9.0.40.ebuild 3172 BLAKE2B 6c853abc08b2448a4f6cb507968a4d06c8c952f631b142ac50f72443c55a3a27fd44c347b987a6beee703fd13e1922de9d4da20920c4d4a34f06598d8daa6bb2 SHA512 e3ecd5cffcaef886fee3bfcc7f11d54258c3e2642d8e2b4328ce9b60089dd4992c4bc4ff137eec99f3d2f8a74e72115e50541486268f4cedfa8962eaf491250e
+EBUILD tomcat-servlet-api-8.5.61.ebuild 3006 BLAKE2B 5a5ace1a95a190f6de2b56f42eaa80a0c35e4bec8905143350cf0f98af9e1d5d110622579b1164ea3f1af65581f06f886fa49d589e81f676694ed67178f613f2 SHA512 73d09c2d4aac971b1f00f9d4f6028d19270c343dcd0e4048585c2addd33b781bae4be3a9376739763fee8432479a4a1ad85a8e63c46dcf8b1b17b22ee872456c
 EBUILD tomcat-servlet-api-9.0.41.ebuild 3172 BLAKE2B 28700a17edaf81fa47d08083fa506c89cc81a876dd4cc29310bba7487454317c271bef7641c0fc93f99b9a53155c2d99c4ebfa90c5f73d2e0188b75211f46625 SHA512 11cf7359592cf2ff2e2ff453fb90f649f6c9f2e444c5e58dfb84808256f13557be9dfadb188669fae88856af6aca9ecd242d043f9d43f96574715c35db9ef17f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=virtual/jdk-1.8"
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-# we don't have the aQute.bnd.annotation.spi packaged
-PATCHES=(
-	"${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
-)
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@ -8,6 +8,6 @@ AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 EBUILD boost-1.74.0-r1.ebuild 11202 BLAKE2B afbda2cca3942411d3edb50bd1c6786e413d0cce0debf6301f5ac765cbb40ad5d3a2ff471635b17212287f6b3d969dcc6c72f517863c9e0f42ce23a84fbd971b SHA512 7d6f48fb0a2179c06a147ce0d0eb18917f9250ef12882fb7430b48f5e8222972da41732ff50e15ea9d2843741b3b6ae47da8bedcf3369e5fee5780da2d25d4fd
-EBUILD boost-1.74.0-r2.ebuild 11250 BLAKE2B f0e87bd7f12343942c351d66ae321420de170432bda62e6c113c8df72e5887a7f26964db1f278fe2d1c53d6f96b551d4f6b5fb86a6f50b937200346b6b0c36ef SHA512 268b52b1049691155974d28fced093ce5a8d8bda558eae108b4c24af0aecd078c82b9286c3afe0b84ddff72f1e409cd86c88ca18e70d11da11c7bdb4ead1f56a
+EBUILD boost-1.74.0-r2.ebuild 11249 BLAKE2B d11f5d42d1308e823a1d3d0d4114c5bc212ccb783c42f2606f97e9504b510bb549aee8c28916d573ccc099229d7c4358b643e5203f959ef3d0bdb449912b0cd1 SHA512 b0c01e666e8a473994365707d4d803ae9b52855eab19b8f57a865e418064b84d7dd289fc180e28008dcc225388c017e45aa189591ec7dcd43e3407fee6fa4e33
 EBUILD boost-1.75.0.ebuild 11100 BLAKE2B 95d3e30860c81855ee702516fd09384adf771aa313f937fe4266843fd1881a7dc37fc4ad83e57ef7588a17ae5afd4d654a5441c43f8114eb2a697a71ab505e56 SHA512 8ed1eef22c42c6f0f1db6b79a2ee6169fa37843cfa05ffd20b715c01f932e972c53f7f959331510ba377ddf3d4479cdc0351209088187eb820d32eff8bf8e1a4
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar

 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
--- a/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild
+++ b/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get weak or strong random data from pluggable sources"

 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-perl/Crypt-Random-Source/Manifest
+++ b/dev-perl/Crypt-Random-Source/Manifest
@ -1,5 +1,5 @@
 DIST Crypt-Random-Source-0.12.tar.gz 34495 BLAKE2B bd01673a8ec5fe84b7c22000ebb282b7b7c8a4b5ebe5b9404d1b37d92b670a669ad86225439f30ca44b406272f817f670dcaec98609d5eb4095da2153aa43c0b SHA512 821f464a9b344cd7e19f881acbf295a39ccf3b924f8822acb757c06f7ed2aa95fbee740b98a514dfdd24aae2dc9b5c7898751eab5bf7ea6f88218a6b162c4c34
 DIST Crypt-Random-Source-0.14.tar.gz 36362 BLAKE2B 71c4ed2e3ffb1797af1189adace071ea9eb8b1e400fc48c83e1d1ceb78e610131ea86152790991e5fddc81ff8625a32ee82a7ed22a7ce16c5d0e57b71c66dfe6 SHA512 25760ccfae42f44bd132915e3796042b43c1bc43195a97fc1236579c90b96957b3d86d2e68adde9d7dd486336f132982867413af251c66e527584e7309e0c729
 EBUILD Crypt-Random-Source-0.120.0.ebuild 737 BLAKE2B d1b539d6e6c8837f16c2da7f0f91e122bb77023dc34a63dae5fea0925b56e66b102508512c6c07ad247b0b8467d22fe153528d32171bf91086d31dbfccfef86c SHA512 31658b3f413518e87a1298eab5fea3ed8a3f6a14a96b3b68c29e35c88ac3392afad551e23a9d7d1c5af9ad298ffacebfd99b28a4fc78179debb16d0e2542dbed
-EBUILD Crypt-Random-Source-0.140.0.ebuild 804 BLAKE2B b3fe43e6869d6bb65577d4ac9723ec103a07fc1f251fcfb9a0dc3d514e19c98cd99169d8d29651b1f583362e01c355162abefb51f04f1ddca8465f16c0f02181 SHA512 e21ca9646c9d9b2c75f3aa61c16a36f46cf0b328b9877cee8f97cf91eb2bf3df6267d946d4df115ef01bc2e7582fb7b19a2c5d6176ee76e617acadface8a0996
+EBUILD Crypt-Random-Source-0.140.0.ebuild 803 BLAKE2B 171b7da400e9cae198c010150aaff32e2fb8405995cb05bb807f18a8092f6a1353f1a87331cb67f4f149ed7badf1485b27fdd7a845da38f1924fbbf9d9190b46 SHA512 36378af43079073da545c4d6b94f7b37a87dbc3fbfdc36eff74cbab459dd091347edfa889bbccd47dc9b63c61f04bc528e6f9843df95a0111834a226ed2a9bdf
 MISC metadata.xml 1183 BLAKE2B e8ee17d5f2854b49413622934ea3ee02f4767df11953978617bc2e132daf5e80e0fb5f1670e73d490296187c733ce010ed68191e0552dd8c232a0d52e30d3f76 SHA512 b87c4daae4d2c8c541b6e9c6c039c71da1d4cb3a37e451be173030cd930b2341c4772740640e486a4d1c11a7c27e440ae83a062ae6fec914d6f5670574cb905d
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@ -1,7 +1,4 @@
-AUX cffi-0.14.0-g-line.patch 9258 BLAKE2B a57cb8836dfcfb1124b1b72c38fb4c02d231fc7116c2de4b970e6423d037d1aa382173a4bebb9dafab0d690df485a64d824aafcdb16e31d01b391c25f4c239eb SHA512 335758de740050256af711e688072bbe4ac835551437bc2fbfd4dfaf5492efd5c722bca3bd8e5747bb0a88d3e7e6f82b78f85f5f42a4f11efb7b2f6c3ae4a492
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
-DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
 DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a
-EBUILD cffi-1.14.0-r3.ebuild 1374 BLAKE2B aa1e7b3446bf1083ecf9ff36e6e7ad65eacd5bfba4719e8d1990c0516677a45ee62e7f073bf39aaece1232f75fc66383b1454edc2b972c5fb1f0c6e3a4c447a4 SHA512 8149c596fd74c64ea36776ac72a53c271bb93d9b8d1f020b2ed7187d74f5254b3018724c1a096e00c8b01556d92a63546f624c491748fd1b6dac109609047885
 EBUILD cffi-1.14.4.ebuild 1540 BLAKE2B f08c6a66b21ad371e414e81999821fd7ee49b6b7bb436b8f214161cfd24afabfa490e4faeedbcd72f574b2f96bcd164c40cb4b0041105dd1deed61cb3217195a SHA512 28566fad5dcbf8d0775671c2f17ebbcac70a3a14af9f666a35e425ebcf3b37cc85bd90781f017092d0b27b60a920c6d63ae660e80f0fe6c05fd8a840947f7651
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
--- a/dev-python/cffi/cffi-1.14.0-r3.ebuild
+++ b/dev-python/cffi/cffi-1.14.0-r3.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libffi:="
-RDEPEND="${DEPEND}
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx doc/source
-
-PATCHES=(
-	"${FILESDIR}"/cffi-0.14.0-g-line.patch
-	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
-)
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_test() {
-	"${EPYTHON}" -c "import _cffi_backend as backend" || die
-	pytest -x -vv \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
--- a/dev-python/cffi/files/cffi-0.14.0-g-line.patch
+++ b/dev-python/cffi/files/cffi-0.14.0-g-line.patch
@ -1,250 +0,0 @@
-From 19ff1036043ae40ff3d8a2e1a6a793219e1ec378 Mon Sep 17 00:00:00 2001
-From: Armin Rigo <arigo@tunes.org>
-Date: Tue, 26 May 2020 15:51:56 +0200
-Subject: [PATCH] Issue #454
-
-Try harder to avoid #line directives confuse the rest of pre-parsing
---
- cffi/cparser.py               | 37 ++++++++++++++++++++++++---
- testing/cffi0/test_parsing.py | 48 ++++++++++++++++++++++++++++++++++-
- 2 files changed, 81 insertions(+), 4 deletions(-)
-
-diff --git a/cffi/cparser.py b/cffi/cparser.py
-index d7069a73..d9784655 100644
--- a/cffi/cparser.py
-+++ b/cffi/cparser.py
-@@ -29,6 +29,7 @@ _r_comment = re.compile(r"/\*.*?\*/|//([^\n\\]|\\.)*?$",
- _r_define  = re.compile(r"^\s*#\s*define\s+([A-Za-z_][A-Za-z_0-9]*)"
-                         r"\b((?:[^\n\\]|\\.)*?)$",
-                         re.DOTALL | re.MULTILINE)
-+_r_line_directive = re.compile(r"^[ \t]*#[ \t]*line\b.*$", re.MULTILINE)
- _r_partial_enum = re.compile(r"=\s*\.\.\.\s*[,}]|\.\.\.\s*\}")
- _r_enum_dotdotdot = re.compile(r"__dotdotdot\d+__$")
- _r_partial_array = re.compile(r"\[\s*\.\.\.\s*\]")
-@@ -163,10 +164,37 @@ def _warn_for_non_extern_non_static_global_variable(decl):
-                       "with C it should have a storage class specifier "
-                       "(usually 'extern')" % (decl.name,))
- 
-+def _remove_line_directives(csource):
-+    # _r_line_directive matches whole lines, without the final \n, if they
-+    # start with '#line' with some spacing allowed.  This function stores
-+    # them away and replaces them with exactly the string '#line@N', where
-+    # N is the index in the list 'line_directives'.
-+    line_directives = []
-+    def replace(m):
-+        i = len(line_directives)
-+        line_directives.append(m.group())
-+        return '#line@%d' % i
-+    csource = _r_line_directive.sub(replace, csource)
-+    return csource, line_directives
-+
-+def _put_back_line_directives(csource, line_directives):
-+    def replace(m):
-+        s = m.group()
-+        if not s.startswith('#line@'):
-+            raise AssertionError("unexpected #line directive "
-+                                 "(should have been processed and removed")
-+        return line_directives[int(s[6:])]
-+    return _r_line_directive.sub(replace, csource)
-+
- def _preprocess(csource):
-+    # First, remove the lines of the form '#line N "filename"' because
-+    # the "filename" part could confuse the rest
-+    csource, line_directives = _remove_line_directives(csource)
-     # Remove comments.  NOTE: this only work because the cdef() section
-    # should not contain any string literal!
-    csource = _r_comment.sub(' ', csource)
-+    # should not contain any string literals (except in line directives)!
-+    def replace_keeping_newlines(m):
-+        return ' ' + m.group().count('\n') * '\n'
-+    csource = _r_comment.sub(replace_keeping_newlines, csource)
-     # Remove the "#define FOO x" lines
-     macros = {}
-     for match in _r_define.finditer(csource):
-@@ -219,7 +247,10 @@ def _preprocess(csource):
-     csource = _r_float_dotdotdot.sub(' __dotdotdotfloat__ ', csource)
-     # Replace all remaining "..." with the same name, "__dotdotdot__",
-     # which is declared with a typedef for the purpose of C parsing.
-    return csource.replace('...', ' __dotdotdot__ '), macros
-+    csource = csource.replace('...', ' __dotdotdot__ ')
-+    # Finally, put back the line directives
-+    csource = _put_back_line_directives(csource, line_directives)
-+    return csource, macros
- 
- def _common_type_names(csource):
-     # Look in the source for what looks like usages of types from the
-diff --git a/testing/cffi0/test_parsing.py b/testing/cffi0/test_parsing.py
-index 3fc3783a..5f2d7ec4 100644
--- a/testing/cffi0/test_parsing.py
-+++ b/testing/cffi0/test_parsing.py
-@@ -174,7 +174,7 @@ def test_remove_line_continuation_comments():
-         double // blah \\
-                   more comments
-         x(void);
-        double // blah\\\\
-+        double // blah // blah\\\\
-         y(void);
-         double // blah\\ \
-                   etc
-@@ -185,6 +185,52 @@ def test_remove_line_continuation_comments():
-     m.y
-     m.z
- 
-+def test_dont_remove_comment_in_line_directives():
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        \t # \t line \t 8 \t "baz.c" \t
-+
-+        some syntax error here
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:9:14: before: syntax"
-+    #
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        #line 7 "foo//bar.c"
-+
-+        some syntax error here
-+    """)
-+    assert str(e.value) == "parse error\nfoo//bar.c:8:14: before: syntax"
-+
-+def test_multiple_line_directives():
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef,
-+    """ #line 5 "foo.c"
-+        extern int xx;
-+        #line 6 "bar.c"
-+        extern int yy;
-+        #line 7 "baz.c"
-+        some syntax error here
-+        #line 8 "yadda.c"
-+        extern int zz;
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:7:14: before: syntax"
-+
-+def test_commented_line_directive():
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        /*
-+        #line 5 "foo.c"
-+        */
-+        void xx(void);
-+
-+        #line 6 "bar.c"
-+        /*
-+        #line 35 "foo.c"
-+        */
-+        some syntax error
-+    """)
-+    assert str(e.value) == "parse error\nbar.c:9:14: before: syntax"
-+
- def test_line_continuation_in_defines():
-     ffi = FFI(backend=FakeBackend())
-     ffi.cdef("""
-- 
-2.26.2
-
-From 31249d786c833d4960bbbf4e0d7f7bcaecf92d1f Mon Sep 17 00:00:00 2001
-From: Armin Rigo <arigo@tunes.org>
-Date: Fri, 29 May 2020 10:27:40 +0200
-Subject: [PATCH] #454
-
-Second try with '# NUMBER' instead of '#line NUMBER', as gcc seems to output
---
- cffi/cparser.py               |  8 +++----
- testing/cffi0/test_parsing.py | 41 +++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 4 deletions(-)
-
-diff --git a/cffi/cparser.py b/cffi/cparser.py
-index d9784655..74830e91 100644
--- a/cffi/cparser.py
-+++ b/cffi/cparser.py
-@@ -29,7 +29,7 @@ _r_comment = re.compile(r"/\*.*?\*/|//([^\n\\]|\\.)*?$",
- _r_define  = re.compile(r"^\s*#\s*define\s+([A-Za-z_][A-Za-z_0-9]*)"
-                         r"\b((?:[^\n\\]|\\.)*?)$",
-                         re.DOTALL | re.MULTILINE)
-_r_line_directive = re.compile(r"^[ \t]*#[ \t]*line\b.*$", re.MULTILINE)
-+_r_line_directive = re.compile(r"^[ \t]*#[ \t]*(?:line|\d+)\b.*$", re.MULTILINE)
- _r_partial_enum = re.compile(r"=\s*\.\.\.\s*[,}]|\.\.\.\s*\}")
- _r_enum_dotdotdot = re.compile(r"__dotdotdot\d+__$")
- _r_partial_array = re.compile(r"\[\s*\.\.\.\s*\]")
-@@ -166,9 +166,9 @@ def _warn_for_non_extern_non_static_global_variable(decl):
- 
- def _remove_line_directives(csource):
-     # _r_line_directive matches whole lines, without the final \n, if they
-    # start with '#line' with some spacing allowed.  This function stores
-    # them away and replaces them with exactly the string '#line@N', where
-    # N is the index in the list 'line_directives'.
-+    # start with '#line' with some spacing allowed, or '#NUMBER'.  This
-+    # function stores them away and replaces them with exactly the string
-+    # '#line@N', where N is the index in the list 'line_directives'.
-     line_directives = []
-     def replace(m):
-         i = len(line_directives)
-diff --git a/testing/cffi0/test_parsing.py b/testing/cffi0/test_parsing.py
-index 5f2d7ec4..a5e45874 100644
--- a/testing/cffi0/test_parsing.py
-+++ b/testing/cffi0/test_parsing.py
-@@ -199,6 +199,21 @@ def test_dont_remove_comment_in_line_directives():
- 
-         some syntax error here
-     """)
-+    #
-+    assert str(e.value) == "parse error\nfoo//bar.c:8:14: before: syntax"
-+    ffi = FFI(backend=FakeBackend())
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        \t # \t 8 \t "baz.c" \t
-+
-+        some syntax error here
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:9:14: before: syntax"
-+    #
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        # 7 "foo//bar.c"
-+
-+        some syntax error here
-+    """)
-     assert str(e.value) == "parse error\nfoo//bar.c:8:14: before: syntax"
- 
- def test_multiple_line_directives():
-@@ -214,6 +229,18 @@ def test_multiple_line_directives():
-         extern int zz;
-     """)
-     assert str(e.value) == "parse error\nbaz.c:7:14: before: syntax"
-+    #
-+    e = py.test.raises(CDefError, ffi.cdef,
-+    """ # 5 "foo.c"
-+        extern int xx;
-+        # 6 "bar.c"
-+        extern int yy;
-+        # 7 "baz.c"
-+        some syntax error here
-+        # 8 "yadda.c"
-+        extern int zz;
-+    """)
-+    assert str(e.value) == "parse error\nbaz.c:7:14: before: syntax"
- 
- def test_commented_line_directive():
-     ffi = FFI(backend=FakeBackend())
-@@ -229,6 +256,20 @@ def test_commented_line_directive():
-         */
-         some syntax error
-     """)
-+    #
-+    assert str(e.value) == "parse error\nbar.c:9:14: before: syntax"
-+    e = py.test.raises(CDefError, ffi.cdef, """
-+        /*
-+        # 5 "foo.c"
-+        */
-+        void xx(void);
-+
-+        # 6 "bar.c"
-+        /*
-+        # 35 "foo.c"
-+        */
-+        some syntax error
-+    """)
-     assert str(e.value) == "parse error\nbar.c:9:14: before: syntax"
- 
- def test_line_continuation_in_defines():
-- 
-2.26.2
-
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@ -1,3 +1,5 @@
 DIST cftime-1.3.0.tar.gz 55668 BLAKE2B c233a3d45305476f422ca93f89348b7b3c018b10c0fa42d6649001b7bcdb4d26d230322108def41818449ec78dc531261b52d09252306fb5889ac4011af33828 SHA512 07f79e902142e8a314c9d09af08ea752454e490c3027ee44853f78c725305bf11cad90bd331edd204defded11e7f29173df9bef70ab805a28b745cc0afdd4685
+DIST cftime-1.4.0.tar.gz 46098 BLAKE2B b1ca1eaec2b0b5015d6d8d512ae831bfb36c59061c094f5eaf5931f85ecabdb1b562d1ab56cb1b0b0fcea36fce15d073411fd9afd955ec864a4ca9a71f0a6a82 SHA512 72862d35cbe32eefb1149b345e63fabf1a58bdb145138ea82fb21aa8b4862abae53a2c7719b8cf56670acdcfa9c7bb090cb35f8c2ea711e23bfb031f72ccdc2f
 EBUILD cftime-1.3.0.ebuild 668 BLAKE2B 2ca2533b73544b21fd9f2acdb6ff97f44cf663b17276d6c7a16ab76d8d82485d092659cfb391b80b29e90c7aaac3bea6376507d9f72ac0e6d3e86271ba3fb881 SHA512 34c674a50d316954bab091b5e4aedb77804cc8ce27cac000c33402bff73a89e16ef945f933ed803f8b0ece5dfe7f5d017b4b1855d4bef8f6e864094f3c2867a0
-MISC metadata.xml 376 BLAKE2B 789faddd69bc9aa985a9a8365c0a7441c83ed4d8a273644562a11cd76bbebef04f27ce5728d734993f961a3e4f1b2a69833566132eba1f18344c05ff590cf36d SHA512 1519b5aa6047dc20da5d3627d41400fc44c909cff0a9a6db585d5e3b94664c6d6eb752dc273fbfe5ff11eb8d65bcec4a8717e3bffbf5315a55f9e7920e2ba86d
+EBUILD cftime-1.4.0.ebuild 640 BLAKE2B 210f22b81888505c817c4ce42144fffc9525f63be92b298b7c2a4df85068a8963cbad77eb9535446e0ec0061d1d75559577d09d9b905c3180ae7203e68f701b9 SHA512 a9e5653b73c8d4c931cd7d5909b41f0c6c04252e26ccffbe703a18541f5c38347ad002015ea67cbf71234e3bc9b8b7ea2df6cc895b15aee4792bce9884067d6c
+MISC metadata.xml 477 BLAKE2B 2a58e3eed817ebe59f85ab9a43d5c4d89cc46e492808baeeb52b5f35d2b1002cd9b219730be561b79aeda8f13432027784e3eb6f0731db2a755c749ded6ca919 SHA512 5a7cedba92edbfd654eddb4b76177913a8dfe88fb634b184c773460d549822488d832946af3247c5d11fe14626400e81d804cd106b92566cbf6fe6601deaab69
--- a/dev-python/cftime/cftime-1.4.0.ebuild
+++ b/dev-python/cftime/cftime-1.4.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="https://pypi.org/project/cftime"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "/--cov/d" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
--- a/dev-python/cftime/metadata.xml
+++ b/dev-python/cftime/metadata.xml
@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">cftime</remote-id>
 		<remote-id type="github">Unidata/cftime</remote-id>
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@ -1,3 +1,5 @@
 DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
+DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
 EBUILD cmd2-1.4.0.ebuild 1519 BLAKE2B 2fcb7f29a61b2ca13332499539493291e4a4559f4751a8cffc20ee81a2db97ddf6962e47fce9caa24ec2b890ab01d52a87d68ec0e0983faf0590c8015809924a SHA512 c7d5b7748269e11da214f72bbcdd1bde041399f220beff57a467be70723c13a6f10576049303dad723a8f70d6aad1c87e8af676217c26b350dd02f02f27a47bc
+EBUILD cmd2-1.5.0.ebuild 1411 BLAKE2B daa6650a2d4e33377982db208e269d3d553b8f3a707f8032bbd5bc12fee0b3663228d0899ad59e5740b9be89f1a8a42012737b0c93826b347d7bdae3011c4fb6 SHA512 5391f42cd82bbe691ab2f442f139e0adf5a89fde98245e0e18e3529a1982c6a7e01e2fbec83aae7dc6c3403a90fce7115ec550cd5d2209ed48f42d2d2bf1d130
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
--- a/dev-python/cmd2/cmd2-1.5.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.5.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@ -1,5 +1,7 @@
 DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
 DIST flask-paginate-0.8.0.tar.gz 119687 BLAKE2B 0c73f1d72938fe2cb322ec53e1ce3df083c81f1b2bc58f150af1e602c7e435aaa844534283f83337cd9840f8ece69620de9e63e3f8017f848b5dc2fb54f19848 SHA512 1958dbf5675b24ae175098c740e08cc3aa9d2088f6f10768083a740fba3a87cf4b5255ddbc5fe72d286fb04817f527fba9fca5b09af2929851c5ac1eefe3b4d7
+DIST flask-paginate-0.8.1.tar.gz 119751 BLAKE2B 954d39e13619784b1a79abc9f26fc2b3827309f9a3b77cacdd40c8f8d9dfec4c2967894e2d571e26841245da6d264dad71a412e425c87aa0c07b3520274de7c4 SHA512 ca226c79bd944a19760048c1289b554ee048f4f8d1f231f5545423843b7c0616d52ee8024cc68628e11c5f528972897d7fdb1630f87063bbd0e40c4dacf91224
 EBUILD flask-paginate-0.7.0.ebuild 593 BLAKE2B e3e4894d94073a8dd1809a566b8d9e79a94c565897db5ce76998d5b1c5ec9f5d81df582adbb518c5a41c8b13980050e961e16fcca4864b9d6560df09ff98a3e8 SHA512 9f423f1966761c70360696b3a2f32a9d3af157d8a80e76fe4af1be557217f75574e73fe1827852e2cb8a16f48f7066653a8f35d6fd3a906bbdde772d9dced969
 EBUILD flask-paginate-0.8.0.ebuild 560 BLAKE2B 7e9d684795a9e73c7528f685e06885dfa05b3a8ba1d42310956a34c2529f398f1d590621f2392792f2c1a55b285077f713b6cf167db60698d10bab78c0128596 SHA512 ce57a817c9e81870adb83d6798a624ba2205dfdf8febf32808c3efaf65eb028998d483e589364dee4b77d97f7598fae097f7affb1978e889a13f308b1c284ceb
+EBUILD flask-paginate-0.8.1.ebuild 560 BLAKE2B 7e9d684795a9e73c7528f685e06885dfa05b3a8ba1d42310956a34c2529f398f1d590621f2392792f2c1a55b285077f713b6cf167db60698d10bab78c0128596 SHA512 ce57a817c9e81870adb83d6798a624ba2205dfdf8febf32808c3efaf65eb028998d483e589364dee4b77d97f7598fae097f7affb1978e889a13f308b1c284ceb
 MISC metadata.xml 628 BLAKE2B 00e9d81fc31246bdd6226d7d2e92b6d4b95bd91052d158d8b96e8c3c1f9d5141045c68cb251fdba8d0ede3ecb9a860b1856bc2ad9cae3c79f7930f88dd0b32b5 SHA512 31725441999fdbc2206d7b596e48f5b071f00ae832ef54bbfa9f47c6fa4b0acb45f6d5018cd40009b22b70da1273bda7d553faa10bd6c158517f6212cacae95a
--- a/dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
+++ b/dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
+}
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@ -1,3 +1,5 @@
 DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
+DIST jupyter_core-4.7.1.tar.gz 68886 BLAKE2B aa89351845c669474c03a307934a5d84b6357679bc99f2fc7da4f93ff347766d52ce3551780803b73941d6457f7004306e795398fd390c81e9180193a2119225 SHA512 bc190abd000566dbd097dcb14acf1926c92bb265f2cfbbd14dac6a9cf7d6a02f924ba89fa957ca30c2af57433e9187e288bb8e80d039a3d3a583c6e488a9c80e
 EBUILD jupyter_core-4.6.3-r1.ebuild 873 BLAKE2B c12862c168695134a8c52a77060095a2b9561cc63ac212267cc91116144466b22d89accb0e0e48309c359017c9de14f15c42404d2ce210258ad0a44798fe19e9 SHA512 bbbc98f07bd98aad3d0a719ebc1c0a0b398138fdac6c259c886dd502950db26508a8da010802367dddaec04d7744e037e3e8dae272d478a20c3b07897bb9825f
+EBUILD jupyter_core-4.7.1.ebuild 1041 BLAKE2B d293bb8833b7e69d946c7428a57668c2ff058199128fb590ef631f136186d6735ca7333755890b46f3c09a2738c08cfad2a22d490d590a31fb0dc09b52a610d8 SHA512 f961279743b7cb4e630fcc195cdd26e72d3ab471425aec6208ef0e90f391d412d6eda3a2f1cae2c615e9c2062071eebe4c75f92c8699213f79e023f4fe685291
 MISC metadata.xml 733 BLAKE2B b53498df76d4e2adf05087c94920897408001e3852dd2d600f7f08748c09e8248d2d2be301ef7691db2ef1768369d935cfb3d03bf0dce44db8f0b8e98539037d SHA512 a828f64941f7f50c82af438692a21614115df2f151064cc684ddda16c6a7dad674efc2563a68dd6b01ca9edaf07c6d2e54a1ae6803f72bfa9e5e14995c4ca37f
--- a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# fails if jupyter is not in system sitedir
+		# (PYTHONPATH is insufficient)
+		jupyter_core/tests/test_command.py::test_not_on_path
+		jupyter_core/tests/test_command.py::test_path_priority
+		# TODO
+		jupyter_core/tests/test_paths.py::test_jupyter_path_prefer_env
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@ -1,6 +1,8 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
 DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa2057d69e681405d9588c63b3a6e4a6daa58b8996541825c73ff4dabc5607874c2d7885586d793a6436e3f680aec2 SHA512 d67e39daf65c92ebb5bf69abb0c5dc3a88460228b5ec5ee762a11fc909369562411297e8ff9f512ee1ef539d8abec765924be581703fb7e99963c6512cb1f0bd
 DIST llfuse-1.4.0.tar.gz 478758 BLAKE2B bec4d6b53936bc79ab4ca8fce7b34d60e39aff6128a186d58caeac68ad135d7d29bbd667cf669e065256e31e257ff4516ff967759d6152672659df0062d03e6d SHA512 8ab92912279a478ba50cf0c151cce3ce1125de27922a97c4da4b3af4ff0714e3a2c5a9e6fd10b87653eb552509491084f018ae3ce4feb7bf952de00a5be3eccc
+DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
 EBUILD llfuse-1.3.6.ebuild 758 BLAKE2B 86126eee45c991350817dccf250b869be8cd667af9127df243d10d3824c87510af00a44237ff76ad81ba52eca6f15f82a7a4b33266b74252efe66d552f8c349c SHA512 dd8e2e4d8f8b04d886866d74826b494e10e7bd18cc5314617402c662b08d0a246fbd76a456a8f1b79dd15b91f428baf3042774d62cb7b6aa0774c376ecaecfcd
 EBUILD llfuse-1.4.0.ebuild 760 BLAKE2B f1558bc8228bc767d26c0be65363dc9c2a156180e7e8f2e83f9b93c8f816423e9257f5a6603b28d072ad4fa0beb57de8c053b2968b4ba0ac68b300522f1d3d45 SHA512 851bdce44eff82d4c7edaab9fb72d22d04e7fa5f6425c3385a6d0e258507d15f5b5ebc434091e4c6e095cd156844aa2d332643f759017238d349371456a5b184
+EBUILD llfuse-1.4.1.ebuild 784 BLAKE2B a29ebd850e449a08f8f31ec8932416db03d102f6b14306275d1f2a3bc0f7e056a1e09c3abc7a5d505954d86106d5bd6fb4e2d5dbbe744a25cae290065952b3fc SHA512 f5b28a7ce1db49b33ef94baaee9b64b3a16d5c5d499c04a8ea805cc302fd25b5faebf5e949fc031f2d8ea1391273e36e632f3a806854cc9fb4497440714b5a96
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
--- a/dev-python/llfuse/llfuse-1.4.1.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="https://github.com/python-llfuse/python-llfuse/ https://pypi.org/project/llfuse/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=sys-fs/fuse-2.8.0:0
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@ -1,3 +1,5 @@
 DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
+DIST Markups-3.1.0.tar.gz 20146 BLAKE2B 426c6f050868e423eeb7f01cee930b088c4b6f7748b7f198f03880cb7d6cc237575c6253d40631aad1601e193ff0e2b587906492c07b953903ee12422e06cb3c SHA512 eaf99b8f521dc93008e0e2519e5c6e8885609457739378d5af6e3aa044a9dd1370bf906a061d8a284d8ad4f9c5196c01a6d8dde3a4630898fe4711154cef7ce0
 EBUILD markups-3.0.0-r1.ebuild 870 BLAKE2B e685c504ff90b704ee0d33fb4e2930ebde2fe05df30669f43f6efec16bcac9f6367e8be177dd8f724e42fea915d2443de3181ededb486e308fd98b20f54d676f SHA512 0f38bd1acc36e8d5a2c7a300ba43e02e7adb079c6c417b4a5cb2ea00aad470ef957a6d3819ea4fb2a3a807aade67e182fde60ed4c27158449a01eb24ec812510
+EBUILD markups-3.1.0.ebuild 930 BLAKE2B ad4606963f4c409233a19a0cb26bc8fdf0005192e62412e2b68d6e2e465c4901817513d4c639824668a1e42c057168a3b22d90482d921f106e030b8ebbc27175 SHA512 c71a3b6ab327053febd0f9270919c4ef7e3759cc6a68837c0994012d4392af66e3b2a71e7610abf9bc01d0f2a57207a1ba72a272d994e138d5449f0dbea68d3f
 MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
--- a/dev-python/markups/markups-3.1.0.ebuild
+++ b/dev-python/markups/markups-3.1.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P=${P^}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	https://pymarkups.readthedocs.io/en/latest/
+	https://github.com/retext-project/pymarkups
+	https://pypi.org/project/Markups/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		app-text/pytextile[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@ -5,10 +5,12 @@ DIST pikepdf-2.3.0.tar.gz 2366792 BLAKE2B 3e5d2f460702bbce8ddc22abfb67867b40f75b
 DIST pikepdf-2.4.0.tar.gz 2367657 BLAKE2B c6b126f45baef8d3d4bea40851650f6ee2196e60618f490952f74491744b6536a01040de685c5114ec5aad2e8923092498594ae28b9e9f14f2da579816a198e0 SHA512 42af99ed5446171449d46d4dabf444623ce22b81819bbef992735e67a58ed82e343b46779f323b96b35e076014464e50ac0e4f5fd3553482c750488e091b6fd5
 DIST pikepdf-2.5.0.tar.gz 2368422 BLAKE2B c30fcd69dd5297b04c0b116355f14a8513ce0a0b8797f3d85672957302275bdb04b382a373d07d40ef3480dc395e51a899eda8e919a74070083fec0209dfaa3c SHA512 0c685985b17388a8d355486a5dc2ee5f4d855f1247977d96dd249744cea347f575770250b1a952fda7821a3f4c830d5e079e15642bc669b70f69f4f2c5bf4dae
 DIST pikepdf-2.5.1.tar.gz 2368435 BLAKE2B 19def787013c5ee027a1477fe77dc38d10f1b8f6678f92afe0a7b3fc8e696e12926a80b2034e780c1fd05033ecf2facd6caeefc9062548648f64b0774754f9d5 SHA512 ba514f9a713d1e322224d9e6cb81df3bb399ecf1d54449e7fa171e59ce39bae25564752cfff97a93e2c3674f540cf2143f5ab4ac9dff928c1dfe77415db9dcc1
+DIST pikepdf-2.5.2.tar.gz 2368463 BLAKE2B dcf7e2c6f8a2a9d41073f2528fa6a13d5d79c0915d4dba810fb13a989039beafebbbfe0c8211f0a769ade9889af0c99ce1ca5052c74d0d88d817447dfdb3a7d5 SHA512 52e13805d4712f623af6c91eb287009abb6179d28451ab0a32b3472c4b8e484cc5700c3a32bb98cd7a188d4249128b2a2ef7fb19e8bc5aee4488627df161c38d
 EBUILD pikepdf-1.18.0.ebuild 1521 BLAKE2B 6ff1421bd96ced6370f1dea8dd0b656cb39326b377492fdbd66f7b52e3e69df8f0635e52ef8f6d7b2589bbca14e88cca8cf6f71f3c6047432c7d7bb5c017a11f SHA512 9be79f44d2cb60797f08c823e9842b7ed92bd96514e250ab7b15e80d21a28bd88089b81f70ad6be76c73cb66ab654b4ca09cfc318d93d3dcc2210a3b2113a16f
 EBUILD pikepdf-2.2.0-r1.ebuild 2015 BLAKE2B de1046a9ae82274f0e5e312883c0cf49454f1cde0395c84e89319cc49592bcb4c4af4fd0a4dbb435607511ccf13dbfde623fea7bea09707f6e1f4614cced1454 SHA512 d22a500538b85eea35f3742f9c407343ac598f65c180bedc893b3a37fa2317d916aa97b64b62e8dd884622ff4f3af5f522227551ea77f99a44e699c83f7f7a06
 EBUILD pikepdf-2.3.0.ebuild 2015 BLAKE2B 96453c58972855a6d865f2786a8ab9464bf3a56ce8bb76e93bd224d41c8b2d9b464a38dbe801a668475f39626a6c4d335feedf88c7217928a6ee96477d781cb5 SHA512 db1102fa4e22687e8bf3f536a7d8ad79b288d9e44953652077c2738c9ced0b71f5ad342b93d3e2076f09737368417f67b0a743a76a5ba0a1b49fd38a6d91a158
 EBUILD pikepdf-2.4.0.ebuild 1478 BLAKE2B a4711977e7271b6a6f63e379f668774093f8c9ca7616f3a4ab5bb876b58902fe64ee15cf30ddfcd38276bed68f765812b855130ad505a113d561cffe500b9f7f SHA512 a1cc15c6ffe5a5690e002d68dfc2c92b141fa333df2c3ef2ffb8b17ae147e352caeb4783ebe04392ed53ed724efd9904c70d6a217940556593988a5c8ea1536c
 EBUILD pikepdf-2.5.0.ebuild 1478 BLAKE2B a4711977e7271b6a6f63e379f668774093f8c9ca7616f3a4ab5bb876b58902fe64ee15cf30ddfcd38276bed68f765812b855130ad505a113d561cffe500b9f7f SHA512 a1cc15c6ffe5a5690e002d68dfc2c92b141fa333df2c3ef2ffb8b17ae147e352caeb4783ebe04392ed53ed724efd9904c70d6a217940556593988a5c8ea1536c
 EBUILD pikepdf-2.5.1.ebuild 1478 BLAKE2B a4711977e7271b6a6f63e379f668774093f8c9ca7616f3a4ab5bb876b58902fe64ee15cf30ddfcd38276bed68f765812b855130ad505a113d561cffe500b9f7f SHA512 a1cc15c6ffe5a5690e002d68dfc2c92b141fa333df2c3ef2ffb8b17ae147e352caeb4783ebe04392ed53ed724efd9904c70d6a217940556593988a5c8ea1536c
+EBUILD pikepdf-2.5.2.ebuild 1478 BLAKE2B a4711977e7271b6a6f63e379f668774093f8c9ca7616f3a4ab5bb876b58902fe64ee15cf30ddfcd38276bed68f765812b855130ad505a113d561cffe500b9f7f SHA512 a1cc15c6ffe5a5690e002d68dfc2c92b141fa333df2c3ef2ffb8b17ae147e352caeb4783ebe04392ed53ed724efd9904c70d6a217940556593988a5c8ea1536c
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
--- a/dev-python/pikepdf/pikepdf-2.5.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.5.2.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@ -1,5 +1,3 @@
-DIST python-dotenv-0.14.0.tar.gz 29029 BLAKE2B 33db159192faf9b74439b5e98e2b9a090a68001ac19eafd2925071ac7fc1872f7ee585b575dd96615c2ef934041dbfacca7948b7a8a69419243f9823f3bf6b42 SHA512 e8f6d575cd76cb231d14d98befe8a75017c927e0de39fbffc0ecb852b2aab1ada964cf37ed51c50968a4e8a96822a794c960a058a6deb6a2f0a8f8061d0560df
 DIST python-dotenv-0.15.0.tar.gz 30008 BLAKE2B 1a406145f0d0497aa037dc95b80fb04854b2889ba4014e4689a24b142d5d71c49d24ac60406f8b2dc873e661c19e36604ef58eb03c7bc9f890f6d4561be199a6 SHA512 f1f16d2688041259027b12920ac5f47c2d1d96cfc3ec8a362a05ddfb13fee2cf4926c20ad38eda521fcafb6eef8d7895d86dedadef1b1ea2ecd7e33734b07cbe
-EBUILD python-dotenv-0.14.0.ebuild 840 BLAKE2B 85d47950a7f9d37c77d9386badb4a8b8d2ee294f2d0f7581a9cac7de188fa8c93ebe1fd6c5c5526c57483c45c4ed1a5b15eaad1ba525ca4dcf9f1e4fa1ca8854 SHA512 9bfc9d2af8dee02efcbfca297f05f0380e78b36949a82baf5a8314ec65c3c3ffe3d58e499d7b20047010cc158968fe503eb01af32cf6e353cf0d32db46662258
-EBUILD python-dotenv-0.15.0.ebuild 842 BLAKE2B 5e54a5b61358db938889a2b3b99bccaaf0eb21bfa60454d265b471f1e4f054f4f441228a10e9bc2ee12f90a3b798df71f6f54548629ffb0ed6e7db75d817c167 SHA512 68fcc3118f39dcebd34e5c731187b783c8ace62a9408d1adabd432c80a040b32dc594e6af2896fca270517ea341417c179807c2078527ddce39baf300e05a7d4
+EBUILD python-dotenv-0.15.0.ebuild 840 BLAKE2B ee90c8e55e253dcf006b65bcb4763e4c1f1e1fbcca15465732660cde676a9008aac026c39850a61bc6a0d6d03cacdb4035bfbe9427ba3178ea61ff6c665fd20d SHA512 8bdaa927abd5844ddcb9848bfbdd73c43b7f88fc10f73d21a3694c8b3143008d77880991305d5e8e7b4c9cd1fa3f4ec69812f77de28bff6ef3ac5ba73cfd1ef6
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
--- a/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="test"
-
-DEPEND="test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Tests call the "dotenv" command which needs to be in PATH
-	# https://bugs.gentoo.org/743784
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="test"

 DEPEND="test? (
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@ -3,6 +3,8 @@ AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088
 AUX pytz-2020.5-system-zoneinfo.patch 1294 BLAKE2B 0f6f4cf1c588b90827decb19d82d7adf97f44769b2acd4038d6b818ae27162f576338b61de6775b4aa387b4a1cb434b36d6f14fdf1eaa3c878e2af7e9ce32620 SHA512 aad785a23a3681de7d52c4898eae4d7f33ddff9c136f52111ab0aef076d0a3c72c7b0aa0910e191f3098baa05c09f522e927a94967481a89d1d1bcbe99824e3b
 DIST pytz-2020.4.tar.gz 310941 BLAKE2B 8abe524ccb7ed676c64dbc129ade5d6562980ea28f8939a3a7a406acf16a8a936e79ff630bf37884610e8936dfe96311ecb752f3b79519a126e1f1ac48883842 SHA512 dcbe763bc6e48c52df855fe03a8109dc0656a0e851324c0468f4307e8aff60e577fe0c9f0b062319e90d2f639b96e98edf8346064705e244143386c863a0aa7c
 DIST pytz-2020.5.tar.gz 314194 BLAKE2B c374e0ee803878ad2dde1ef03c108f59f431d645d8067fb9f183b9feb029b4de283477e7f6c146a6d03462bd5cb4fc98118e03601c838f73903f5f7a7d28bf8f SHA512 0845c0b7cefb8732e3016568b17ae73232fe6537bac6da89cb1bf911ba5786ee1be6b5e3aa8767225291e3a7e9afd5b8e40e4051671a3a006f9e2f71c551e13e
+DIST pytz-2021.1.tar.gz 317945 BLAKE2B 5d8b5ac80a9d5be56977df8a422e9f008ccb1afb9468155c53aa97f0bf43ba15c27fd30ee7be035be6fa590dcb272991a069cd1383f1c6c8d378958d7b0c4970 SHA512 507e24e3c5c2c619d9f3c7f4c33d44d262e33656b07701d0db78f5d67b263ad845dccc4ff50e48c580b0f295cf97ed146af7b9259890a50bb6da4c82b70c439b
 EBUILD pytz-2020.4.ebuild 943 BLAKE2B c1c12746f6aaed0003008f62f84b9f830da2a1d3183abdb9693ff92a19466a0767d0f3525830eaac3742da2a1fa3c2fd0d865004cba672b821c6ebb8a79886c5 SHA512 adcdab012c09cab47c26947e92a3382c3f286117e4f5c5e290e467e26b92fc5ab2125c946d51ac85f691a8c13e51af1d97646614696723ceccd61a1c310ed21e
 EBUILD pytz-2020.5.ebuild 872 BLAKE2B 01365958859d412d7452646a193a3e444fb0c1e26f743dce42112456269245e0bb222a903ef5f6cc6e61661ba5d6c73a5bee74be869b79b5295464349283f0e7 SHA512 5a91957e6b45577b049a50b9a049c7417ef951854c75cb8458a7b243ae3f6160532fb3050382f76467faa11b32806b35805493b41c6f82618077b9416fc983bf
+EBUILD pytz-2021.1.ebuild 879 BLAKE2B 98fa7a0e1e92cfa0654b8a5b489b007fdf868c306fa07efea38d1e85388087f75ad5ad4efb9b5f2e5ef39aa4c238cbaea1beb3636df389750892bd09590335d4 SHA512 1e2d8bee9de12d26e6446aaaac9c3a3bab2a11388555d8efd1f2e603565e06923ff3aaad69c3474c0a02d8faa35e911e6c2c70151dd337931ac3eadba75e5192
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
--- a/dev-python/pytz/pytz-2021.1.ebuild
+++ b/dev-python/pytz/pytz-2021.1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
+)
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@ -2,8 +2,10 @@ AUX snakeoil-0.8.8-py39.patch 1243 BLAKE2B 30c096614e4a4023781a1ba0b5694e5c61521
 DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d
 DIST snakeoil-0.8.9.tar.gz 271205 BLAKE2B dcaf4d26b430a2e99481182aa912a884a0cf5943f65028f4da098ec1b0ab177a97aeb0743d90cade589eba598598eccd275b15379d281ad0dc0bf62badd24c55 SHA512 d80f4c5be5d97598a119bd29413df1960487e4af2532b33b03c17337d15d24b34c4e5617f0d5d40db973f009697de25ae8c5bf5e60c19409835b3e77b4ffb461
 DIST snakeoil-0.9.0.tar.gz 271675 BLAKE2B 7dd65335fd79a7d335e5047ba928d7c156c5758874e20e41a06fc25fd2133697bccadc3cd24bcd611b7b210dfe330c121487c6d5bf5afa6330b714c928f3fd44 SHA512 c34938fdc5dd41ab84c5775090cc6bac1ac6bf0bd145c8d8966582917205ef422da272d12e4272afde764f52c62c8f02be076ce13c6552e0384a18fc8442cf96
+DIST snakeoil-0.9.1.tar.gz 271045 BLAKE2B 74c45d38d294e06940d4a339e6d6c6e66d84b7fd174b4d79a9716262bc1902d47dfed1751b44183f9119ccb3bd50e11700951d15070a15b94d6a7b20f77c5919 SHA512 94d8baed4baaab8c3cb3631fed4e6cced8fa32c953bba2ec2afd0cc99eb9b526dc58e5e9efb402513b0416cda21a0811b14a2a98044fd1d5bb7f6f2b349db24a
 EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 23757057ae12f52670278b905bbc32c5fe937587cd1db49eed123ce31163f4c3d1fbc2d1434c290aace0bf14756790b35fc6e48b176f790c5635628abc7e716f SHA512 44cd2098f4bad925f8d4fcec61d4367f963bc4a10566ca52542c4eeda5019527166ab9f358c3b289a5c6c1ff7698f770da84cb799f57d68196ef9c28286aeb94
 EBUILD snakeoil-0.8.9.ebuild 856 BLAKE2B 42754983e2c4c21405112dd562722fe1065ebce7c16bffa2902eb14d3b00fc534ca566f9a22665463b5ca48532a86f91ad396292b2774e9ed9a4c46022bc7699 SHA512 75db4d4ef4b92d0cde7c42cc9f7bf9bfd0a5aa1d148aff6dfe9b32bd695d121f4738cfe2805d48a1db34e1bf4a7d0766c82dcb51560b27cf0749cffed0c0e6c5
 EBUILD snakeoil-0.9.0.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
+EBUILD snakeoil-0.9.1.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
 EBUILD snakeoil-9999.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
--- a/dev-python/snakeoil/snakeoil-0.9.1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@ -4,7 +4,7 @@ DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c12250
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.27.crate 26395 BLAKE2B f510c352ba6cb6be2e20d40e176bd48f7bf39dff4a0be288f54da60346f2fcb9b6376a4f139fbe13a9178ec8feb58a28badc209814d6ed9d1decd7b327ac8a4b SHA512 ed880d594fa5d17f14abecee56f7b2742b9ceb744bf8548c99c0ac6f3880f761df657959ecf512d7d194f75055db668eaf1a8306876d596b471b12ccffb8c959
-DIST anyhow-1.0.36.crate 29083 BLAKE2B 62166679a01ba1a2935316efa74b97a990f3ad720cbe339abc333a8609462438ec0268c4f3e6f5ede1ec972a23ce982d8e5de057c3f76b3f711b1d1d1cba8fe9 SHA512 4128dade4fa361230581973809598556b188195f5cbd951f2be651cb9bdb9ce6bbc45e70e0f05044080b054524d379bf2661cddc85ca157f0b260c1c0b492bda
+DIST anyhow-1.0.38.crate 30417 BLAKE2B 168c6692fa669e90bba848bbb830fcd18ef2e2359a6f0f6b0ac8a20666b9c8416ac79e20d1b31e7230e261284502ede8091adc6b8cfdb462e8c4ad57a2cad651 SHA512 3f6229fd9d284053f348f8180f9b1f1c1f1b711b733ff9a331b2f16ad6dd0c46a38ec17c8c8257981209230ba769b7cce349b64bb7f6f8ea6150ab9d6e483b8c
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@ -16,9 +16,9 @@ DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d9
 DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
 DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
 DIST cargo-0.43.1.crate 1119258 BLAKE2B b6ab277b4c06064fc7ba84f829363a5bcc2e484136b2f50f75354234f6114bd424d2f88952dc45c7f671751cd1ebff3ba3076c5cc648de0550d5ef1e122dc3ab SHA512 950e6f30643b38c90bddcb2be34f02c7e57da1e3f8afeb2f0f1037d93a877928064748339b40ca520ed045d36ef5c25a8bb3ad294316fe657368cfb50163f399
-DIST cargo-0.49.0.crate 1312720 BLAKE2B 700e677b5b2ec9567219bcb3103829542d459e5ef79a40093626cf056370176c68be008b741a21684661661cb079c085869e56bdaa21d5eb6cc0cd4b9884c6c7 SHA512 2590a4a71f756e5f614ec500be39c08c627994b6c3fff76c5d5c7fbe06bd7bdcd4fe1bb4971b54eb4d8b5b10780931fdbc1a410c049d97ee84b9eb8c2502a6ac
+DIST cargo-0.50.0.crate 1333002 BLAKE2B 6cc353a73d89d797b52905916153261f72ee1308663e3640ad4ade08a91d9d61316cc943628493c8890d0798603857f2aaec7d066c2cf86a68ef03c8666016c5 SHA512 f4bdcedf2bb4789887e27b635a365db419f4c4b9b65c31a28919a45ec5254b1fa6167e3d78598d73df95e31b6e208f9287ade64742eb98ef31cbf1016fe72d68
 DIST cargo-c-0.6.2.crate 19994 BLAKE2B fe2c9a8eabaf940082628ffcc481ff45640d16fd95e6e9dc8fa447aef13569db3257e73c81b1b0abea6a61aa57ca2a86eccc28f2a9ecad9bc698c6e73f9fa6c6 SHA512 430a5c96ee230419b79d80cd979d8baf59ebd93bbb75115c0c77dcffac1dc6b1c9bdf1e91fcf45619d3aca608f91573e854dd41921c1cc2a53655a7d7c7c8f0b
-DIST cargo-c-0.7.0+cargo-0.49.crate 28605 BLAKE2B 9d202186eecf8d42799338277b583cf2cb6efff1f98d22442070d63c57599bbe6201d20144172a210f7c1e2334a8e8d61c3c89e7113d2afd2f2b17b944a85d0e SHA512 d76147240b30811f6085dca040a68ee90d3304d38635bdb594d8cb04089050b687322a05cffcaf4dd32f6cdeaa355a983b8b6cb2843df40dc7cb3766b3df6342
+DIST cargo-c-0.7.2+cargo-0.50.crate 28412 BLAKE2B c3b3f56896d9be78518dedda8d49af6f90370a080ad3c42fd99c3f2f313e9bfd2fd39722ab617300c56aa3971a8a0a6b27e6c08087d99f8be168ac66817543e2 SHA512 72cf79ffb12f02188dc5bf12d656abba8c605c392832ff1f754eaf0caf72513d16d973ce2fdd2248179199b17578f14e0c4f38d90bff04e77bebb4698b3afaea
 DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
 DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
 DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d
@ -47,7 +47,8 @@ DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871c
 DIST curl-sys-0.4.30+curl-7.69.1.crate 3006445 BLAKE2B 80c932b9e9d847258e2704a47af3edf028581a076df784b13e99af639bd9788c564bb8ed6b07900f5660a662817bb75fe3282c3ae2e2118fa26045871fed80eb SHA512 34d4e520d25215b35af150a217105cceb3934706c4170eb2e42324d352b6778e82bf23be3a3ea1cb73ff09d7c0bdd20548b6396d6b0ebe1cee4dfcb3c3c0abe0
 DIST curl-sys-0.4.39+curl-7.74.0.crate 2878786 BLAKE2B 4aa2fbafc3aaab6738c7c8433cdfbc3d1b7c0186ac630d0c097fbca7c1e5251c37b56a97eb78d0864fad281f3a53603bf11709f097ff092a90bb8ce1c9674a48 SHA512 ce13ffe129f62f9967f15d18cefbe9c9c38fb4ad2fea9dd8b736981199c89b7ef8ccef2d7411b0f007c44a81bc1a357014a363bd0e715aa9311a517b04e7382c
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
-DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
+DIST env_logger-0.8.2.crate 32757 BLAKE2B c4f9cbb8b313bc68e2ce8baa354fea3c357d5b484cefc82390476efd49de8d4e84baef657289be5817b14d8fbfb4dc0885b134c3b0a842cc385653f1b149677d SHA512 b1df8ba5b67c9896ef637281d26fc00b22239647fe8489e44c27c10e935d6abbe3c39d90b7ada1151d1fecc5340ad9c8b04afb3534ae04ba47db501fa146fc11
+DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
@ -59,9 +60,9 @@ DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffb
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST git2-0.11.0.crate 158388 BLAKE2B b58cb940b2341acb458e0047a0758de26593a36f7dce30ae8386919dc50ef43a3094ed9ea834e9f141e9551491c1a5b7cb7cf93122f41283235fc75624d01cc2 SHA512 4625eb25e5e88c0f608917a5a6a574372942bde8697f9e2ac1a8198c263a89edaf42cae6738dc87343b1b1359f56462886a3551e9f41ac6c19837996340ebfaa
-DIST git2-0.13.13.crate 178908 BLAKE2B 8d7a556ee3368254261bd4bea23c02b407ffcc30991196064dbf23167a4479f50e2fd099aba2ec02bfea4c8c7f012d5dcc544c42f94573af1b5f20296717719b SHA512 f98bf48c925d75fdf4d661cc36a7416236ca3155a5b4f6d0a29abba484b9a48a947d92197470cad25f2a16acbfd2aa6f0d7836cde73480a42a0e50be734e0c96
+DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
 DIST git2-curl-0.12.0.crate 9340 BLAKE2B 231859e1358e7237e683c4d243f184170fbecb49f69eef611aa92c34afc7fa86801d1be7009e6e37435a6387339ae7f92acf5a717047ed37280e20133415c594 SHA512 ec047a4a11e49c4c4ba2f132b8e6f86e52cce85cb1eb5337ee069d39033bc85234f71a7990d3357de5cc190121c4ad4ab3562ad5aae13298d830e508e182e20d
 DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
@ -69,14 +70,15 @@ DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
+DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
-DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
 DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
@ -84,22 +86,22 @@ DIST im-rc-14.3.0.crate 180179 BLAKE2B 6d41f9ba59c722b2c830e48f47b1e58a65888796d
 DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
 DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
-DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
+DIST libc-0.2.84.crate 517732 BLAKE2B dbffb14589552ecb7a6f610afd01feb94d3f5fbd44b5f03eb3f8ffd855d1e8eab4a397e3d40faa854c7ab364a65d11fc05118ecd401b5fe6a6972a82980259b0 SHA512 acbd268e02f360907c6939805973cb45f1f474f71a09efcad9c6a603de9c814a4912764c30ff8c929e06a544bf3e03eac08f42acde33a3edb4dac479f257eaa7
 DIST libgit2-sys-0.10.0.crate 1530695 BLAKE2B 1a46359e2a61aad9f3dbb6eca54325bbb8e39c99eff53b4877796b8007eab61801ef7ff9c7331352396c689b134bb42e2d50bde42bacf2eb7aebf97a75c8a272 SHA512 3e86cf98c01f33a242ff0117bebd1a2dfc33100ee00c46cf538d61eae56bda4b93d479baff186837d5b8dc1ba7fbaf1942287df0487a50ac23cc75efe3a1cf7d
-DIST libgit2-sys-0.12.15+1.1.0.crate 1610175 BLAKE2B 0e2810c18b39b2788839d59eabd602636413ff8a3501474e39ebac457067e811755c41a73e7dbb35ff90f5a402afcfb8fcfeb3a7f573a2d4901204b7272cd98c SHA512 0649a0a30e30afe08cccf356c08819ce0b0f57a6cea23e87d2e7deef88e4ef6513f07d04cbc5b76d125587ab3b7752d272c380d1a22b6a23cb965bf1f9698417
+DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
 DIST libnghttp2-sys-0.1.3.crate 2307977 BLAKE2B 9f0ba44c0b9e51fed1b71b9b270c20633dfed6f066a150c8cf6e4be39f08e3f1bb3a606889b9286141a10cf02aeb0ae9610571e2a55ceb5eea718426dd824a35 SHA512 d8bf63f230ad394f39c3e66226bb9bf2ce9dd8931480d3bbbefc335ff9b54cc9517cfe29c69c0bdde9fdde2e81ab2e614c2650704ee34cca88998fcf52672d68
 DIST libnghttp2-sys-0.1.5+1.42.0.crate 4457076 BLAKE2B c36a7179602b00b88f98efe5b145209b7ec5f4c21b7012e781b9083b287bdf2983b9653532ba140b8afe179b3d4d730e7f156f4a2eac3c645c02a2245ab61462 SHA512 b6abb369f0f5ddbe31efbd21b22ecbbac5d5d8b9feb5c133949c9f532e80a4e57c13bc26cd4da406961190c47ca090e98e8f260c1cc86e01d955805740c13a51
 DIST libssh2-sys-0.2.16.crate 471055 BLAKE2B 4ac133a98f466a87a441f72fc030799d38bdad71496aabcf7734f4eb0d46df53ca1a5258d899e07909aeaac37269d0d6a05ca6153635a2dbb41c2432ebb1a3c4 SHA512 ada58da5ba71d577010ecae04504c9542ca5ce13b7d1f56b3408e018d28f7a3b39ab4821e82e1b212fd52a9e80bdc57d944651b33e923602b26153caf81b2400
 DIST libssh2-sys-0.2.20.crate 482687 BLAKE2B 1c35f69b06917df083f656ffae04791b5f748360087a7f4e07629b5795af7aa357541730345a1b209ab22b82810c55164dc47b9c6d8276f62ddd0bff6f750c85 SHA512 1528436d63d13dfc48dc55972fe1c7fdc7bdebccd4c2d046a9ed7f020eec6660f4bcee9cb562f6caaf721afc2f590ce4bd4cd00249a62ddf45211b436767e93a
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
@ -111,13 +113,14 @@ DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d9
 DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
 DIST openssl-0.10.28.crate 189106 BLAKE2B f08547bf5636fb83aca04d859b5ca9fa790943ed866f52d2858da0b9304f07d80540e61a5eabc4da45b242789d2e8ca43af0ba253cbfcb072ceabb7d5a54a2a4 SHA512 1b8ee9409b6e3426bca45530250c89ede93ef420058f79f7c9674ee6f33e826815045d9ad9ef78719c449f6f8a02b6216b90b6b048562fd8efbad7d2b151d09d
-DIST openssl-0.10.31.crate 195472 BLAKE2B 9dececcfd2725471095f72108e70adda4d69877110f85b2ef186400e5b9fa19656f6c9fbe0ff3134d961812b3167e7ec3e77284011393c4d990591eb8474acd8 SHA512 b8844e982e012a084079b77de3de6729994b724d95b05731c3e134ce41669b3b7777d468e948bdcfa57324c4e2866b8d700e42b1da02e3e5d3d14a3c3b3b18aa
+DIST openssl-0.10.32.crate 199469 BLAKE2B d8dd269501a1991fb9ea27367a17674ec74265ea4281121aa114b18aebd821425d8cec43177f395542a1ee3227b1023d1bd4ca8c261ed194841e633d05735250 SHA512 dc37b5bdab49f6fab6c1b7610c89b5d9aca7a432f341bb10fb7c2a1132f42db63eda0c0bc4d82130e1bf3b521436fda1e0c1f9f1091c060621602384ea649962
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-src-111.13.0+1.1.1i.crate 5087843 BLAKE2B 89502daf1795de99e730a471acb58402c5cb1b6ff1b051870de7d220f585990291a80429c4a71b3ee8389b405b5ef12fbf8975dbf3fdea0d9810460cb50bfd12 SHA512 72d8bc3fc11197e6cbdf506e98bb512b89affa405795673e58e6005c0a4a177a8dfbafc2292ea788f8b2d3c1720a84a4223618f8958706d5738254ae5650e7f3
 DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
-DIST openssl-sys-0.9.59.crate 51178 BLAKE2B c29fa2d5d18f0a3fed73d231ce663dbfcfa8bd71b4841dc7dec9ae0057de16d0b353582330f5bc290edf55c8dca57d7b43787d52c86f12fe4d79c9c311920304 SHA512 dfc51d3cd90978a3173f4242f5f1c1848092680a042fd0735d4ea4d5793eca435a733173110081ca50ccae5fd8f75109bd5337146b7930872edea0e84f655241
+DIST openssl-sys-0.9.60.crate 51509 BLAKE2B ae3a9396115f1bcf9896ea49b0144b431b92491c4731ab6ca83ee7c99c5a38a727b008dfa837b09d80689c1a638fb57628066a4d8a85b3bb539f5e2ecd6b918e SHA512 6d9ae277c73a4efc567fd34f23e424cf6107b10f71b7e6902361dc33f514cbc8702718060fcda31c60ff65571fa29d7ea468f94cd9b8e3b37e85611f1d5adab2
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
@ -133,16 +136,20 @@ DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.1.crate 21634 BLAKE2B f059ef57238977208711b2b25f96682f58a5e935406b24a91cbbfca2cea918e764c512efa8ed8d77ee8df1fa3aae1d887148c5dd54cc0bd82ff14ee2dfade0f9 SHA512 546c1cc6064f22fa2b0cda1e42329aa7da1ea3be9b6aa277ef97de13067f28c473fe7f5bae4cf4151693aff31df3e57d6e99c6ff10d8fc79f94154dc26d19bf3
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_syscall-0.2.4.crate 23234 BLAKE2B 2190c072fcc0d5be9823353427e5ebb3277a9452dd9c2320f7b46168a3d764f8a2e9215f333a72e272b6d021de7141c76d25e65210e70a6b0da6a7cc987a281c SHA512 622f38ed962f7647299bcd4a742dd137c63450d5eb85d74adfa4b72951144b9920eb04d4af87e9c679c4bd47a985c528a8e56bdc31b15f4c8cd85e6b1bbddfe3
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
+DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
+DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
@ -157,20 +164,20 @@ DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
-DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
+DIST serde-1.0.121.crate 74568 BLAKE2B 99535f0b8773e00baaf81023fd3e6c2a9f51c438a13487d3814e85dd40d5cf7652e902a07854906f146a01ecbabab3b35954457f343edd55fd0a35125f107d0b SHA512 08e93a23b13c665e6ab5daf8f658e025a50a7d93a7b4fd05cb2ec8273fab38acc8f22e10d184bfb080fd8ee925c69879379a3719ee330627b3ef28f9d1e06d6e
 DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
-DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
+DIST serde_derive-1.0.121.crate 50683 BLAKE2B a66be304196ad2077872a5bdfc0b47aff9149ff21347666f8207bae0d82d6de4a8df5bda47533f2dbe2b635b5aa79e4a0ce4371183e530c96dfe2707b6fac379 SHA512 6b58907d52eab18ff069d0f67c0005e384b92442c733f6acdd40e0b6106f9fbd4542474c9f41988a19bb69f34e156c987e108f0e4cdcf002dfe1d772adb4631a
 DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
 DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
 DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
-DIST serde_json-1.0.60.crate 114828 BLAKE2B 8f8fcce30049b0f20ed4e11ce9323afb5edcb0f05a3a5e226b15770350147f27d6fc2cf242ced0f5b76c85c78694bf342ca084bcfeb18ea7d6c9e2bac5461f78 SHA512 c19262072cc2dee3f7e047e45ef3f02df121c9b1c9dc6f16a20f5fcbc0fb1bc25e87342358f9e9ac86bbd5f5d6091a9cb56256c04e22f3dac671ed23ff64d9f4
+DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST sized-chunks-0.5.3.crate 40643 BLAKE2B f08b893f2e32eee10372c75fd6bb41b667f004e044bf271d8a4a0bb6bc9f393662ed685aae3046ec05823f0e9c70b3b7e15c40b94bd22a5aa2079873d4b4c842 SHA512 9ffe2b6d0510d8cad010f4e3015f605ea0d0f4e27ded1fdfd7d7080e338bf239bec30fe85ef4576160297ad287ed006097ffc12151a2cdc578d7031d1501440b
 DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
 DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
 DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
-DIST socket2-0.3.18.crate 33513 BLAKE2B 83d42f6a96b9c4ae023079204a5f4a1506abc7f133c78dc4d659c8b46a6a04e5e6ac51cb4e28188d7ccb4f51cb268dad1a42adc88acfc9844deac3b00efbe48b SHA512 5820d1f2de59dad6545c356e111f6c40248763a8f432d696288c7996acbc73dbb0f3800f421a2c2ebf1e712e3db7fddc1280f8a889ecace2cb0ca2956a073514
+DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
 DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
@ -178,16 +185,18 @@ DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
 DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
-DIST syn-1.0.55.crate 229095 BLAKE2B e46833d7f6a252dd95bde77040787f937b19a8a96e9ca2041d667ef7b7d824976d0513b49f899bffbca32c87c51458701074507e55e9a4b47a83b328db915681 SHA512 9c3e5087db4819141994470c912e5f4d09d22a8e7ea9179b575f9601ce78ed501cf76f8303237e519c17e8628764d5f547141f97cea88ce7daf4c2982b7c1399
+DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
-DIST tar-0.4.30.crate 45211 BLAKE2B 9c1e3b2b7526c48854a4c4955f1d0cd79599a55fedd4a351249761007ab2c57da98a492f457558242a25dfea306160ed1dc2fabe66e4bfca42d5793f21ce5b68 SHA512 7cc921057a8b1a38e3eb03966313ea39812ad36b5694f383c9ea69ded9813ce3ff1c7bb0f3fc596d63630279722365a7ea0cdd034bc2cfeaa3056ff83d6201b0
+DIST tar-0.4.32.crate 45469 BLAKE2B 2e0425c4e0fe28244dfd0099091f3b1e5ff3c58f9edfc43dc8776564ab9e2fa0484eecd2cee3e7ab9b180b009e589882e7a5deda84eaf62a5ef670a8bbe3510c SHA512 189ddc1d396d852694ce86e833a5bd10bcf47e742264639ebe382bf186088dac59098e3b526a8cac49371ab0b8fe1be298327ca05921d8e8b3a94dea7e94e1e7
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST thread_local-1.1.2.crate 12977 BLAKE2B dcad93f7e7fdd7dcfad61b2caf6c283398d28b3f1f9162f89b8a770bbc040f1dfcf6d13fb928a18ee93f89a613cf303cb6c073bc321563521c6a347a7f44afe4 SHA512 194d834eb0a1e66965c8d7ef5fe36dcc9b77f6102745bdc91f5706a29510a44ce8abce642700bea49e69e77beaa5dd770841c37199308e5a2793f2cdad5a5dec
+DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
@ -213,6 +222,7 @@ DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+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 winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@ -221,5 +231,5 @@ DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cargo-c-0.6.2.ebuild 3051 BLAKE2B 049145dfd1f0ba27a92845082e12221cc9b04b5e6238ecff6490792ceb1861db0959224bba6e5c25bea273012724e420a23c95b4e6243d77c912e13b00936c35 SHA512 8b789d8bba907d3a46b17efc1471e8e8e25941b903727d5177994a0bee7904c5f5d73d332a9a940f37c1617c7d7879b5b4cc7c1f4ffa5d9c033d9b522f3e38d7
-EBUILD cargo-c-0.7.0.ebuild 3298 BLAKE2B 86eb973dcfb1024573c076ac5d63623ede11628976828bfaa81c3e68d66186feb952883af86c4d8ff3ff510d93c4d249bcf218be550b7d75178b61b9bde117f5 SHA512 975070dcc1a250382caa551be5165e6f26eac41ad54de419f71d42a4bd3d69174f60abc4f3a2c1686207f74e796b823eb430f519c33d623cf5e0a5396199b08e
+EBUILD cargo-c-0.7.2.ebuild 3259 BLAKE2B c3daacdeca4b7a787f0df6befa73bf036313e11eee532d6459129380e0db34e5963bc64f5f2ebade4f9ea8832d45f5d666f761ba99e6de584618cc9347ac0a28 SHA512 65c36e6e14c8a11bd9f04a4f62ce0dd2fe2d702bac0468fe2853c491d82ea2d43c543649c91408c103199f896f66a6898dc383d69d763b819903358dc804953c
 MISC metadata.xml 326 BLAKE2B ec5622ca2c87640dfe5c409704f1674bc53ef0ce4d0778227d3816cd4a151f5f09e3de1f09814ce98f5e208e04a5cc0a6c28dd1b9bd81fa3857b688d8e9eebb9 SHA512 f28238739f1c2d04cb617ac31c2965fb110b560e5b9bbc6fa2749f22cd4cb353ef6cda1df1d718f165e4ae56f5bdf66da9104f6440d7d0009ba352a877c1f3c8
--- a/dev-util/cargo-c/cargo-c-0.7.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.7.2.ebuild
@ -6,22 +6,21 @@
 EAPI=7

 CRATES="
-cargo-c-0.7.0+cargo-0.49
+cargo-c-0.7.2+cargo-0.50
 adler-0.2.3
 aho-corasick-0.7.15
 ansi_term-0.11.0
-anyhow-1.0.36
+anyhow-1.0.38
 atty-0.2.14
 autocfg-1.0.1
 bitflags-1.2.1
 bitmaps-2.1.0
 bstr-0.2.14
 bytesize-1.0.1
-cargo-0.49.0
+cargo-0.50.0
 cargo-platform-0.1.1
 cbindgen-0.16.0
 cc-1.0.66
-cfg-if-0.1.10
 cfg-if-1.0.0
 clap-2.33.3
 commoncrypto-0.2.0
@ -30,72 +29,71 @@ core-foundation-0.9.1
 core-foundation-sys-0.8.2
 crates-io-0.31.1
 crc32fast-1.2.1
-crossbeam-utils-0.7.2
 crossbeam-utils-0.8.1
 crypto-hash-0.3.4
 curl-0.4.34
 curl-sys-0.4.39+curl-7.74.0
-env_logger-0.7.1
-filetime-0.2.13
+env_logger-0.8.2
+filetime-0.2.14
 flate2-1.0.19
 fnv-1.0.7
 foreign-types-0.3.2
 foreign-types-shared-0.1.1
 form_urlencoded-1.0.0
 fwdansi-1.1.0
-getrandom-0.1.15
-git2-0.13.13
+getrandom-0.2.2
+git2-0.13.17
 git2-curl-0.14.1
 glob-0.3.0
 globset-0.4.6
 hashbrown-0.9.1
-heck-0.3.1
-hermit-abi-0.1.17
+heck-0.3.2
+hermit-abi-0.1.18
 hex-0.3.2
 hex-0.4.2
 home-0.5.3
-humantime-1.3.0
-humantime-2.0.1
+humantime-2.1.0
 idna-0.2.0
 ignore-0.4.17
 im-rc-15.0.0
 indexmap-1.6.1
-itoa-0.4.6
+itoa-0.4.7
 jobserver-0.1.21
 lazy_static-1.4.0
 lazycell-1.3.0
-libc-0.2.81
-libgit2-sys-0.12.15+1.1.0
+libc-0.2.84
+libgit2-sys-0.12.18+1.1.0
 libnghttp2-sys-0.1.5+1.42.0
 libssh2-sys-0.2.20
 libz-sys-1.1.2
-log-0.4.11
+log-0.4.14
 matches-0.1.8
 memchr-2.3.4
 miniz_oxide-0.4.3
 miow-0.3.6
 num_cpus-1.13.0
+once_cell-1.5.2
 opener-0.4.1
-openssl-0.10.31
+openssl-0.10.32
 openssl-probe-0.1.2
-openssl-sys-0.9.59
 openssl-src-111.13.0+1.1.1i
+openssl-sys-0.9.60
 percent-encoding-2.1.0
 pkg-config-0.3.19
 ppv-lite86-0.2.10
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
 proc-macro2-1.0.24
-quick-error-1.2.3
 quote-1.0.8
-rand-0.7.3
-rand_chacha-0.2.2
+rand-0.8.3
+rand_chacha-0.3.0
 rand_core-0.5.1
-rand_hc-0.2.0
+rand_core-0.6.1
+rand_hc-0.3.0
 rand_xoshiro-0.4.0
-redox_syscall-0.1.57
-regex-1.4.2
-regex-syntax-0.6.21
+redox_syscall-0.2.4
+regex-1.4.3
+regex-syntax-0.6.22
 remove_dir_all-0.5.3
 rustc-workspace-hack-1.0.0
 rustfix-0.5.1
@ -104,24 +102,24 @@ same-file-1.0.6
 schannel-0.1.19
 semver-0.10.0
 semver-parser-0.7.0
-serde-1.0.118
-serde_derive-1.0.118
+serde-1.0.121
+serde_derive-1.0.121
 serde_ignored-0.1.2
-serde_json-1.0.60
+serde_json-1.0.61
 shell-escape-0.1.5
 sized-chunks-0.6.2
-socket2-0.3.18
+socket2-0.3.19
 strip-ansi-escapes-0.1.0
 strsim-0.8.0
 structopt-0.3.21
 structopt-derive-0.4.14
-syn-1.0.55
-tar-0.4.30
-tempfile-3.1.0
+syn-1.0.60
+tar-0.4.32
+tempfile-3.2.0
 termcolor-1.1.2
 textwrap-0.11.0
-thread_local-1.0.1
-tinyvec-1.1.0
+thread_local-1.1.2
+tinyvec-1.1.1
 tinyvec_macros-0.1.0
 toml-0.5.8
 typenum-1.12.0
@ -137,7 +135,7 @@ vec_map-0.8.2
 version_check-0.9.2
 vte-0.3.3
 walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
 winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-util-0.1.5
@ -150,7 +148,7 @@ DESCRIPTION="Helper program to build and install c-like libraries"
 # does not provide this value so instead repository is used
 HOMEPAGE="https://github.com/lu-zero/cargo-c"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
-MY_P="${PN}-0.7.0+cargo-0.49"
+MY_P="${PN}-0.7.2+cargo-0.50"
 S="${WORKDIR}/${MY_P}"

 RESTRICT="mirror"
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@ -3,4 +3,4 @@ DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
 EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4043 BLAKE2B 4bf62f4d6d79ab1d6d839f18e94c4f13965e3d7c5d3473aad0f00a0f80bc1123fb5ce9a2cc86212b21c53d0691514c5cf4e9b24bc8decbb89042f1e80dc6cb15 SHA512 75c0b45cd2cf78d9f4a19bb1f2fff91ec0ed6b4ccc7e44b9a33baa72bea6600965fc728ef3f6eb36a4f57fb722bbe6d20ac29a39a767c14ede0f09e9bf7116fd
 EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4043 BLAKE2B 4bf62f4d6d79ab1d6d839f18e94c4f13965e3d7c5d3473aad0f00a0f80bc1123fb5ce9a2cc86212b21c53d0691514c5cf4e9b24bc8decbb89042f1e80dc6cb15 SHA512 75c0b45cd2cf78d9f4a19bb1f2fff91ec0ed6b4ccc7e44b9a33baa72bea6600965fc728ef3f6eb36a4f57fb722bbe6d20ac29a39a767c14ede0f09e9bf7116fd
-MISC metadata.xml 561 BLAKE2B 511df10fb880b655143aba1063715ffdaaadd232c97f3f957105c1526a7a25ab1019fb13d0d36212799050dda94c1040a82c5219f81e41c4202ba9ae417723d3 SHA512 f1c87b067dc5252c5a9a92070428971472c3bd8102ebaea048aff7eb2783ec4fe485a5a91be4463c808025ea5df150c0c28c34cf5b3094c1aa52f0dd3b9f1db6
+MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@ -5,10 +5,6 @@
 		<email>mpagano@gentoo.org</email>
 		<name>Mike Pagano</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alicef@gentoo.org</email>
-		<name>Ferrazzi Alice</name>
-	</maintainer>
 	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
 	</longdescription>
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@ -4,6 +4,6 @@ DIST pkgcheck-0.8.1.tar.gz 455289 BLAKE2B 5e0999c4348e4707e917b511718d378bd7cbb3
 EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
 EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
 EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1.ebuild 1376 BLAKE2B e2cd0778b9aafc67fa5ed33ebbfc68fb6f6fb3ce34162864d7dc303f9bf55acccfb15bac0e9e88d3e91fdb8349e00c0a3648a0326eeb87f96625612570eac136 SHA512 72d2401d706c3833f378a485a8e8c0a95859c111695d05dd421ed61411063a4aec095e10974f60e5f03b8cff1a1e56303b922d7ebc87258c5ac2ecdcfada6654
+EBUILD pkgcheck-0.8.1.ebuild 1320 BLAKE2B b510861851addf65efdfa9fdf26b5381dfd05761b7adb7978d49d2fd63c82154dd0ab4cdf900d99a6a6ad00d5eddf636e8f829c9eca2c40935a4858dd0ec2af3 SHA512 f86dd7b6ac460619540c4dff0b539fd72361487f0ad9081b20b53fa610df858723bd36fb7299275baa307a88f3cc64a14727076380ec82a5b4b1e4b2e6462a5d
 EBUILD pkgcheck-9999.ebuild 1376 BLAKE2B e2cd0778b9aafc67fa5ed33ebbfc68fb6f6fb3ce34162864d7dc303f9bf55acccfb15bac0e9e88d3e91fdb8349e00c0a3648a0326eeb87f96625612570eac136 SHA512 72d2401d706c3833f378a485a8e8c0a95859c111695d05dd421ed61411063a4aec095e10974f60e5f03b8cff1a1e56303b922d7ebc87258c5ac2ecdcfada6654
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi

--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@ -1,7 +1,3 @@
-AUX cssc-1.3.0-gcc47.patch 187 BLAKE2B 4dd734c33914267c8f4441184316c33bea299c2ef09d6a6d98a7dfa2c57349885ac83df79362bc5b7f496f99da1aaa6801cb69d8409a3878869df6bdd418b4f2 SHA512 75706187dccd2cfbf0ef0f95eb6520bdf8134da0f6414e4e7e1ee92d54835f5d857320cfc81eb1f4ebf8584ea6da4e4a26e3a5990d60d7b7609b9bf19b6dec74
-AUX cssc-1.4.0-config.patch 317 BLAKE2B 05b55dca021fdc37ad9ade846c633c7f83935f46332cdebea9c7efff7bace6a175202239d240521bdb9cccbd725a077922c33494abac0d00792db7704b969b24 SHA512 c5bab5de20fa978100009f462434df586d9951850459b41aa70f290bebbcfbb2164b31eada89d6b55151bfd1e852b402ccd822d97cd0b898ce501f925e3c7e53
-AUX cssc-1.4.0-m4.patch 356 BLAKE2B b1e79296c96a1fc281e3a481d6a0fbaff697db87317b185bd795740fed75bd755dc2af147d1335d57f2b58d82c56ef9f75875175700b72c543cdb6e7adc8d6ec SHA512 8dd984f1d98a943fbed14db43840b18f63a48bc71fb8e537031761bdd59639a4af554de9eda8d5aa0a5f1afe04169a752f3e281381a15fe91cc9f53e7195db9e
-AUX cssc-1.4.0-test-large.patch 455 BLAKE2B 98891f0f6ce149a7ca7d8ee8aa373bc28e05f8a4a397d1f4067e9c3589fac701b46585b629965125e140eabc02c9ad4a2d09976f8752909e8176018d85cc69e2 SHA512 8e28f6b6cb9c9e15f5000e89722aa9aa66cb578faa136aa229947eae66e185a07a2b528dea418e0cef43027cce705a269214a2b6f4ec2c355450f13417c2c3e1
 AUX cssc-1.4.1-m4.patch 351 BLAKE2B dde4c1f2876f8e84587ad531a094431d1854652f901a2875a7fdd758a6780570dfbf9e629e3c00f2f41644a063bba08b4d201e215c4945baaa2cbd2a5649e736 SHA512 57639a4ec54f9e2dfb594de179e7e8539385890ab6d58fc5bb39f44497f530e2a9182edbd51c5d815244c76fc80e401f002e60d9ba29c8dee0e229cea7174153
 DIST CSSC-1.4.1.tar.gz 2269725 BLAKE2B 264e996280ff23818332dda62d80adc61fd6a2e924af26a044168bf136c22b22bb591d37157030dbe8e2360a2687b0dcbf843f3af8683b08593fded4ef982739 SHA512 b843bd636b15830b2751c423ff2f2e7292e0942d750ca57425d9674b74c7291fe34db33cbbc4b87d27f80d3b54b0074207ceda612faa651b6f01486e0b2485d5
 EBUILD cssc-1.4.1.ebuild 856 BLAKE2B c735021a9fca1f594648cce481cde1d941cfc67ec1d270ebbc10369426ed5f547b6882c27250ef2068537071bc341fde0564b94954fff8d63446d283dfde6078 SHA512 44980aa7e9704907bdb6b9551629c6d51b9ec72ee36d9cc60a126df641d277eb42598da0824b9f9afcc343e0ea3ca3db9fd63e854caf982023b5b82f0d1cf5f1
--- a/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch
+++ b/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch
@ -1,10 +0,0 @@
--- a/src/file.h
-+++ b/src/file.h
-@@ -31,6 +31,7 @@
- #define CSSC__FILE_H__
- 
- #include "filelock.h"
-+#include <unistd.h> /* gid_t */
- 
- enum create_mode {
- 	CREATE_EXCLUSIVE     =  001,
--- a/dev-vcs/cssc/files/cssc-1.4.0-config.patch
+++ b/dev-vcs/cssc/files/cssc-1.4.0-config.patch
@ -1,15 +0,0 @@
-In file included from file.h:36:0,
-	from delta.cc:36:
-	../gl/lib/unistd.h:135:3: error: #error "Please include config.h first."
-
-
--- a/src/delta.h
-+++ b/src/delta.h
-@@ -25,6 +25,7 @@
- #ifndef CSSC_DELTA_H
- #define CSSC_DELTA_H 1
- 
-+#include "config.h"
- #include "sid.h"
- #include "sccsdate.h"
- #include "mystring.h"
--- a/dev-vcs/cssc/files/cssc-1.4.0-m4.patch
+++ b/dev-vcs/cssc/files/cssc-1.4.0-m4.patch
@ -1,13 +0,0 @@
-libtoolize chokes on this line
-
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,6 @@
- 
- # Changes to AC_CONFIG_MACRO_DIR shoulld be reflected in ACLOCAL_AMFLAGS in Makefile.am.
- AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_MACRO_DIR([unit-tests/googletest/m4])
- 
- AM_INIT_AUTOMAKE([gnits readme-alpha check-news tar-ustar 1.11.6])
- AC_CONFIG_HEADERS(config.h)
--- a/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch
+++ b/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch
@ -1,14 +0,0 @@
-Takes a very long time.
-
-
--- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -136,7 +136,7 @@
-                 test-rmdel \
-                 test-admin test-delta test-get test-prs test-prt test-unget \
-                 test-cdc  test-sact test-val \
-                test-large test-sccsdiff test-binary test-bsd-sccs test-what \
-+                test-sccsdiff test-binary test-bsd-sccs test-what \
-                 test-year-2000
- 	echo Tests passed.
- 
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
--- a/games-arcade/jvgs/Manifest
+++ b/games-arcade/jvgs/Manifest
@ -1,5 +1,6 @@
 AUX jvgs-0.5-fix-build-system.patch 1028 BLAKE2B 644c07ed7374ec7677ca0f744d08e10a08e1d49a1c0d4bab7d9b87ce78ebb138582238873353ce25471e4a95555b016010ca04fe5672ef8bf256cdb74ea3a378 SHA512 0f049df4b986d380634837e1e5bc4e21d0fb228a7c61cc6765ebec7cc74f3e37ef71260a2d7a7cc830ac9ea22258702f9cad29d3941bf2dff0f3f6ea56817dc8
+AUX jvgs-0.5-unbundle-tinyxml.patch 8652 BLAKE2B 0da26995149bb1918e6b6a6b7884b06e66728d0b931341a00aeea932d0c9ac235efe99f95648ad78900a53154f3b1dbdd8f1da6961fb1adf93b14694b4576694 SHA512 f652c855fa70f7f4e836b14c175c3a68c082976396e8d3722d92a89ec50574eb3f79bca2a8a0f5de365bd89856dba09025e341075169aaf1c918ef623dca48bf
 DIST jvgs-0.5-src.tar.gz 25917861 BLAKE2B 8b7716a16cd7dfdb3f8f7eb2292a121b142a4487f8fb58d046db81cc579b61b3db56728f5ecef8272ec74d8cf898da5c3ee12fa7c492fd219de977ea37bc9ee9 SHA512 0a0a8e7a0e7dce6f61bcd328f579212115eb95e3dce8ca223c1d8a3432d9083bf9a313f02f46b799991aa32f10cb9c14e8ecb63a4578b1ffaabc374ba139b28d
-EBUILD jvgs-0.5-r1.ebuild 807 BLAKE2B 3410af4b70a1e3e1e7d374276c84f0f5f8b8098625769daaff7a8f33ac9c841a2b93b586151a079f74e89cffab300eed1a6b3e69d07fe2a8e4552e5139f28b93 SHA512 5885bab4f0439df3e9f5bab47e57d6b55780da9bc4b4060a9da098677950a51db316afa22b86a7f670d63b3688374f1ccc40ce2266d32b497a0a44383c8413ba
-EBUILD jvgs-0.5-r100.ebuild 872 BLAKE2B e32f6ed61f923ec1b94a065c2d46c5294b88590d2e1bb70842062bbe10a6525d93497098710a2482513468dff80d0f6324b1ac51a53e27d2c274c0708c2ffa46 SHA512 4f8b9ae8a1bb364dcbd6c8c666abce20d17fb37d4d28ba2d3562a92f1c0d308028a197dc7075f75f2526fd7012d14a215a2e7d6ae05fe8e1638be049f5a643dd
+EBUILD jvgs-0.5-r1.ebuild 912 BLAKE2B 730c614d0ae0a3a125cd968a34679738fbb390da5fff9a252faf0d31091a6e6b05a518f7d95a94300dc2e379db04cefa7b71964af6f20491748f8017e7761e04 SHA512 a949652eb6da05eb0c458b9beca9c421665ddafc3fcf8c8e32ff5e5d859ad1ce31b734a38d0ea3c104015edaa6d55ca788c860d327117429f01d66e1167809ba
+EBUILD jvgs-0.5-r100.ebuild 1210 BLAKE2B a3aa5114ade74770a0fd14b11c7623e5845e39bb9e84795d3d5311a110cc374a842cf031465f3cbb9b06a4a418337240c10b4425bca1343bebe3ce308ce127ed SHA512 f6440f90003fd5214beea75d763f1f8b925b9203aaea2da8d6579dea85087ad01c16aeab1b83c1094f42775f863a64b144ba1e2abe07223afb5b377fc3433cbd
 MISC metadata.xml 327 BLAKE2B 3dfc4352c43df34b847d4ddbaefb6a830d685e7a4cdeabbc870665799e7d9b43a58b4e9c0c71bf1fbaafeb3148732dbb988971310041db7afb669a9235bf7994 SHA512 d37e6f081f28683f1071e57de49287534e6797902e24c681f87477af286a6227eb76abd63bd3091b077270e44061cd0676e49fecf4e74f54d455281fa67946bd
--- a/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch
+++ b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch
@ -0,0 +1,333 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 87b28ab..2ec725c 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -1,10 +1,14 @@
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" )
+ 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(TinyXml REQUIRED tinyxml)
+
+ INCLUDE_DIRECTORIES(
+     ${SDL_INCLUDE_DIR}
+     ${LUA_INCLUDE_DIR}
+     ${FREETYPE_INCLUDE_DIRS}
+     ${SDLMIXER_INCLUDE_DIR}
+    ${TINYXML_INCLUDE_DIRS}
+     ${ZLIB_INCLUDE_DIRS}
+ )
+ 
+@@ -12,7 +16,6 @@ ADD_SUBDIRECTORY( input )
+ ADD_SUBDIRECTORY( core )
+ ADD_SUBDIRECTORY( game )
+ ADD_SUBDIRECTORY( math )
+-ADD_SUBDIRECTORY( tinyxml )
+ ADD_SUBDIRECTORY( video )
+ ADD_SUBDIRECTORY( audio )
+ ADD_SUBDIRECTORY( sketch )
+@@ -25,5 +28,5 @@ ADD_EXECUTABLE(
+ )
+ 
+ TARGET_LINK_LIBRARIES(
+-    jvgs bind input
+    jvgs bind input ${TINYXML_LIBRARIES}
+ )
+diff --git a/src/core/PropertyMap.cpp b/src/core/PropertyMap.cpp
+index 190b317..3f7dd1a 100644
+--- a/src/core/PropertyMap.cpp
+++ b/src/core/PropertyMap.cpp
+@@ -1,7 +1,7 @@
+ #include "PropertyMap.h"
+ #include "LogManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ using namespace std;
+ 
+ namespace jvgs
+diff --git a/src/core/XMLLoadable.cpp b/src/core/XMLLoadable.cpp
+index f5cbc46..b819184 100644
+--- a/src/core/XMLLoadable.cpp
+++ b/src/core/XMLLoadable.cpp
+@@ -1,7 +1,7 @@
+ #include "XMLLoadable.h"
+ #include "LogManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/AbstractCamera.cpp b/src/game/AbstractCamera.cpp
+index b349418..725a2e2 100644
+--- a/src/game/AbstractCamera.cpp
+++ b/src/game/AbstractCamera.cpp
+@@ -5,7 +5,7 @@ using namespace jvgs::video;
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Animation.cpp b/src/game/Animation.cpp
+index ac563a6..6aa3b10 100644
+--- a/src/game/Animation.cpp
+++ b/src/game/Animation.cpp
+@@ -7,7 +7,7 @@ using namespace jvgs::sketch;
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/BullController.cpp b/src/game/BullController.cpp
+index 78f81af..56930b4 100644
+--- a/src/game/BullController.cpp
+++ b/src/game/BullController.cpp
+@@ -8,7 +8,7 @@ using namespace jvgs::core;
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/CollisionResponsePositioner.cpp b/src/game/CollisionResponsePositioner.cpp
+index 8065efe..657c1c6 100644
+--- a/src/game/CollisionResponsePositioner.cpp
+++ b/src/game/CollisionResponsePositioner.cpp
+@@ -15,7 +15,7 @@ using namespace jvgs::sketch;
+ #include "../math/QuadTree.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ #include <iostream>
+ using namespace std;
+diff --git a/src/game/DefaultInputController.cpp b/src/game/DefaultInputController.cpp
+index a05aec9..c6da502 100644
+--- a/src/game/DefaultInputController.cpp
+++ b/src/game/DefaultInputController.cpp
+@@ -7,7 +7,7 @@
+ #include "../input/InputManager.h"
+ using namespace jvgs::input;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp
+index 914297f..f353541 100644
+--- a/src/game/Entity.cpp
+++ b/src/game/Entity.cpp
+@@ -27,7 +27,7 @@ using namespace jvgs::video;
+ #include "../bind/ScriptManager.h"
+ using namespace jvgs::bind;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace std;
+ using namespace jvgs::math;
+diff --git a/src/game/FlyStraightController.cpp b/src/game/FlyStraightController.cpp
+index 1217b62..62f8c1a 100644
+--- a/src/game/FlyStraightController.cpp
+++ b/src/game/FlyStraightController.cpp
+@@ -5,7 +5,7 @@
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/FollowCamera.cpp b/src/game/FollowCamera.cpp
+index 4a1006b..4b1fe2c 100644
+--- a/src/game/FollowCamera.cpp
+++ b/src/game/FollowCamera.cpp
+@@ -12,7 +12,7 @@ using namespace jvgs::video;
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/InputController.cpp b/src/game/InputController.cpp
+index 0d76dd7..1e07609 100644
+--- a/src/game/InputController.cpp
+++ b/src/game/InputController.cpp
+@@ -5,7 +5,7 @@
+ #include "../input/InputManager.h"
+ using namespace jvgs::input;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/Level.cpp b/src/game/Level.cpp
+index a02e818..bf0c485 100644
+--- a/src/game/Level.cpp
+++ b/src/game/Level.cpp
+@@ -14,7 +14,7 @@ using namespace jvgs::video;
+ #include "../audio/AudioManager.h"
+ using namespace jvgs::audio;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace jvgs::sketch;
+ using namespace jvgs::math;
+diff --git a/src/game/PatrollingController.cpp b/src/game/PatrollingController.cpp
+index 74e5171..7d56754 100644
+--- a/src/game/PatrollingController.cpp
+++ b/src/game/PatrollingController.cpp
+@@ -5,7 +5,7 @@
+ #include "../math/MathManager.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Positioner.cpp b/src/game/Positioner.cpp
+index 6297c09..5fb2f37 100644
+--- a/src/game/Positioner.cpp
+++ b/src/game/Positioner.cpp
+@@ -1,7 +1,7 @@
+ #include "Positioner.h"
+ #include "Entity.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/SillyController.cpp b/src/game/SillyController.cpp
+index 25070e5..4954091 100644
+--- a/src/game/SillyController.cpp
+++ b/src/game/SillyController.cpp
+@@ -1,7 +1,7 @@
+ #include "SillyController.h"
+ #include "Entity.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/SimpleBirdController.cpp b/src/game/SimpleBirdController.cpp
+index 54b95bc..82f371f 100644
+--- a/src/game/SimpleBirdController.cpp
+++ b/src/game/SimpleBirdController.cpp
+@@ -1,7 +1,7 @@
+ #include "SimpleBirdController.h"
+ #include "Entity.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace std;
+ using namespace jvgs::math;
+diff --git a/src/game/SimpleCamera.cpp b/src/game/SimpleCamera.cpp
+index 00deb92..e640481 100644
+--- a/src/game/SimpleCamera.cpp
+++ b/src/game/SimpleCamera.cpp
+@@ -2,7 +2,7 @@
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Sprite.cpp b/src/game/Sprite.cpp
+index 19caa35..ee314df 100644
+--- a/src/game/Sprite.cpp
+++ b/src/game/Sprite.cpp
+@@ -1,7 +1,7 @@
+ #include "Sprite.h"
+ #include "Animation.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/math/Vector2D.cpp b/src/math/Vector2D.cpp
+index ba8a05e..61673b3 100644
+--- a/src/math/Vector2D.cpp
+++ b/src/math/Vector2D.cpp
+@@ -2,7 +2,7 @@
+ #include <cmath>
+ #include "MathManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/sketch/GroupParser.cpp b/src/sketch/GroupParser.cpp
+index 0924f95..58d5584 100644
+--- a/src/sketch/GroupParser.cpp
+++ b/src/sketch/GroupParser.cpp
+@@ -3,7 +3,7 @@
+ #include "Group.h"
+ #include "SketchElement.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+diff --git a/src/sketch/Parser.cpp b/src/sketch/Parser.cpp
+index 2b55c16..390f9ae 100644
+--- a/src/sketch/Parser.cpp
+++ b/src/sketch/Parser.cpp
+@@ -13,7 +13,7 @@ using namespace jvgs::core;
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/sketch/PathParser.cpp b/src/sketch/PathParser.cpp
+index 1eb2027..eb63cf2 100644
+--- a/src/sketch/PathParser.cpp
+++ b/src/sketch/PathParser.cpp
+@@ -3,7 +3,7 @@
+ #include "Path.h"
+ #include "PathDataParser.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+diff --git a/src/sketch/SketchElementParser.cpp b/src/sketch/SketchElementParser.cpp
+index b7c4968..fc40dfb 100644
+--- a/src/sketch/SketchElementParser.cpp
+++ b/src/sketch/SketchElementParser.cpp
+@@ -3,7 +3,7 @@
+ #include "SketchElement.h"
+ #include "Parser.h"
+ 
+-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
+ 
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
--- a/games-arcade/jvgs/jvgs-0.5-r1.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -26,8 +26,14 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-src
 PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )

+src_prepare() {
+	sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp
+	default
+	eapply_user
+}
+
 src_install() {
-	dobin src/${PN}
+	dobin ${BUILD_DIR}/src/${PN}

 	insinto /usr/share/${PN}
 	doins -r main.lua resources
--- a/games-arcade/jvgs/jvgs-0.5-r100.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5-r100.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -10,6 +10,7 @@ inherit cmake desktop lua-single
 DESCRIPTION="An open-source platform game with a sketched and minimalistic look"
 HOMEPAGE="http://jvgs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"

 LICENSE="WTFPL-2"
 SLOT="0"
@ -18,19 +19,37 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"

 RDEPEND="${LUA_DEPS}
+	dev-libs/tinyxml[stl]
 	media-libs/libsdl[video]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/freetype:2
 	sys-libs/zlib:=
-	virtual/opengl"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/swig"

-S=${WORKDIR}/${P}-src
-PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.5-unbundle-tinyxml.patch
+)
+
+src_prepare() {
+	sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp || die
+
+	# Make sure we don't use bundled copy
+	rm -r src/tinyxml/ || die
+
+	cmake_src_prepare
+}

 src_install() {
-	dobin src/${PN}
+	dobin "${BUILD_DIR}"/src/${PN}

 	insinto /usr/share/${PN}
 	doins -r main.lua resources
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
--- a/games-engines/dMagnetic/Manifest
+++ b/games-engines/dMagnetic/Manifest
@ -1,3 +1,3 @@
 DIST dMagnetic_0.30.tar.bz2 82369 BLAKE2B bc881a85f5da0f5f3531f2ce77369d5f5c43f424deeb626978e1589b0cf7a1105fdcfbdc3316c123c89c8384fd614260c58803bc9d3126eec60d11d7f00c995e SHA512 f903f352285476a3de67703220ea0c9cdb2ce3ef1fd73f7f9808eba13e39ae531426acf76424d2f9503ba387b7ac24e0b0959969ed99ba8c553c4f1c43a0a4da
-EBUILD dMagnetic-0.30.ebuild 766 BLAKE2B 857ba3a1b44c354ac459d35a4bbf3cfb841439fbcc6d4f3f8a6253effe3ace6acf26cc6d988f4695910037617a65bf7f6683d48f82c021671cd9397cf0371aa8 SHA512 102ae207350be96e57d7af4dc614a307de497bbb9bbc599caa63e450bb28fa86004452cc5634a6e04663a43d727bfecbaf99b645c171e1a43fdfbc65a57b7512
+EBUILD dMagnetic-0.30.ebuild 769 BLAKE2B 8d020446362eecde0b4e44c8277fc8016577877ab189ec8b1e304a56e44c406d3843d23a0e9443fc58ab7945780caee3948ee8d2b85298867ee8e61222888de4 SHA512 ada24a1583daa60f789143e4c30a184fef50a43c64b4598eeed83f9b2ef355abef9e753320ca465240706b4c49dffad7e41185fafe1342fc0161074680c38ff8
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
--- a/games-engines/dMagnetic/dMagnetic-0.30.ebuild
+++ b/games-engines/dMagnetic/dMagnetic-0.30.ebuild
@ -17,11 +17,11 @@ S="${WORKDIR}/${MY_P}"

 src_prepare() {
 	default
-	hprefixify ${PN}.ini src/toplevel/${PN}.c
+	hprefixify src/toplevel/${PN}{,_helpscreens}.c
 }

 src_compile() {
-	emake ${PN} \
+	emake all \
 		  CC="$(tc-getCC)" \
 		  LINK="$(tc-getCC) ${LDFLAGS}"
 }
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
--- a/Show More
+++ b/Show More