diff --git a/Manifest b/Manifest
index 26f0694f8b86..47e151ef26f5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29276 BLAKE2B 4ef674735dcf24a712a41225e6d06126f15654b51777584e0f79749f6d73724cfaa03c5979f773c0651e7af4e31dbf6b062d2dc4d64b1905469b792cbcf13c43 SHA512 6fe38e041206fc2772ae2b98af28dc76d159a0b7a8ed7bc272a60b6e2f6e952fd495294fef6f165ade984ccf27f9800988ccafb22809a2202ec94ea7e3fb9de8
-TIMESTAMP 2021-06-15T06:09:14Z
+MANIFEST Manifest.files.gz 29254 BLAKE2B 530fae3a1cd257d0c5c59911f1d8ed82bf2d23f22f7f9baeb9ff7c90ff2bbcf18e2e879d1689bdff909a3ae0da557cbd449933a89e4813dbaacba5865f294da7 SHA512 960e007a9724ec72ba68565809b37bd4761a4f143f19c5c44def1b27f0b05e291dd106e50445546387d77d89d167fb51a01bf6978c3fe689b3048cd53a080ff8
+TIMESTAMP 2021-06-15T19:09:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDIRApfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDI+tRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAPzQ//cNbOOuAVy/0A76mTwK1SbP3RY7tok6jDlBaWhYITesiruQ5sj8hhvjgI
-L7g7f4nGPOBD/A4QaSGuIaDB3kCb7koyAtCiFJAnY5HPpi9nnJA27MeiIvj6Mlmj
-ncwBHGeuXVs5sH0MG8zecrfBVnD/lbKAUpdM78zOgdk39/MO+JJqgATcYlSrJCTC
-PzfZ6QnglVaVSKGpSpln2502t0PTCoOJbmLo2FjVZPolWEkyVdGOYGspeq+XWuL7
-l4GD17iYzHR9BqLPfbhNiX2J0dkKF70JA2F0MAibq7RDfpt+IvX+Z4DF7rSrtImN
-NWds6JhA/u+OBDv3EvTunSpOAM4lpdDNVPQiHIEyEVwlZqzfH4+cbcOigoI2dfh7
-DtavkrPgSZ2/JykFf4+AoOkrskgaVXjOo1YrIEQc/ZRZMOR6zwSY7kKNHrNZBENB
-PG+kTScOXXoQfoUPyQO0Uja1OWE20kqil9XbhTk1YLtn8CFII7W9Q9AoPgvznIN0
-NPjJhBxlIu1cT9ptM0J1GX5QoyvFmLKfCdEhQEwJ2+D/3LPAb5wN2JFjHNuLGp3Z
-ApqSYo9tQtSXHFZilreQIalyMyhtB/1Hm1xFOL35Fyc+bvAUQ2TueHoLhzgs6GYJ
-3sY5VPbv99VAavabsQ++TEODW4FhrXHCqQZ0zmpGKMWV23lj3G8=
-=RaNr
+klAoag//WPRCumfhi1D79WovZD4kh6Y03WP0wbCQz8eM69Nx0j2ncJDtxPPPJL5/
+qfXRr7LPrCQOIJUi9vyAAK0S59LR5pyRLN886nCq/i2HSDlq9EiR+VYe93OXPXSY
+taM8zaEvpWEecnXthnvEM3cnQeKpYg1r1a074pKdZDAmoDXKeMNxwmnfzdIp34kz
+HV4BufpM7i11fhZYr4VxHElzADSfwiX7VJAuN26ZzdYpG8mRDs6ATNiMN4CNx+nJ
+YvfegbhaaVI90Od7/1CU+MxchHrSeHXYFLbbph48qyoQZALRlHBOenz6YnNrOnpw
+GO6t7ND+TbeFposJWAnz9MbbjV8SnREAc8sIZvEE9WMwsSEV5BtWTKKo5KvdLsOx
+gaZmadyOOG4Exw/UBrqV30RQS765x5PrZfEazYxY2SW0af6FJIsrxVRhLNepbxsa
+bAWKAuae506DXhQZq9fD7sZ6v2+Kcqj1YbLUwwONJEIxJrkKbGuSk3LWYx9WRI7r
+Df82amMrBnN/X8gSVcM3ZoNtr/CDG5Dbub2bCgaTtIWr4Pt4Iby/hmZP3l4lQnnM
+KAXB+xCT15RpcJeLDtyBV+fjkH9pluo8Khxh8BqGiHok4NiABuFodl6orLziaF9v
+AqIEPheVEw1xeFse25TfGzIZlItpJYNN5OsqJeHCThPEzEnbAE4=
+=ITWd
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b18edccde728..5f6daa55b21b 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c11c29350455..d345c660295b 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 3d8008489cbc..1610672fff56 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,8 @@
 DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cbdfb2ef97c2881bca60be5c23e3245262e15304a63431704d8b69fff56594e25517c0e5e1f2641b3eca5ad6a1e76e4d7b3 SHA512 b599b498a20b77cd3346f5b865b5a0436cdd835af250e8cc4ed20d61ac6a4929bf4ceef9a95c6e7b8e825c5f513d33ea32b24661c58e2f1d285db0569d71fc1b
 DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
+DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
 EBUILD ansible-base-2.10.10.ebuild 1674 BLAKE2B 00a56fbe3fabbadfec92bc38e7a7af99468f2d55ac66362fb39958a343b3a1f863f722665ca2d48ba97b8e8a4735a405af010ca65ef35232dcd5bc6574acead5 SHA512 188194e7c129d2f8b4c071107cc20557d0f8f6b689eb74099d5e76b12a82ba8d572a612a3feb1fdc4c35cf9a8c9243337abab185107bd8f3c560e36dbf713ffc
 EBUILD ansible-base-2.10.9.ebuild 1671 BLAKE2B 15a11fb545630d1556f315b4d658919c4246c73fccd5bf0c43523ee237b014a5ddd0481367844c123fe2d16d160d12d8f9e77629d35334672e861424ce087f26 SHA512 a620337d5a5cf5deadc308d99dc52cb508cb5746a9be8d23f2f3c14a571e0e8ccfa537ada1503e29e5b63b4b60c2cbb17784dd9bf5a330e4ea1407dc129a1586
+EBUILD ansible-base-2.11.1.ebuild 1647 BLAKE2B 320f16170478e1119a66a154f67e1693f86fb0860c22e04bc56a21153acb3606841a174fd8dfa283533788d8d33eb8c775e0b372c410a276cf03a58669cc47ab SHA512 4de0f4bb88189e0ec7a6de6b4c9b6d9b175a3e043f5a7b716f2ca5a32206f76fe6581f6ac12a4d8b4ff8c1cc31e47a3f3ec630178d9988bf870303420feb9fde
+EBUILD ansible-base-9999.ebuild 1647 BLAKE2B 320f16170478e1119a66a154f67e1693f86fb0860c22e04bc56a21153acb3606841a174fd8dfa283533788d8d33eb8c775e0b372c410a276cf03a58669cc47ab SHA512 4de0f4bb88189e0ec7a6de6b4c9b6d9b175a3e043f5a7b716f2ca5a32206f76fe6581f6ac12a4d8b4ff8c1cc31e47a3f3ec630178d9988bf870303420feb9fde
 MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible/ansible-2.11.1.ebuild b/app-admin/ansible-base/ansible-base-2.11.1.ebuild
similarity index 81%
rename from app-admin/ansible/ansible-2.11.1.ebuild
rename to app-admin/ansible-base/ansible-base-2.11.1.ebuild
index 157aa3810680..57eb3a160f1d 100644
--- a/app-admin/ansible/ansible-2.11.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.1.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
+HOMEPAGE="https://www.ansible.com/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-core/${PN}-core-${PV}.tar.gz"
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
 fi
-S="${WORKDIR}/${PN}-core-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -35,13 +37,12 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/resolvelib[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible-base
 "
 DEPEND="
-	!app-admin/ansible-base
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible-base/ansible-base-9999.ebuild
similarity index 81%
rename from app-admin/ansible/ansible-9999.ebuild
rename to app-admin/ansible-base/ansible-base-9999.ebuild
index 1925abcf423d..57eb3a160f1d 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible-base/ansible-base-9999.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
+HOMEPAGE="https://www.ansible.com/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-core/${PN}-core-${PV}.tar.gz"
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
 fi
-S="${WORKDIR}/${PN}-core-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -35,12 +37,12 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible-base
 "
 DEPEND="
-	!app-admin/ansible-base
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index f9bd42a6232d..0431abb6907b 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,5 @@
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
-DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
-EBUILD ansible-2.10.7.ebuild 1509 BLAKE2B 9f50b6ec95df3480a38db3f83dc74bb90101594f0b96f867eb6b4ddcfa0e4dbe7c9ab2d2d00b3d562e4e00e3ee0a78de309f1dca068529bbf05522c7ef904137 SHA512 44ade17e48e8210fed9f559fcdc6460c4a41508b863d35ade6470041956e12e19f73ab05cab971c3c0de8fea04016891711e0238182f7224ffdc99323a68c97f
-EBUILD ansible-2.11.1.ebuild 1603 BLAKE2B 312cb0f14b78a0b1c92364f5de32863bf88ae1a12932f15902dfabbca0881a92c8396d22ab5212ff38002c4127a3a39864ed93e3c5165de45f3ecddfb37ede05 SHA512 14ac582e07310c7939a0825c593b69d27660af42e56236aab8658d2f3ddcfb058f9e9aec3e85bbda5cc03d9b0c5c4c749f3562eaa77682cfab48b9f7b7e43cb5
-EBUILD ansible-9999.ebuild 1562 BLAKE2B c1b0f300f086d248caf5e3c74062f6262d7a0cac72ddc7ad58762220de17deefd4fa21f3fa87da54b42063f4ef1b25ca520ceddf10730ddcb35bc6fcc5a1ac7c SHA512 0641b5fea00b6aeed24deb81569e516df32514f658971851da9a5e6610d560273eacfa7185814472fc605c6442731c6e67a162bd8673747b50ae9d68eb4ef889
+DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50dce5a83a783b798afafe88d75d96ae7abd9a512a1d4fc4e1ad0305c72e6d2b4ebe3811addf78faf2d14dab7dd188 SHA512 603a5aa6b63d447efcb6e2f04f40c1bf5d7cc888f344bdc00ca3f9bca92c406554328a0e77cf3d5f2633addc9d6459d7b9d9176d14ecc506c67013fc8180b0c0
+EBUILD ansible-2.10.7.ebuild 1521 BLAKE2B 7ede0de3fba6b4c5ee8f9d679478392f5ca8f4d0e47e70a9417718287e7c1861bfb72d7dec713c10705be2bacfbfafa60047c086707789626b4310510b367797 SHA512 1c0fc02118a4122e5e51bc6e0cd93bbb35a521021dbb3ba739bb066989885efe4d9fcbb9febd2c9e809295af43ada38ea3c0abb9e6c44d3fe47896c869c853ac
+EBUILD ansible-4.1.0.ebuild 607 BLAKE2B 36fcaac434ab8c234eb47fae029ce81d50424677d39e3efadd3b8b44af7831ccf0fee49c748881fee8c26655eb0431710eb65620e8284c0a3369160e46957d77 SHA512 fa3b300013afc4409b08c815e12842497abfd5a3745a4da7cd1e70d55f7aefbefdabe0203e5647b161a587c2e5066e86aace9fd1b10c584b774c35c719985d7f
 MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f
diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild
index c5e15d422cab..247986757063 100644
--- a/app-admin/ansible/ansible-2.10.7.ebuild
+++ b/app-admin/ansible/ansible-2.10.7.ebuild
@@ -36,11 +36,11 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	app-admin/ansible-base
+	<app-admin/ansible-base-2.11
 "
 DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	app-admin/ansible-base
+	<app-admin/ansible-base-2.11
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-4.1.0.ebuild b/app-admin/ansible/ansible-4.1.0.ebuild
new file mode 100644
index 000000000000..39f0a61f6e8f
--- /dev/null
+++ b/app-admin/ansible/ansible-4.1.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.11.1
+	<app-admin/ansible-base-2.12"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 2333e8565643..4dfa9291560a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -9,7 +9,9 @@ AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8
 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
 DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
+DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280
 EBUILD syslog-ng-3.30.1-r1.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff
 EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2
 EBUILD syslog-ng-3.31.2.ebuild 4933 BLAKE2B d1493e6465cf83b3f08da8b57e8c8622d31ea7f56f550e789f9575287654e511a80a37e7f19bacedbfcea3b1b271ccff5c974c4e16d09323254b26ffa398b05e SHA512 5bb0cf89069dc0da0772cc0545dcf5eb4a8cca650e0b1e762f1199ef0cdcdac43680eda2e37f0d9c47faa7c8b0aa813d149df40840ee3aa5a63aa1fd7a21e8ee
+EBUILD syslog-ng-3.32.1.ebuild 4934 BLAKE2B 91e7b7124580298ef3247316ca1c8b665e4260baac5deb277b9da67463ceac5df19de83275c0d46ef4474ea4d63d728e6d23efe4d1ba013937b0cd0999ce4fa8 SHA512 bbb1be3acb51d64acd12246e8f16a7d38f42c42feb13d770bed6e1e01dfdf87f406fdf35a2a09e9d767629ae3b7a85b60c980abb3a19a1676e85631b510e28a2
 MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964
diff --git a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
new file mode 100644
index 000000000000..c99ac514b585
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.4
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+	snmp? ( net-analyzer/net-snmp:0= )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/criterion )"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+	"${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable kafka)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable snmp afsnmp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 15c1e0141a3d..ae8073e3a78b 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/dictd-vera/Manifest b/app-dicts/dictd-vera/Manifest
index 321eaa92c443..2854d83ba3f0 100644
--- a/app-dicts/dictd-vera/Manifest
+++ b/app-dicts/dictd-vera/Manifest
@@ -1,4 +1,5 @@
 AUX dictd-vera-1.24-U+D7.patch 359 BLAKE2B 42895ad91dc2a0c8e154cf27bbbd74d0b27129bc73672dfabd305a60ed4d2c7acc11affbfd13a3b34ce0e728e4fbfa8181020d878710f730ee63125da731a089 SHA512 c0b9828c1f2639bca664bbd29729ce90b5db0a16bda713205c8be75bbd0d0ef2ba9cb8fc3b486d13ff7da37d129f34b81a99c360d23863f84857c233778acd11
 DIST vera-1.24.tar.gz 240378 BLAKE2B f35df71c4fc9b95a9abba83cf49f9a70db03f1353f7d4e2b4e1db1a2f6ae41dc88f0f61b28e5405e76a97a7305f8a8bf6414b19a8067f113e2fd6bb54e57de43 SHA512 1727c91b0b60dc579e8f634375488a145921cf419bf3213118f90af031c48ed3d3408609d0a8a41135a3f6c6e9fa579b412981883325ae0dd9f0f72f56da5cd9
+EBUILD dictd-vera-1.24-r1.ebuild 766 BLAKE2B 50da3696293e9472a6d01b14c7e2941b5c399ff2154b89a3462d18d167d6fd4ce3bf29407cc030fe6b3d5940bad67eab7239670ea736e98d2991b3a84b3a64f2 SHA512 2b1dbbf2dd99146d9bc71c343a1d7e946b92c1fe25505e3f3ca5341b831ff5ef81fbad4c8f72684af659f591d669a4eec8f0741985a8256546cc363abca7a043
 EBUILD dictd-vera-1.24.ebuild 759 BLAKE2B 7440e1a1e1b9fe7dd86f0a65425385884b2c8675c2ac46879fed706d9bb518c8bfe3207a62f276e1c52b0af6d049322fa163c7dce059a280342feeea26b2d482 SHA512 112cf141b37c6521d31cd2f79a9e24ca6b08f2084304912257f6040c8a3b2bade9f9ac4624829c8517c0019347a668b67b75cddc832df4360245cf0899fbdc37
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild b/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
new file mode 100644
index 000000000000..57e23417d5eb
--- /dev/null
+++ b/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict"
+HOMEPAGE="http://home.snafu.de/ohei/vera/vueber-e.html"
+SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
+S="${WORKDIR}/vera-${PV}"
+SLOT="0"
+LICENSE="FDL-1.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=app-text/dictd-1.5.5"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-U+D7.patch" )
+
+src_compile() {
+	cat vera.[0-9a-z] | dictfmt -f -u http://home.snafu.de/ohei \
+		-s "V.E.R.A. -- Virtual Entity of Relevant Acronyms" \
+		vera || die
+	dictzip -v vera.dict || die
+}
+
+src_install() {
+	insinto /usr/share/dict
+	doins vera.dict.dz
+	doins vera.index
+
+	dodoc changelog README
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 75ea05699aac..6901a5d5c72e 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 321718200e61..2d27f513d9c8 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,5 @@
 DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
+DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42
 EBUILD gummi-0.8.1.ebuild 941 BLAKE2B cda4a2712cef8c8bcb7dbc532bda5520cdcaecc584adea637b09f254529c0b9d4d46fa2a11d165737ab573f0731c1e3ebd621f17073d642ba0c21af23136c49e SHA512 97240093be39eaa34879ed464538699a14b714775708fe60987cd58756f0acdd65cd87a0bf2a88c31bc70226626ef8e897b9e0ee566d00adcf90dac95d4940b8
+EBUILD gummi-0.8.2.ebuild 935 BLAKE2B 541a1e261622aa409da60e840bfff94de6624b5474c832f935bf378b8e9eb6216d854e602670649cb7de93f1084f77d008dbe2b695683b212c65d727585a6a3f SHA512 f8f766b95288b5a619ce887e58452087e01a3101fac0f1a9a274c792a7fc1b6ea3fea4b76afb2a023c1d6c393731a3c3786042f8c812aeaba1e1a1e5f63de7c4
 MISC metadata.xml 615 BLAKE2B ee2552450c4e9e8edc7e3dec38bcafedf30ab2b42b8358cce7c7a38e3a37bd907734406ee12a79f176100e9208c7480e6c980633416e3c4cff1ecb638e840673 SHA512 c96879b8ac00c1aafad177a55ecd524a502519f1cee5c1d036d260bb11e12b492d3e798b8f94572666e4aff45dd4233bef4ceb8a34bac523f3e36c78bdb4fddd
diff --git a/app-editors/gummi/gummi-0.8.2.ebuild b/app-editors/gummi/gummi-0.8.2.ebuild
new file mode 100644
index 000000000000..9e9ee99f8505
--- /dev/null
+++ b/app-editors/gummi/gummi-0.8.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Simple LaTeX editor for GTK+ users"
+HOMEPAGE="https://github.com/alexandervdm/gummi"
+SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	app-text/gtkspell:3
+	app-text/poppler[cairo]
+	dev-libs/glib:2
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Gummi supports spell-checking through gtkspell. Support for"
+	elog "additional languages can be added by installing myspell-**-"
+	elog "packages for your language of choice."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 00552a7de936..b547dce0a391 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,8 @@
-DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
 DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
 DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
-EBUILD nano-5.3-r1.ebuild 2430 BLAKE2B 33487afb23e1b01280d6f6fe3f4ffc1008ca820a3e100919fa3c89cc874d80287befc979d3d3848b00cdcdad3954a43eb6fa2d8625320a6e1c9d83b49ad01312 SHA512 98ac275e4a54bee9500d5bd5d71a84e37ac1ce941a4ae5e827d1ae19209fa9d4bd3840e640d6017776f6fcd32df5ae08425f1ba5d2bce0b8e8a5e3ea2fd958d7
+DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
 EBUILD nano-5.6.1.ebuild 2281 BLAKE2B 66004fd9d399d494ed8e5479bcd128ac09b0c812688670d5df47674e915ad670d2284828f929dc5bb1828d83ab792dcb714ec3ac3348b7d78dd82c0633c108e4 SHA512 dfff336508b7e82993aa6a07acec467b2422354847595699af9b55464e630bb46495c71c5e297b1b8d59e492122836175814313598d39ecaa30eff1c8452c84a
 EBUILD nano-5.7.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
+EBUILD nano-5.8.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 EBUILD nano-9999.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.8.ebuild
similarity index 81%
rename from app-editors/nano/nano-5.3-r1.ebuild
rename to app-editors/nano/nano-5.8.ebuild
index 18228c493c85..aaa4c8829842 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -18,13 +18,12 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	sys-libs/ncurses:0=[static-libs(+)]
 	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+	nls? ( virtual/libintl )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
@@ -34,7 +33,6 @@ BDEPEND="
 "
 
 REQUIRED_USE="
-	!ncurses? ( slang? ( minimal ) )
 	magic? ( !minimal )
 "
 
@@ -60,7 +58,6 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable unicode utf8)
 		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
 	)
 	econf "${myconf[@]}"
 }
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 2b4fda8bc9c0..66ec32629ea0 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -3,5 +3,9 @@ AUX vscode.desktop 458 BLAKE2B 98bb17607ad9d8f82e0cbbd032718481cfc3d5118de6f15d8
 DIST vscode-1.56.2-amd64.tar.gz 104824843 BLAKE2B 608cc74daad0534a91d3c6200827b82efa0c2a9634c3cd9f031d4744a35f25c5201a7310011d6dfe57f761845e79574d068678a4500650c47d8404d2bd810f4d SHA512 35ef320b92a66d05a8c2b61a81978d659245f37ef0b2f05002083386a265a232ed163dcc06ddee9bc2bc8f1205fa80e7841268bf66fdddcabe4a8ed35fb50a35
 DIST vscode-1.56.2-arm.tar.gz 95395040 BLAKE2B e948f09a97a39f898276fe4bbc9f7f35fa96b833732a48058e402aaa0246790d79c5422f5e209c842b94c6c46d19b657cdeefa9caa1e255331f81e91e0760c69 SHA512 4486d030d2d611aa0d29a156ba5c2beb2bd0ab1950684c7bdea44460fb05f3a18b62419c346d99a84cd71bb595f7802dab10730b40600879e442ee3181129e6f
 DIST vscode-1.56.2-arm64.tar.gz 110174990 BLAKE2B 3b512136911b3ca431fbf71951655490c85f1c7cc707c6ddea3fd4d41b956fbf33dd8264e279d1d6e69564506aefcd9588397665133a3a34997d916605c9aa73 SHA512 bc3fb6b78e33286486411aa78b538693c371b309e86a84ee7361a2fd78d2d8e0dd4e9dd761f9278ced4e3a31a532e2534cdde001635935dfda92dfab85eb9e51
+DIST vscode-1.57.0-amd64.tar.gz 104867323 BLAKE2B 4c96f1c67c2414f84e51f2589cd511d060fbb19f662b0d4230fc8d6decbc6fd1d7cfffcb6a3d005e53a71af35ee16db4222dd2b8a2f9e6aba92c365baaf1b271 SHA512 35c5590b526c7df5ede6184481568d349ad239c1442a88c78cb5c11c1e7d50ebd34f1cf8faaa87eee3da32e15a56e733734e850d25ab91b8c24168002a2c58d2
+DIST vscode-1.57.0-arm.tar.gz 95405275 BLAKE2B 97e53cf478257a000a25fd7adcd79a43ef69034bc4fc82a74c4d327a9c0015a4d1247afa3440f7ad1b9316f307022c68056675a614ab5b77c98f26063cd56d29 SHA512 64122bff910139904791e0ce4287da6c46dc0c439313f5f25c2b03afa87a7e0c2031c65497ceabe9f4592c3060ddb18dc6a473b3a78812505163a2d52a82e408
+DIST vscode-1.57.0-arm64.tar.gz 110191475 BLAKE2B 667385cb94029a5c4eee383f8f7ebcb01f9090f1178fc8b57a74595ee6766b8d3121cacf5f03e044b972d20c0a51064d5f4b740146399454c0048909e645a74c SHA512 0d46c3bebe4363e5681d7cd8b73844654b7d993df3d89a537041acc9a3f3a00d77f537088c275d38f395d8aa4d4bd216df75388829e9340598465ee290ff06df
 EBUILD vscode-1.56.2.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
+EBUILD vscode-1.57.0.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
 MISC metadata.xml 946 BLAKE2B 7c5b479e70b6b44c5614a30db4c1aac3ecf8ba399a01d9028888719fc76fb33f083ed248c853ce086a4124c40532254dc4a1fe19c196ca3720a75daecca27442 SHA512 0ddadafbf6dd1eb77e70669eeaff7ce22da48ee801b257ca6447ac16f8c22090510fdf84f432fc3a631d50dece3bd90a46f6a570faee8a5daab06a361d858050
diff --git a/app-editors/vscode/vscode-1.57.0.ebuild b/app-editors/vscode/vscode-1.57.0.ebuild
new file mode 100644
index 000000000000..044c01c33002
--- /dev/null
+++ b/app-editors/vscode/vscode-1.57.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome-sandbox
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "You may want to install some additional utils, check in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index df8efae13c09..50e20a1c8c53 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -3,5 +3,9 @@ AUX vscodium.desktop 460 BLAKE2B f07817a1c718b3b981bf353a8b73c9457828b9f48524f01
 DIST vscodium-1.56.2-amd64.tar.gz 108032091 BLAKE2B e6d66885f79a8f29e9316cf759d6b562029a3da9c3fc6d14742adda0ae20e4be05b6c08f8c1698f3340cd0ca97836c49d3ef82bca9a27318d5f6d5e36555455d SHA512 831444221a3055fde829920ad6c0b8c007aa539b614918b20af0e676ecd31f341497f9c7fb8d8fe95f757bc360446cac93e00ee1a828183e0feb1eefad1e0c11
 DIST vscodium-1.56.2-arm.tar.gz 96683293 BLAKE2B bdc6b89ebfa9e1be765aef63f8a2bcdbf2074b64d70833447b3a3caf148c7887c672077827b7467a681219eef0101bdf82581f589586a263397d2cc9951a8c0c SHA512 023c59d4ae6590437c9425fa02f70cd957c125ea69cfa1c4fe8812f2b7521b747421efe89fd3e4bd95b54f0bdea177941f72467af5d8036d51426b8139a48fc2
 DIST vscodium-1.56.2-arm64.tar.gz 113358341 BLAKE2B f7f8c8589985edd11ba80b4fff9ab1174d436a2516eabc02cd6b3f5d03559295f3fe6772a16e6825d6a23953107b5b7537ab28cedc040a8b35a4b25182ee8d29 SHA512 f0aec2074e93bc26cfc615029bbc9ab360993f00a70272002982c058c7746824f6d97fffb34a5d6c16597b4ad8453730f28b04c11e4d0fd8ccea873490b260d5
+DIST vscodium-1.57.0-amd64.tar.gz 107752144 BLAKE2B c7f6f07a526e25b52f5a93eecdcf285f32bf5af38ff4e0b4882303078c110555134e37d85fad01d92970758e867e17e199586878a0a3abebd6fc18866d1c557a SHA512 e58d6161cff2ab0ef206ae629c65d03a947cc9112826a880f86c296d19462edf03e66c2d17399268b32aed597ea688f93b20cade8aac79d97871306c4d967073
+DIST vscodium-1.57.0-arm.tar.gz 96394761 BLAKE2B 3fc3ab8d4be7343cc8597cf9c09a13e1e28a1bfce12b19a11f5bdf46c1d6931c12718306f19c78fd7c567b622bf40434165009b0b0b6b9de3b86005833188511 SHA512 d7eb1776ceedd0072b039a04ec194779d6c27decc92d311cc9bd8c630b776ec1c85e46b8c3afe93c3cae904f27a2e05d69c6ca4155cae6a90c44570f59afedb2
+DIST vscodium-1.57.0-arm64.tar.gz 113075134 BLAKE2B eeead9b70a8e7b353ac744b65b3854ce5954f242a777e974ba4c8a586aa8c99d6dc5ee793e01568275a3edc48f8287ee3c3c8d1ae6b3c54b9df8913d4f32f96d SHA512 0c8a282b36ec3067246b590c241b3301a623cc9b0bd15bdbc3a2ad6303399c24bb721264ea69f4342717d8ad29046e6ed25ff6b3449923a315e2df2ccc85e0db
 EBUILD vscodium-1.56.2.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
+EBUILD vscodium-1.57.0.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
 MISC metadata.xml 1190 BLAKE2B d2a237155cf015fd18d0bf562747788584142e136c3ffd98ebe1a07c796562a65c27818c0ba0db9e5b64a3a8d1f5c9465e48de285f38042890160eedcdcf017f SHA512 f8e6986a85092e68c016aa34bd4948f0eea6f83b26935e07697ff1c536616c6829495467b2e09d4cda01699bae5c7825fcc711adc2f90e81e60592c168220d4e
diff --git a/app-editors/vscodium/vscodium-1.57.0.ebuild b/app-editors/vscodium/vscodium-1.57.0.ebuild
new file mode 100644
index 000000000000..e25a3967ed49
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.57.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscodium/codium
+	/opt/vscodium/libEGL.so
+	/opt/vscodium/libffmpeg.so
+	/opt/vscodium/libGLESv2.so
+	/opt/vscodium/libvulkan.so*
+	/opt/vscodium/chrome-sandbox
+	/opt/vscodium/libvk_swiftshader.so
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
+	/opt/vscodium/resources/app/extensions/*
+	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# Cleanup
+	rm "${S}/resources/app/LICENSE.txt" || die
+
+	# Install
+	pax-mark m codium
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}codium
+	fperms +x /opt/${PN}/chrome-sandbox
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+	domenu "${FILESDIR}/vscodium.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 76aac3e296a3..7865b812e2a5 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/jpipe/Manifest b/app-misc/jpipe/Manifest
index 4941b1f42db2..b132acfd3198 100644
--- a/app-misc/jpipe/Manifest
+++ b/app-misc/jpipe/Manifest
@@ -1,3 +1,3 @@
-DIST jpipe-0.0.1.tar.gz 4567 BLAKE2B 0c33e36ed03373ef2a030aa2ac0ecc6e05c0683f04bf4c96eeec0cc07b75a16e3c805bc9c59b6cf7fd6aa9e65dc639dbc1e496d4084bb4b74835ea0c3043c8be SHA512 8cd7f9ff5138f55c13497a0059d32fdde6d6e698020e9ea231ed0431e76e97b2769f781e8a58ec636cadfe110f84f940161cbfa212cfa2f805e18e92a7e0d310
-EBUILD jpipe-0.0.1.ebuild 714 BLAKE2B 647848efc5935ca6701d58a241fad0a36ac860ea7a49dab0024b911a64fd957a8d9d3d6e27f54148f0b6bd8b062b82420db9644627474bc34496228394597889 SHA512 8966122b760bb7d7a7f0073e0394d216b60337c8abcfed8d1b1908c7bf023ab2d2e495350b5958da8bc1e6fa31dac73026d126b80870f262c6797223a46eb320
-MISC metadata.xml 437 BLAKE2B 1551173ed4975b8713a06c79028736923986511296f6aaf03caf7649bfe865f8a08cd6ac6f49c53a71ac447f5239b5a8ca7f4bcaaf1e4a064a12f01380cb7512 SHA512 449e5fd755d7de8e9e2bfe3297ce25c3eaaddb1af80c1c3751bbc07a0496d3ffdb343f85a8c223bcfac9f548f604a80e89e6d0f87fe1b0daa4f419677639b9aa
+DIST jpipe-0.1.3.1.tar.gz 5957 BLAKE2B ce7570006aa40ca61939c59a93608569898b0327d10a3ebce85e44ca33175a1fcf8412740008a648865ce5098594318154ad415505ed3167664c8726827402c7 SHA512 4dd90c4d59f1a3ca8a2417a20b95db9bb949c380104030a35053edb5e1c3a1bc73d28725cc18c0a3384181899198837f4d4abedaf9c7e374ec905e42ce1af4f6
+EBUILD jpipe-0.1.3.1.ebuild 969 BLAKE2B 4f5c6692c123df3a2fa818af24fdf03ef57a578ae6cee118feafdabda913ffee17431a465f3910082fea954242d50630a1393582b3a200631cf10fb1b4671caa SHA512 c926394af602e1745eee8a327c89b316539a195ddf83811494c8911820b6ceb0463239c603056504c0ad7c91abd96b1857cf730c4d9659f08781d419641de821
+MISC metadata.xml 540 BLAKE2B 48ce177f946eb9958b56d18688f8318f33ef14200c893f4645d2a26ac3d372b10b90775e1caa888c86051c3bc644c8f240581ab5ceed72c14cab6f9188f7a6a7 SHA512 8ba8fadf241f2ed2b25d5312293cf8c0d5410bc78e7f8cdca7607c9cef4a04297377ec13eea075deabaf2788cdd0b53a66488cb41887df6321e3fcf54ddf5265
diff --git a/app-misc/jpipe/jpipe-0.0.1.ebuild b/app-misc/jpipe/jpipe-0.1.3.1.ebuild
similarity index 68%
rename from app-misc/jpipe/jpipe-0.0.1.ebuild
rename to app-misc/jpipe/jpipe-0.1.3.1.ebuild
index 0ac556bbf2b2..a7ed62838505 100644
--- a/app-misc/jpipe/jpipe-0.0.1.ebuild
+++ b/app-misc/jpipe/jpipe-0.1.3.1.ebuild
@@ -14,15 +14,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="jp-symlink test"
+IUSE="jpp jp-symlink test"
 RESTRICT="!test? ( test )"
 RDEPEND="
-	jp-symlink? ( !app-misc/jp )
+	jpp? ( !app-misc/jp[jpp] )
+	jp-symlink? ( !app-misc/jp[jp] )
 	dev-python/jmespath[${PYTHON_USEDEP}]
 "
 
+python_prepare_all() {
+	if ! use jpp; then
+		sed -e '/jpp_main/d' -i setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	"${PYTHON}" test/test_jpipe.py || die "tests failed for ${EPYTHON}"
+	if use jpp; then
+		"${PYTHON}" test/test_jpp.py || die "jpp tests failed for ${EPYTHON}"
+	fi
 }
 
 src_install() {
diff --git a/app-misc/jpipe/metadata.xml b/app-misc/jpipe/metadata.xml
index 0f6af2e7daef..c1da5f3b0541 100644
--- a/app-misc/jpipe/metadata.xml
+++ b/app-misc/jpipe/metadata.xml
@@ -12,5 +12,8 @@
 		<flag name="jp-symlink">
 			Install a jp symlink that points to jpipe.
 		</flag>
+		<flag name="jpp">
+			Install jpp which is an extended superset of the jp CLI for JMESPath.
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 2589a3ef338a..d8e12ba0bd3e 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,4 +1,5 @@
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST alga-0.9.3.crate 37838 BLAKE2B cd5e31d9445c5a1e4b4f86f333843bccb5600416b43f5ff5e90540e0ddbe72fde1aadb0a7da81aaaaaa1537a2ca865e262ee828386192c20f66ec28e3e04c6f7 SHA512 dbfbdd98b4fc382e98efd0a63b28fa8591c6c882ad238ea376640ac3362003de0c6fa7997e4001f248710426b330fca735515c3827e7eeb064bdf470aef9086c
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST approx-0.3.2.crate 14288 BLAKE2B 601eb7b83c6f0e41a4d64db5669b7058b4038319414bde74761f0b1584baf8426f9735cd0076d1dde829a056a07e8f820d85737e5b1bf371d9510551c367025c SHA512 3853684c3b1c5c63204304f2e4f1c673b92311125c1df0fc16e96bd6f765e8266079e8d4ec3c85fad933361638c7515d5be18a2fc551353c4097051d0bd96ae3
@@ -6,20 +7,20 @@ DIST approx-0.4.0.crate 14280 BLAKE2B 8508006fd4b31290b4a3e0b26f521af94d5014774b
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
+DIST assert_cmd-1.0.4.crate 26621 BLAKE2B 0acd8a6c09cfe51594508fa7c4dc27e8831672c4e1ddbd6d392c3b439b21f3cffd8613c4abd379cc69ac500d640433aae61f5ae5a3e5908deaec193fecb70146 SHA512 125d792ab8078a205bdf5cb396c8ac4b0c7330b7773af0014c4f17e23af56dad30f14bee51a87cdf615bdf17c849274dcf7df1ebcd9c479cc8c2223c6203784a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
 DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
-DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
+DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
-DIST csv-1.1.5.crate 886773 BLAKE2B c5da00c6d81b3cc1336edbe462cbca59121c3438d41c55148de21a538c5a3a9d81d10da44177c51898dd6b9d027f794fa15779cf0c01861183efed54fd6b95a3 SHA512 d878a953fd1079b1aef7f23108c1bc5db3cadc2e1a1dc1ceb4e26508e4249db01f957f6626eef721153d3b0cc47f5f3b25380e4c943adbdf28647b9bb7cd8f05
+DIST crossbeam-utils-0.8.4.crate 37279 BLAKE2B 55372ee1bec00b4bb3ad8fdd1df3bae4b0c166aa08898c0400663b4ea8610c956fc5376fd1638492e0d887abe65491e380eaf73459545325a2ef1d23234eae6b SHA512 6147ee3048f2df2c311c6d9d683b239249e6f49f8b2b27eaeaea9361b32fccb1ba37fd8bd3fa147d70b7d7d8d3281d3018939c4a70a75e191da7d86128c4648c
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
@@ -29,40 +30,48 @@ DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d435
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST downcast-0.10.0.crate 4923 BLAKE2B 3e69a1dcd0f2ad487273775b304ea6fa26f225eaab012219072cb5ef3ff60931ff3ffd616e09f3708895b2d01538c8e46e3e91aa1f4a288bdf910bdc7043acba SHA512 f618ec81bcdf74e8851703c6dfe92b36c9a035214635fdae598af20258549ef31a1c23a4d220c67505aa403fcc8a0b99a990fda01305a71b801acd5044f91c12
 DIST dtoa-0.4.7.crate 15910 BLAKE2B e6b4ad0c4a81d73557f93675671735eca3c5c31426319e746c73b65a34847085ee82f50a4f561036dae31a4fedf24a307e6edcd756cc1e6d46f2f20fc29bf456 SHA512 df090a5ea273265ae2f05aac2ae364cd0b606872a392411359548b9e780b2bc8dcb999254186ccc2da0a7353a4e0f1b0f513b2cd83d7e4f1290dcb1f466847f7
+DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST fragile-1.0.0.crate 10315 BLAKE2B 5f81d144012372be3504f151e9740d422edb9e29224ce2be4105d7aebc8bfc0b882e1a3a8a0eb6ff1f314264e3c70a6054196703cb69cf43560dc9711340fc69 SHA512 bbdd87f97c494495f4db10c68121f4b6f76e3752b9e4b363c0dde24a96a1344868faceeaf7e6df1edfee6ec107f10b69fd26bf271519675463c0235ecec3780b
-DIST generic-array-0.13.2.crate 26715 BLAKE2B c0ec536cd455b82fedcbc201820090db78c798ab69b3bf4e185a5b4860dfa560e0b9d6d87d991cf99ec406867b98e3cf0cb48761b0a91bc25833e12cd59fbe2e SHA512 7039c1d0e4f8f9b0518ddd807adb7e0e86ebee056bc8562eaaa3f7360b6a953b8be4d5c2660ad62a68e42eb242111ee98fa961c0e8a74bde532970bcef3dbe4a
 DIST generic-array-0.13.3.crate 26956 BLAKE2B b8df2cfb4b37543eb1d2803ab7c6d2daf4a1dfe7d652513c259f93e26ab3049aa033072ea486f83744effd188cc53fc785c3e4f3c256677f0fcb221603221ee4 SHA512 d66ea808aaf085c9162fa8c96a5655bc60b42df764c5dc17226e0aa24792d48230d51c9df61db6f551d491cd173da48a5e06d5e4e010901b14c3f044c7f38fcb
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
 DIST libc-0.2.88.crate 514138 BLAKE2B c9c6cd0b5456ee2706e7b572ba8df644abeb2d1297abe4f5d2b480e7b7b6b1024cfde98adea2822045b605949505c133538c74b0676c3ab5a2db8aed04605b4b SHA512 c1ad5dd0efd8117da798fcff84082e3b831cb1ae04c26ca8d87936057155e2ca08f0a693cf2c79c5db2c2dbe6b64e254328439b303ba952559f4c524466ad243
+DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST matrixmultiply-0.2.4.crate 32929 BLAKE2B bd3c6b2d11202ea9390760ca59b7452beb4094b4a95314c1a1c596ff623eb985ae5cf2b3821d365dd2e2912c1bd25713188de07b4555a996a667cb4d6b0cfb11 SHA512 3ec6846e1342d6dddb81f5bd4495e940f011a3e048c712262cc413318c087aaa137550cff6d969873ac96bb628f6a460e92536674c0d503d5c609d9be5d9d184
+DIST matrixmultiply-0.3.1.crate 40550 BLAKE2B e6ba7aef3ee1ff31da639492e3baf73c127bacedd20c9b08301ac6bc6baca92122d99f313fecc6cda955cb0e3c9f28d6ce26094d006e15afb3041e1c90348dc3 SHA512 d4db1b27a41078a49d6cff5a3d4a723bbd2029f8007b50a69800ab5de7952978d81749b6dde80706f62efb848c4d1577e039828183533a2b68db80b699cfc4b1
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST mockall-0.9.1.crate 44172 BLAKE2B 7f6acce0914d526ffc88f9965142cd5785ccea0633ae163cfaa9266a24f1ff144fc17899e6ffc28585d1c55200deb7278269ed7c475601c4d5030526c0961605 SHA512 351c81daaaf411c4e7bca2a9c74b7eabf4a3a45772b5dd1b15d04994cfa759ad6094230b7410e9ce12db2dc99d8450f949276583ce210d200f12fa95b98ce6de
 DIST mockall_derive-0.9.1.crate 41256 BLAKE2B d6c162162e5a83773401de5582955592c7592490d31d793b5c02aab049f3cde63a40e31df72750d5da74f998a2343ec935844fd2e78c1d2806d6b60ac42e4911 SHA512 dc01d735ca2b05a903f169b9deb2f9dac70e89d2ccd469c988ac93d86d9c2dd101d17fc4bd0ac6d184b0de86f13bfb0c7cc869d884a48509791903b32785735e
 DIST nalgebra-0.19.0.crate 253667 BLAKE2B e8959c237f4fff99e0deb8726e63a0536459b9bb9a2b8a2b2561fccd34d54bca57e3af9a86ef4543dd3bded627367900a5a03b38e9fb3581377b6dedf01c8669 SHA512 d9dc64a9e27af77f77eccd59f2dd672e087153dabc35058f6c7dd0c29bb9c388179606cdb20402f13a325a235e27dda65232194f572b701a3a3ccf38862106f8
+DIST nalgebra-0.26.2.crate 325684 BLAKE2B c8d2d61fa5ce06d15c7830d870c822cb3f71cd3678cfe1d6814beb71912695f5bbe7c2a44a20727c4fac2f6e65857bc8ae80bccabd130b81aa6b8ff642f5a9cc SHA512 579b66dd1dca0ff50fe6e2f4a6237f3b50d155571dd976f2b93b1886f89f02e3a1db7f6d856d3a23f7c60244b0ba84da101f12d236fa42a14f3afc92d27cf7f2
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
+DIST num-complex-0.3.1.crate 24541 BLAKE2B 10777a6df568fb94740a2bf2a84d68c5612efae200f99be1c20114d0adb0672f08b512f499ea4f86e19e3f20e98a7213fe116509651071b979e59515fb9958f8 SHA512 d24d613f20e04dcfdee68e95b2d4b06ba99db637a96e41a55c4f599626951a44cc5f8adf8e8c86003d42c316aaea0c27739e812fcd4d4bb6efca5b2d9cecdd71
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
+DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
+DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
+DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
@@ -77,45 +86,48 @@ DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa059
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
+DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
-DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-1.4.4.crate 241266 BLAKE2B 1f5877002d9fb2eb83146207232ba53fba02e8f19de9afd9f39d7c25acf7fee1be9bde0ead5211a81846ff52f595bd2b6885d68ed2c1e43466de38a323ff844a SHA512 1d7a0303c8a8106278516ecd3dbe3dca331f1a91fecd4bfed6d9744654447cab597f7dbfadf6b0e7ef7b4fcf357a6258bf8d517e5bef71f6e6dc46f7a9b1b2d9
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpick-0.8.1.crate 40723 BLAKE2B 6fc98b965f392c1db82056096265528500eb84f16d480db476f412ae4a38d23be19b9d991fa71b038d1f3540272238b89b961895a94cf4e8a835995b688656f8 SHA512 e713b1b322f8ea552320f1d4f004a0950ccd09d23605cb95569fb85522b4a5e4383ff30894d2b898c6a47bd8419a2e305123a276518c6bf02bf7c506941d5c8d
 DIST rpick-0.8.2.crate 40556 BLAKE2B 7bd2216a30ec8a8e81c7f1081455460a59875ec304140269df2927ce464e63895ceb2160c3326c89f22ccc5bd26b2ee9f59f437afc30939b1c25aa67aa001480 SHA512 8362e89c6601d6fdc5f4d1c8548e8359625d8f8225399bad6650035fddd3fe6c3e52c25d5eb83dbad7f10adc92cf3e013f851ee435d307bf6d586c266ac2973d
+DIST rpick-0.8.4.crate 40230 BLAKE2B 714c120a39c3bac961015f3a7efd2b121bd41782653d1f7d2b9176dda3d2ecb53a3940a2117193ff7ad5b497cd43957560ccff8d69f2b09954bee56842b181b7 SHA512 8007d5599625d7cceac2c7380c96924de2be3f301e3f2849e91573a794618f692922d7a249d11946c213a1c6b5dcf34aff15beeebd7eac618c1efc4121e31f0f
 DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
 DIST serde-1.0.124.crate 74508 BLAKE2B c2201c9f1aa7d3f72bdb5ca56b888d40d7606d019d86f3b2dafa93d67e768a8f79ac281c3e8442a4efae676de3b3556c55ca7234fd962809e035631a7f824191 SHA512 3106e446875b6a45f59f23d5619e62e6b97ba5462f38f768b68bd33a3679ee22f4821f460646133eb626a9e529b704e405388425ee2353a4027b48f7e36623ea
-DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
+DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde_derive-1.0.124.crate 54147 BLAKE2B 313a601e7fba1d23a4029fb40946cd0c54ee100d5eb76e81d33d289debd96b63c862d2797b0b4de49df8b417d711fbebeba7660b4243dbd147cb75d04a2f78a3 SHA512 6da069bd2ffa101bf0c83748417e14cab93b898313a33bbb2584ef4bb85924a92b24c54f61906a42797d409ad47c313089a31549c2e6be1513220e3145a76c8d
+DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
+DIST simba-0.4.0.crate 48743 BLAKE2B f164b4111abe689b943b8eb0f0cbd9c60987e333751a52b3b6839c4c72d8182e5b8a7f2fa754ae389165b7f5f05f6c0c7938fdd352729448b2889dca62c51d07 SHA512 94346886ef76ad2b9631f6d6dad76ca48c4e9b60f2d6bb757db413aa36b45c9df78e66dacd2be2aa62f99501c114694d403ec07afe6097b47d0a3ada555ca69f
 DIST statrs-0.13.0.crate 123300 BLAKE2B 2c4c0f608c261ff6feea282fa28aa4d7bdf6b8dfbc5c8b927c0253bd1ea49e7038513c2f3cd15237ac11a01978c2d5794dc4e104ac6d50b882fb5cda6cf9f485 SHA512 3ce6f35dba25e27535dcff6985ebd2b24093b9b9b1911e151be740da3c1ad0722a3c35fba1fc6ef105e9d1aec122c56e0d3a9f223c3327cf970e3c720d16a996
+DIST statrs-0.14.0.crate 131422 BLAKE2B 9fc474662cf33c94812cd84fab9a9ef98cb60f3bc8a60ede0a4d2af2aa7b97199478d26b9eed4e243262c8cfa0d4cd9cef986214a4d0db842c04ca53222dfc99 SHA512 f007e23423d453e5d70911a3a497855a005defd18f4fd0d3223d77dd91ffdaa82926fad57a53c32f050eaacbdb3920930435050ae475d7ac18b3a9b5661c5c18
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-1.0.63.crate 231524 BLAKE2B 43398bc3ca9069db4d44af3b28e5e48034d6ac4f38bd1e3da8c77c9d1468d3d9f6f7b7c6711d1dd232d5f2d9477c5929a18368a003be42f6254f270cf5d6a74a SHA512 a0da342e44dc6509f35dad8534acd93bf1a9e3104c2d9eb9d66c38a25036c5aae0503bfee3e09d2e42cc117022b328b6d966444dfb434b780c78fea64dfb14b6
+DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
-DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
+DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
-DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 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
@@ -123,6 +135,6 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpick-0.8.1.ebuild 2682 BLAKE2B d26c4f13683788bf7c2f5fed23c90dfc172c0754fe9e8906ea5825774b7c0e3ea94f5906859f203f2f09517ae5181d531256482dfab55ca6806ad3693e009559 SHA512 672ff9eedd557555ae5ab8e80c703e0442e2e7fc4197b45d8ce60bbc5166d73947ba9378c48cd58f07de7047d53e7a6019cc99d7724cfff0c59999e4fb5c868a
 EBUILD rpick-0.8.2.ebuild 2647 BLAKE2B 68028dec9ac8da55d7d8e335ad188581b11c90fb463270ee9a522e1de821182f737df8f30f2a4ec0a42c26519e5daad24d2d373b18ec952a62b7360832b24fef SHA512 4ab8741291f5f1664e1f8bbc4c80ff2330fa7928b41d4d82536fae9d3d5312d941242d714984207ac83f1d7d2e832f929aaa2fe02ca1c8b66d6f1a8ac268c168
+EBUILD rpick-0.8.4.ebuild 2553 BLAKE2B fa2d2ed47f20dbfe50562b85ed74530439aa167ed241c6d4b004c6d6cac43ed9cdd4a2b426ba3709b7fc95f6f381c58f3ec629e0a78d5dda3b0c575472b32b98 SHA512 5810799656057e103542c691e99ff9c0532297aa6cd51cbe7ba17a79061655356a431adaab00756c026563c0930afd7905be252fc0508f2a6940f0234c1c6c88
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.1.ebuild b/app-misc/rpick/rpick-0.8.4.ebuild
similarity index 75%
rename from app-misc/rpick/rpick-0.8.1.ebuild
rename to app-misc/rpick/rpick-0.8.4.ebuild
index fd35b49ae5b0..89bce4c4d0d2 100644
--- a/app-misc/rpick/rpick-0.8.1.ebuild
+++ b/app-misc/rpick/rpick-0.8.4.ebuild
@@ -6,26 +6,24 @@
 EAPI=7
 
 CRATES="
-aho-corasick-0.7.15
-alga-0.9.3
+aho-corasick-0.7.18
 ansi_term-0.11.0
-approx-0.3.2
 approx-0.4.0
 arrayref-0.3.6
 arrayvec-0.5.2
-assert_cmd-1.0.3
+assert_cmd-1.0.4
 atty-0.2.14
 autocfg-1.0.1
 base64-0.13.0
 bitflags-1.2.1
 blake2b_simd-0.5.11
-bstr-0.2.15
-byteorder-1.4.2
+bstr-0.2.16
+byteorder-1.4.3
 cfg-if-1.0.0
 clap-2.33.3
 constant_time_eq-0.1.5
-crossbeam-utils-0.8.1
-csv-1.1.5
+crossbeam-utils-0.8.4
+csv-1.1.6
 csv-core-0.1.10
 difference-2.0.0
 dirs-1.0.5
@@ -33,83 +31,77 @@ dirs-next-2.0.0
 dirs-sys-next-0.1.2
 doc-comment-0.3.3
 downcast-0.10.0
-dtoa-0.4.7
+dtoa-0.4.8
 encode_unicode-0.3.6
 float-cmp-0.8.0
 fragile-1.0.0
-generic-array-0.13.2
 getrandom-0.1.16
-getrandom-0.2.2
+getrandom-0.2.3
 heck-0.3.2
 hermit-abi-0.1.18
 itoa-0.4.7
 lazy_static-1.4.0
-libc-0.2.86
+libc-0.2.94
 libm-0.2.1
 linked-hash-map-0.5.4
-matrixmultiply-0.2.4
-memchr-2.3.4
+matrixmultiply-0.3.1
+memchr-2.4.0
 mockall-0.9.1
 mockall_derive-0.9.1
-nalgebra-0.19.0
+nalgebra-0.26.2
 normalize-line-endings-0.3.0
-num-complex-0.2.4
+num-complex-0.3.1
 num-integer-0.1.44
-num-rational-0.2.4
+num-rational-0.3.2
 num-traits-0.2.14
-once_cell-1.5.2
+paste-1.0.5
 ppv-lite86-0.2.10
-predicates-1.0.7
+predicates-1.0.8
 predicates-core-1.0.2
 predicates-tree-1.0.2
 prettytable-rs-0.8.0
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
-proc-macro2-1.0.24
+proc-macro2-1.0.27
 quote-1.0.9
-rand-0.7.3
 rand-0.8.3
-rand_chacha-0.2.2
 rand_chacha-0.3.0
-rand_core-0.5.1
 rand_core-0.6.2
-rand_distr-0.2.2
 rand_distr-0.4.0
-rand_hc-0.2.0
 rand_hc-0.3.0
 rawpointer-0.2.1
 redox_syscall-0.1.57
-redox_syscall-0.2.5
+redox_syscall-0.2.8
 redox_users-0.3.5
 redox_users-0.4.0
-regex-1.4.3
+regex-1.5.4
 regex-automata-0.1.9
-regex-syntax-0.6.22
+regex-syntax-0.6.25
 remove_dir_all-0.5.3
-rpick-0.8.1
+rpick-0.8.4
 rust-argon2-0.8.3
 ryu-1.0.5
-serde-1.0.123
-serde_derive-1.0.123
+serde-1.0.126
+serde_derive-1.0.126
 serde_yaml-0.8.17
-statrs-0.13.0
+simba-0.4.0
+statrs-0.14.0
 strsim-0.8.0
 structopt-0.3.21
 structopt-derive-0.4.14
-syn-1.0.60
+syn-1.0.72
 tempfile-3.2.0
 term-0.5.2
 textwrap-0.11.0
-thiserror-1.0.23
-thiserror-impl-1.0.23
-thread_local-1.1.3
+thiserror-1.0.25
+thiserror-impl-1.0.25
 treeline-0.1.0
-typenum-1.12.0
+typenum-1.13.0
 unicode-segmentation-1.7.1
 unicode-width-0.1.8
-unicode-xid-0.2.1
+unicode-xid-0.2.2
 vec_map-0.8.2
-version_check-0.9.2
+version_check-0.9.3
 wait-timeout-0.2.0
 wasi-0.10.2+wasi-snapshot-preview1
 wasi-0.9.0+wasi-snapshot-preview1
@@ -129,7 +121,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index c35f38e45e69..b920382c1152 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -4,7 +4,9 @@ AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac
 DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
 DIST tmuxp-1.6.5.tar.gz 1017117 BLAKE2B 4cc8955f9dcfffd237ffde3e7487496aaf85dd886fd124ad76d61e10fa64f90bac79cc4df9aac63122446b7a4727b01ceaea502d7bbe5f5ba7f68e89bbb86feb SHA512 9095c196f20b537662ffa9d819c675e325fda7f49fb3fd9811f00fc1e1c763b7ea29cdd500bb7d775d1673ab2fc1386f662a2ff6744ffcd2b7aaab13a014cce3
 DIST tmuxp-1.7.2.tar.gz 1027293 BLAKE2B 2564d196c9c327584d24f57ce72165a7cdff2209fe6869a4d3519eb0246329cd8159ecaa20c2a39e153bde224201b1f846f4244c4df72ac540cf0d71f9fba75a SHA512 2ccf63c9f5b7049438ca6079894aac92a0f7496a56c68d88e5a9d5c2a42188a4e40d559792857881f492b28392a329697d4d43781f38ee7c49ed592aac8a69f8
+DIST tmuxp-1.8.1.tar.gz 1019728 BLAKE2B 2bf5a1964cf2d29e41c387e69019a5fae533eed70a578a3a6259a46a541ce22462d4b43326f3df7ded9afc0b5a685bd02a83e3633ed795687ba7bf0903bff866 SHA512 a414721fd9f976a9059cbb6e289aee67154df09f9437f78f97ae82b07af7fbbe67d72ed10272401fa5373643ff2a8946abcafd1c6d2098d7f1fde8364281dff3
 EBUILD tmuxp-1.5.4.ebuild 964 BLAKE2B 643aaf5a7db258f05164547d93e0dc4a63af82a79048a247f08bb8e8cbd5ad5bd71d27e1c708f4f63573424ed70804dd66a6e25b62460e641339bc4426384444 SHA512 f9ed588279ec0739ffe842847a271144c8418d1dcb1aa8190816320eb621a1900b77a1a5bdb5dc037a0b12cd266b10334c72562e8b0444acd5cbdabf3e74a061
 EBUILD tmuxp-1.6.5.ebuild 1122 BLAKE2B 005720290707591c2291ce5f5431fc10484945080fe3d62b437966acab6fb6395f031f24793cd6a9b2321597e7f0dbc8341d541ebf9ccff2870f8397f7485b3e SHA512 f4bf6bfaab0999505f3822139d9ce10128e57f56a74d42ece314c900d128e9a9f8042e40f722e4776ab35cd990041193cc476b1512649a284f34cce88a357864
 EBUILD tmuxp-1.7.2-r1.ebuild 1028 BLAKE2B f85c50f310a394e8c04b9becfd180956aad59b4ddb9b24313d107d03a567892032977b1cc6525edfd25d33d582aca9c4b2e3b19d0ebc2b099340a553bce2c558 SHA512 896e236ad5a5b537c7f53b2662c06d07f9c37378f3259e5288a9b28095157f97050bdef41ba46fb7051fedcbff318d7de1e7d58eb42b7d747288c57c68f40f3f
+EBUILD tmuxp-1.8.1.ebuild 1029 BLAKE2B 473845e85cd9d4a5637efec7c4f693c6d51cd2498739b181c981eba65c82b5d447d335cd2d45db8b6bbb4f9b090bdadfe5e0628f26a1b94b0b244836c8fa9f0c SHA512 75510a50fa787d40051b7531440654aa770d6b090c95d5ff1518df589a2e4968e83a2a1f765d5df8f65bb9a941082a9eb862643ffa29f5c5527f058388eee283
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.8.1.ebuild b/app-misc/tmuxp/tmuxp-1.8.1.ebuild
new file mode 100644
index 000000000000..3db97f10a3f4
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.8.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
+	>=dev-python/libtmux-0.9[${PYTHON_USEDEP}]
+	<dev-python/libtmux-0.10[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
+	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
+	"${FILESDIR}/tmuxp-1.7.2-relax-click-dep.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" epytest
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 40eeb8af3ea4..1a503dfaf81b 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 628cf8fe6e8f..b3e34f81fe0b 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,12 +1,4 @@
-AUX 1.8.0-glibc212.patch 323 BLAKE2B b5b25950d742041b2f1568043d99a3b7b5e6e44f23b894280b7cb40246bb0f08f91929bcac173de7b206b797ca87943a4230de84b3cf27c0babbc91e938a7f2b SHA512 c7807f0cb867343fb167f8428a143e125a36c5c764f6ff0a0c8edab892c12b636bc7a47e87574e30209ee0cf5500642369e4135799aee3d3f4292423496fdd07
-AUX 1.8.1-autoconf-update.patch 1735 BLAKE2B 8c33d1fb88b3a186e59581f19d97aa2315aaaa901d2d484d4824a4a679ed05a22b402da62bce743b74bc6c06f6f15ac401da960ed5206a2267639844c9d03047 SHA512 5c48300d3476913a96f1ea45853ad6092527490f1e36cab669be74766486f7c13ab86c740603cfe7f5381148a69e60bfb0e968c03c1c579f7aa8d9efb36281b6
-AUX 1.8.1-configure_detect_netfilter.patch 641 BLAKE2B edc5958760633efef678aa0d64cb4d054bb3968f56590ea3e9a0674fa2e01bddc3f6b78622c940072f2ca7843e47d0b6594aced3afc235cef9bca7c940d7205d SHA512 d4c3af631ab0ef37cb5943cd17ba6481e229af3537e73769f13ed6fe45e2671a9e9ee8f14f2243e95fd8b17d4a8dbb2c7945a5de9e4ce3f29e842779c55d0ea0
-AUX 1.8.1-fix-buffer-overflow.patch 442 BLAKE2B bfc345bc3d2df77a48e9b35b6462221fab11cd7ba2589f076b83284a5a24a60f6978f8338c287058bdb747bd58ff08cb6dc825250a005ead327c74f58f39d3b4 SHA512 4c3cece95f4a32ee2b37b37f84462aeda43c2d25c2eb5cfaf4bfbbe2bdc2d7db7c2ead2f6150bb108ea124fc29c277371d1d0f415a6b26df98f515d910cb3e8b
-AUX 1.8.1-fix-c++14.patch 1220 BLAKE2B 10df79cc01b26b5df35ede979743cc2d18598fb47d2d83a30b5b0d11264495965d3af7f84ba6e28e4219cae0742b5293ec2f8c60870cf9a7585e7b999fab2e11 SHA512 222c21e7b0b4e035ec3a36edb5b9e68d345550781f21a8c075835bf6f27ee46f62469a17f4cec3c1c1bb69741661dbcc7071c51c964006201ed8c3ff48a60c80
-AUX 1.8.1-fix-gcc9.patch 1222 BLAKE2B d5f93bb1f34ef563d6cf88007f859891e49a8e5bb561a9f702346407c1b3e6bd3fa535b6d0c3ceaefb6b50ef094aa2e91895565b893b453e774de8cc62fa5843 SHA512 b8c2b4a530418bedfa73b89fe8b4e659e38141ca9f4998d4f5217cfc05355263408e7ec2f726e5f8e8283165725c38c454ce92dd8d3cdf920858d70e63070199
-AUX 1.8.1-gnutls-3.4.patch 1229 BLAKE2B a4936cce4fff5a7935c2bd077add555fa8d9b229afaaec545e78c1f6a7d34f35f7168c2381183ceaf4fd56bd1318a9505305ae59e77c87d9813f485e1aa6936d SHA512 92db4deba0ae612fda5873224641d35d5637a48d553d0afee7749c5477ca19a62640656d4781d101db5b545ddd962ce7c11a6edf33d128b031cafebf3cf6db77
-AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee3aa3972690305ca14da04d7665b17d33f4b9d16e5128575ee4d378e031b57cc579d777845fc65c3cbab4abe SHA512 76f444739b370681d1b619b78cc77867da197f149c19d036d9d8b430a7a59d697c7ab30529582c308f77bc584a003dc0701d8c06003329589ade652babe5edd2
-AUX 1.8.1-parallel-build.patch 261 BLAKE2B 71e639f976d1c1893f7e3285cecda841f4c90b1c2a153edda527c47804df8821a14a3c340544a9e0860fb4047af2772f036c0e10380b4025b4538e40082046b2 SHA512 e06ca32ffd811897859ef7bf06f3b7998eaa56c7fcbb01f971ec32b6e75c4242e3a2ed5a1bdaa28c02bae08bfbb386d65ebed3e50e2de759d056f085f1f49c1f
+DIST commoncpp2-1.8.1-patches-r1.txz 7144 BLAKE2B 0d464810afc9aab2b198495789ecfe4c84fab9edf33f85523dc711602a2f1c08c24a5c2cd7fd92ef799e049624159eb373a2accff193ddec1413fc9aa4450a4e SHA512 d8df95b0963a47c7049fe80b21dadd004f0d4a4498139d629dcc65034211e58e2dffa5e2e6ab61eba10b265f2737eb6a78c0c92b6ec13ae50ab5826bf6e4d68b
 DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
-EBUILD commoncpp2-1.8.1-r4.ebuild 1539 BLAKE2B 8aabbad57624f37806a75f3db758d1903d28b8746feedf30a500cd77e9f2dc9e7a8bf866e8437d3075bf6e2c72844b522cd1a9da66af07a876a48952ba99ec5f SHA512 0ceccc0a461b7874e01f340a39e4c061df3b006e8f173f79b23547e950208625c9f921556ad64d48fc0a65484c10faec88bc35bcc6bb3c7b18d983586157ca12
+EBUILD commoncpp2-1.8.1-r4.ebuild 1713 BLAKE2B e6bf4767e589130b96818d591b3a1f4066ebdc91a80d3d1f9ba5e6b6785c530983382b44e0a7a551fe844139380b544f84d36843d4850a822c09e3449579d171 SHA512 ffbc4c155cd686869b743a15ac57ee5da44cd09a2bfa5de9969d3bc7c2346b6f312dcfd164dd9d1ff4bc15f47073db71eb23bb5bba2d81c8b1d710ff665b6c83
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
index aaa9e49a4ed9..399a2c7ed176 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
@@ -7,12 +7,14 @@ inherit autotools
 
 DESCRIPTION="C++ library offering portable support for system-related services"
 HOMEPAGE="https://www.gnu.org/software/commoncpp/"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+SRC_URI="
+	mirror://gnu/commoncpp/${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches-r1.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples gnutls ipv6 ssl static-libs"
+IUSE="debug doc examples gnutls ipv6 ssl"
 
 RDEPEND="
 	sys-libs/zlib:=
@@ -25,19 +27,21 @@ RDEPEND="
 			dev-libs/openssl:0=
 		)
 	)"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.3.6 )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.3.6 )"
 
 PATCHES=(
-	"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
-	"${FILESDIR}/1.8.0-glibc212.patch"
-	"${FILESDIR}/1.8.1-autoconf-update.patch"
-	"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
-	"${FILESDIR}/1.8.1-parallel-build.patch"
-	"${FILESDIR}/1.8.1-libgcrypt.patch"
-	"${FILESDIR}/1.8.1-fix-c++14.patch"
-	"${FILESDIR}/1.8.1-gnutls-3.4.patch"
-	"${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012
+	"${WORKDIR}"/patches/1.8.1-configure_detect_netfilter.patch
+	"${WORKDIR}"/patches/1.8.1-glibc212.patch
+	"${WORKDIR}"/patches/1.8.1-autoconf-update.patch
+	"${WORKDIR}"/patches/1.8.1-fix-buffer-overflow.patch
+	"${WORKDIR}"/patches/1.8.1-parallel-build.patch
+	"${WORKDIR}"/patches/1.8.1-libgcrypt.patch
+	"${WORKDIR}"/patches/1.8.1-fix-c++14.patch
+	"${WORKDIR}"/patches/1.8.1-gnutls-3.4.patch
+	"${WORKDIR}"/patches/1.8.1-fix-gcc9.patch
+	"${WORKDIR}"/patches/1.8.1-c++17.patch
+	"${WORKDIR}"/patches/1.8.1-openssl-1.1.patch
 )
 
 src_prepare() {
@@ -47,19 +51,19 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable debug) \
 		$(use_with ipv6) \
 		$(use_with ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable static-libs static) \
 		$(use_with doc doxygen)
 }
 
 src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
+	use doc && HTML_DOCS=( doc/html/. )
 	default
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc COPYING.addendum
 
diff --git a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch b/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch
deleted file mode 100644
index 5132554aea1c..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/334135
-
---- a/src/applog.cpp
-+++ b/src/applog.cpp
-@@ -44,6 +44,7 @@
- #include <cstdio>
- #include <stdarg.h>
- #include <errno.h>
-+#include <sys/stat.h>
- 
- // TODO sc: test if has to move up now that it is into commoncpp
- // NOTE: the order of inclusion is important do not move following include line
diff --git a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
deleted file mode 100644
index c64ba2f65fa9..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
--AC_INIT(src/thread.cpp)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/thread.cpp])
- AC_CONFIG_MACRO_DIR([m4])
- m4_pattern_allow(LT_VERSION)
- 
-@@ -81,17 +82,17 @@
- AC_SUBST(ccincludedir)
- 
- AC_CONFIG_AUX_DIR(autoconf)
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET
- AC_PROG_CPP
- AC_PROG_CC
- AC_PROG_CXXCPP
- AC_PROG_CXX
- OST_PROG_CC_POSIX
- NP_PROG_MSC
--AC_LIBTOOL_WIN32_DLL
--AM_PROG_LIBTOOL
-+
-+LT_INIT([win32-dll,disable-static])
- AM_INIT_AUTOMAKE(commoncpp2, [$VERSION])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- AC_C_RESTRICT
- AC_C_VOLATILE
-@@ -395,10 +396,11 @@
- #endif
- 
- ])
--
-+AC_ARG_WITH([doxygen],
-+    AS_HELP_STRING([--without-doxygen], [Do not build documentation]))
- AC_PATH_PROG(DOXYGEN, doxygen, no)
- AC_SUBST(DOXYGEN)
--AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
-+AM_CONDITIONAL([DOXY], [test "x$with_doxygen" != "xno"])
- 
- AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"])
- 
-@@ -408,10 +410,11 @@
- AC_SUBST(LIB_VERSION)
- AC_SUBST(LIB_MAJOR)
- 
--AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
-+AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
- src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile
- doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile
- commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj])
-+AC_OUTPUT
- 
- # if test ! -f inc/cc++/thread.h ; then
- #   cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi
diff --git a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
deleted file mode 100644
index b6ebf0e0f4a4..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4
-index bd9db7c..122c938 100644
---- a/m4/ost_socket.m4
-+++ b/m4/ost_socket.m4
-@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[
-                 AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
-                     [#ifdef HAVE_LIMITS_H
-                     #include <limits.h>
-+                    #endif
-+                    #ifdef HAVE_NETINET_IN_H
-+                    #include <netinet/in.h>
-                     #endif])
-                 if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
-                    [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
deleted file mode 100644
index e68b00576cdb..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/inaddr.cpp b/src/inaddr.cpp
-index 5a4b9c4..50127f3 100644
---- a/src/inaddr.cpp
-+++ b/src/inaddr.cpp
-@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host)
-             if(ipaddr)
-                 delete[] ipaddr;
-             ipaddr = new struct in_addr[1];
--            memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
-+            memset((void *)&ipaddr[0], 0, sizeof(*ipaddr));
-             return;
-         }
- 
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch
deleted file mode 100644
index cc921060b303..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix building with C++14, which errors out due changed noexcept()
-semantics for dtors caught by -Werror=terminate.
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595422
-
---- a/src/nat.cpp
-+++ b/src/nat.cpp
-@@ -145,11 +145,11 @@
-     "nat lookup successful",
-     "nat address not in table",
-     "nat not supported/implemented",
--    "unable to open device "NAT_DEVICE,
-+    "unable to open device " NAT_DEVICE,
-     "unable to get socket name",
-     "unable to get peer name",
-     "unable to get socket type",
--    "unable to lookup, nat "NAT_SYSCALL" failed",
-+    "unable to lookup, nat " NAT_SYSCALL " failed",
-     "unkown nat error code"
- };
- 
---- a/src/socket.cpp
-+++ b/src/socket.cpp
-@@ -2971,12 +2971,7 @@
- 
- TCPStream::~TCPStream()
- {
--#ifdef  CCXX_EXCEPTIONS
--        try { endStream(); }
--        catch( ... ) { if ( ! std::uncaught_exception()) throw;};
--#else
--        endStream();
--#endif
-+    endStream();
- }
- 
- #ifdef  HAVE_GETADDRINFO
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -441,12 +441,7 @@
- 
- SSLStream::~SSLStream()
- {
--#ifdef  CCXX_EXCEPTIONS
--    try { endStream(); }
--    catch( ...) { if ( ! std::uncaught_exception()) throw;};
--#else
-     endStream();
--#endif
- }
- 
- #ifdef  CCXX_NAMESPACES
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
deleted file mode 100644
index 795e44178c64..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/686012
-In file included from ../inc/cc++/thread.h:50,
-                 from thread.cpp:41:
-../inc/cc++/string.h:734:35: error: friend declaration of ‘std::istream& getline(std::istream&, ost::String&, char, size_t)’ specifies default arguments and isn’t a definition [-fpermissive]
-  734 |     friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
-      |                                   ^~~~~~~
-
---- a/inc/cc++/string.h
-+++ b/inc/cc++/string.h
-@@ -58,6 +58,9 @@
- 
- class MemPager;
- 
-+class String;
-+__EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
-+
- /**
-  * This is a generic and portable string class.  It uses optimized
-  * memory allocation strategies to efficiently handle smaller string
-@@ -731,7 +734,7 @@
-      * @param delim deliminator to use.
-      * @param size optional size limitor.
-      */
--    friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
-+    friend std::istream &getline(std::istream &is, String &str, char delim, size_t size);
- 
-     /**
-      * Stream the content of our string variable directly to a C++
diff --git a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch b/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch
deleted file mode 100644
index b7365b822065..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ba702b6034444c2e30b0990d06e28bb2dea8ecb7 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Mar 2017 01:36:23 +0200
-Subject: [PATCH] ssl: support gnutls-3.4
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/ssl.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/ssl.cpp b/src/ssl.cpp
-index 5bf526d..38ef0a7 100644
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -344,9 +344,6 @@ ssize_t SSLStream::readData(void *target, size_t size, char separator, timeout_t
- #ifdef  CCXX_GNUTLS
- bool SSLStream::getSession(void)
- {
--        const int cert_priority[3] =
--        {GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0};
--
-     if(ssl)
-         return true;
- 
-@@ -362,7 +359,7 @@ bool SSLStream::getSession(void)
- 
-     gnutls_set_default_priority(ssl->session);
-     gnutls_certificate_allocate_credentials(&ssl->xcred);
--    gnutls_certificate_type_set_priority(ssl->session, cert_priority);
-+    gnutls_priority_set_direct(ssl->session, "NORMAL:+CTYPE-OPENPGP", NULL);
-     gnutls_credentials_set(ssl->session, GNUTLS_CRD_CERTIFICATE, ssl->xcred);
-     gnutls_transport_set_ptr(ssl->session, (gnutls_transport_ptr)so);
-     if(gnutls_handshake(ssl->session)) {
--- 
-2.10.2
-
diff --git a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch b/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch
deleted file mode 100644
index 08e24e1a06a9..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -99,35 +99,7 @@
-     return 0;
- }
- 
--extern "C" {
--    static int _wrap_mutex_init(void **priv)
--    {
--        return _gcry_mutex_init((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_destroy(void **priv)
--    {
--        return _gcry_mutex_destroy((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_lock(void **priv)
--    {
--        return _gcry_mutex_lock((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_unlock(void **priv)
--    {
--        return _gcry_mutex_unlock((Mutex **)(priv));
--    }
--
--    static struct gcry_thread_cbs _gcry_threads =
--    {
--        GCRY_THREAD_OPTION_PTHREAD, NULL,
--        _wrap_mutex_init, _wrap_mutex_destroy,
--        _wrap_mutex_lock, _wrap_mutex_unlock
--    };
--
--};
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
- 
- #endif
- 
-@@ -135,7 +107,7 @@
- public:
-     _ssl_global() {
- #ifndef WIN32
--        gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads);
-+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
- #endif
-         gnutls_global_init();
-     }
diff --git a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch b/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
deleted file mode 100644
index 149677ca89b4..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -47,6 +47,7 @@
- 
- if EXTRAS
- libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
-+libccext2_la_DEPENDENCIES = libccgnu2.la
- libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
- 
- if GETOPT_LONG
-
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 53dd18988bff..5799775f68e1 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index 660351ff5f42..e1e393936861 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,3 +1,4 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
+EBUILD boxfort-0.0.1_pre20200902-r1.ebuild 957 BLAKE2B 4ca8a524daaa3d23813577c5d4e48c339bb4abc2adc261e9f4a125df3aecb439b2f60402a7d419655bcd630cb8dc77c516dc263f19a5e9f4520b2e6429e85459 SHA512 b67ca37a55d1bbcc1057937d5b84ed96af12644f4afe8a3ddf9a7a995a13670c88c328361dd9d817ae2ec28e4b9fd55f28eac38d084013aec2803748b0f6cd96
 EBUILD boxfort-0.0.1_pre20200902.ebuild 955 BLAKE2B e2bb6d346fdd0287d95b370035067b320720105e6c082d98fa28552df6339fd3b00323ebe531bdcc30d551bf8ced1d87c5e80d029ec67f9d49469ee0fe31c4bf SHA512 fc62cf164a55fce91e97b8cab102951ff33d51ea2f19bcfcbf28d400a29a7d3059dc17d27770b00704c5271b2c6c48e41dae8e86597c5dc1f45c11e707d3a5f8
 MISC metadata.xml 492 BLAKE2B 01ab25ee5881fb36b9218d2f88695e4c690cb1573c2d23efa8a4c0783f96142ae24c81e1c98af8ddb55ee5f1e03cb31ab9f3e8bd8b19ebea2b7465c3cf1798c4 SHA512 4b3eee55c730d06c5e041143900ac4dc2753c4327f92441896563359cc1e5d46aadbcc6c54a5f12d67cc4a2b5ee688cb30722ef67b71a26625878398cf3539c1
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
new file mode 100644
index 000000000000..18bce1975ded
--- /dev/null
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson python-any-r1
+
+BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
+
+DESCRIPTION="Convenient & cross-platform sandboxing C library"
+HOMEPAGE="https://github.com/Snaipe/BoxFort"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
+
+python_check_deps() {
+	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 362bf73b06ac..275f511fc280 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,3 +1,4 @@
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
+EBUILD cereal-1.3.0-r1.ebuild 815 BLAKE2B 8ca410517b7d8f92e4d0fc8c534fbc1bf6d20790c3842b1323d11df7afa657c3c89e891efd51bf20a2af3b7278fc97493285f87490e9b8598e745cee4e351d77 SHA512 e44bb348fbded83fe7a5277570a0bc4ccc7558d11fdca65df216140fb51b548e0a814e77dfecd8b5e00dcb1df237bc06449d2b08059207fcecad5efebfd6ff04
 EBUILD cereal-1.3.0.ebuild 553 BLAKE2B ae9b5d7897c871ef8f67495e0162f1fd5c88abb03eb146c17321d49b53454d5369725a80bf421a75a60b977aaa5eb98007f4fce258a83f1b45e7f3c0099abf52 SHA512 9d6f822c803d6da65184219b0644b1f6941824ecc67de12c6325be3e6391bdce32826f993de434ac7ab690579956bb6c2f6688c54b5db4511856c1686f96e618
-MISC metadata.xml 246 BLAKE2B 5b5665b0dd02a1ffcb5fa8c1c1ad30d32b6996e772f2d5418b3c705fe6514e26c27ff8c09c7d64ac7bf3223600c0d97a652c54cfbc98fa12c952ed01da6f85cc SHA512 11bd994e7a2b931824521a66ee32e85fa73e75d7aa3207d9b24ffca4e698c0e5e3100291710afa0d4e8b6e4d4529dd4ecdafa3827cd05761dd6b60c4c3b9820c
+MISC metadata.xml 394 BLAKE2B 436d9bbaeb57804831437da0632e3902af16aa36f0bacfc162a3b5f45c74a96f35997fc18ad0a204b0150dad1f9897953fe9a5f39eb22c2d67a00835cf4fbb5b SHA512 9fb5069ca3081f9fe590e8af3c925cd4ced1a945d7357ecb6debeff5635404d3dc98c6cc4583724206b78a0438eca3dbddb2df917441dd1e2d7f61350de560bf
diff --git a/dev-libs/cereal/cereal-1.3.0-r1.ebuild b/dev-libs/cereal/cereal-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..c14fc8b906f6
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only C++11 serialization library"
+HOMEPAGE="https://uscilab.github.io/cereal/"
+SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+
+src_prepare() {
+	sed -i -e '/set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")/d' CMakeLists.txt || die
+
+	if ! use doc ; then
+		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJUST_INSTALL_CEREAL=$(usex !test)
+		-DWITH_WERROR=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/cereal/metadata.xml b/dev-libs/cereal/metadata.xml
index 907c95a13f45..b739f14cee13 100644
--- a/dev-libs/cereal/metadata.xml
+++ b/dev-libs/cereal/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+		<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:usc:cereal</remote-id>
 		<remote-id type="github">USCiLab/cereal</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 43eac4827f0a..459568ba6375 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,7 +1,10 @@
 AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
 DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
+DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
+DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
 EBUILD criterion-2.4_pre20200110.ebuild 1936 BLAKE2B 188447cc2878f4933ef220f7b5282a35c3e47c1d38fe32fe8fe509d5a6e8a76626f3d7d1e8caaa4114ca962981a300e0cc3b66f33c3099698bb06014d5254533 SHA512 313dd311531830f92952874e5c0a712a5d55b18816f6681c919d71db6a2eadcee9c927f6ef646afc8c35ede0fa6c20d79716f408347992e233dd149e6fba3e48
+EBUILD criterion-2.4_pre20210114.ebuild 1929 BLAKE2B 15da10459a48a1d720d4c7ffbdbbe3489ab851d8a537e42a63342391d1d21a7994c64b3b728b9ec52d7fe8b7b96a8d4ff01a7c4ae8265ba57fe9c8459eb93bd2 SHA512 d2b23b09dba767caed1c9ce2e06b0c2894a2a28c3ef94473d37e4cfebbb92b578f322f0e02dae6c61c78f654e86d63e741568f03aaa08b50c15cbe61134dd1a4
 MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
new file mode 100644
index 000000000000..2a210335a427
--- /dev/null
+++ b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson python-any-r1
+
+CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712"
+DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
+KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
+NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc"
+
+DESCRIPTION="Cross platform unit testing framework for C and C++"
+HOMEPAGE="https://github.com/Snaipe/Criterion"
+SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
+	https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
+	https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
+	https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
+
+LICENSE="BSD-2 MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/nanomsg:=
+	dev-libs/libgit2:=
+	dev-libs/libffi:="
+DEPEND="${RDEPEND}
+	dev-libs/boxfort
+	test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
+)
+
+python_check_deps() {
+	has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	rm -r dependencies/{debugbreak,klib} || die
+	mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
+	mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
+	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 245ce819bb30..3ac96b1fe53f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -17,6 +17,6 @@ DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862f
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 EBUILD libxml2-2.9.12-r2.ebuild 6944 BLAKE2B 52a117d89831d0fb07eccc94bfba0e28444c5704cdbd476fe3cc8a0ac886f02ef63b0a7c8ff53ef371db422827c3527811b8f7709e60b40cb8aa548eedde9e41 SHA512 62b49df2388d217dcfa8a2e2c013869ffd4ea86569ebe6a6b7855f6c6c9d067606a03b8bb9f1147063ec9881560c8f5851cb925372d0140f9d4bd6b8e6da4021
-EBUILD libxml2-2.9.12-r3.ebuild 7099 BLAKE2B 94c2334599571ecaf9f0e348f62871fab7eb1156d3f746403ecce488c4611697437cdf83bfb4fd709b483f95eda61c774cb8886e14e2bc6b7d3e69aebcc4269c SHA512 83945cf8b255f3c952540fb1a9ea05c7a2c0a1f68ac51b9de0321e018c3e21f185939735a6bbc40fe0cf4673809bb59afb756998990dcbacdb27117d9309ca56
+EBUILD libxml2-2.9.12-r3.ebuild 7098 BLAKE2B 610470493d1cbfb4094e1c8c2466fde0aeb9026b29c31d6f2790ca99c90361017a4e857b82e9340c6402554ca024383c08c165ebc8ab3aa54a368420a9bfeba0 SHA512 707f7efa06e4440be182a8ed3e16ace92c5869c272ebde85d14f9209fcf935375324ae0989b7a192b0dec57ca582696de4355c89aa7f8a3a75fefbadaa9b0805
 EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
index 39a7586055ae..824b111956af 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-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"
+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="debug examples icu ipv6 lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index a5c91a72016d..ec89e2561cb6 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,4 +1,3 @@
-AUX nss-pem-1.0.5-nss-3.53.1-support.patch 5005 BLAKE2B 4cacfbc965c5c5add442e8a37a1c4ad5c567763aeec7ab567c7558fd4b343cfeeec952a5d4c5131f279d3a7794b753ba424c27398263d4b03751a7308eda118c SHA512 8a19a7831d92e45f101ca44e278b319bfd3884d4eb17ec268ca08ed08542ecf51f81be23079e30d5b87aaa467f4104c88d739043aa3c36989540a69a23f4ae13
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.7.ebuild 702 BLAKE2B 410d9a2f78d5966dd5f26deba58716e841608cad779c9284fd77af7d0f0a0c76d5dfeea998237cca2130b2e955cc54a26e874534abef0f7c89571ebbef049a68 SHA512 11e2af21ddffc0f5266508e99d6c5881fd3d08d2c7edb68ea00c739fff075d2f26fdcf6a677fba2f60905d9c722acd6ec6bc2c92099b4398bd4b938c7f0e5495
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch b/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch
deleted file mode 100644
index 10cfd2cd0228..000000000000
--- a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From e14d5b53ad588e45b2bcffb778563daf2fead5df Mon Sep 17 00:00:00 2001
-From: Ian Kumlien <ian.kumlien@gmail.com>
-Date: Fri, 7 Aug 2020 15:57:17 +0200
-Subject: [PATCH] replace deprecated CK?_NETSCAPE_? constants
-
-... with the corresponding CK?_NSS_? constants
-
-Fixes: https://github.com/kdudka/nss-pem/issues/6
-Closes: https://github.com/kdudka/nss-pem/pull/7
----
- pfind.c   | 16 ++++++++--------
- pinst.c   |  8 ++++----
- pobject.c | 10 +++++-----
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/pfind.c b/pfind.c
-index 83d5b89..fa5dd4d 100644
---- a/pfind.c
-+++ b/pfind.c
-@@ -276,18 +276,18 @@ collect_objects(CK_ATTRIBUTE_PTR pTemplate,
-         type = pemBareKey;
-         plog("CKO_PRIVATE_KEY\n");
-         break;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         type = pemTrust;
--        plog("CKO_NETSCAPE_TRUST\n");
-+        plog("CKO_NSS_TRUST\n");
-         break;
--    case CKO_NETSCAPE_CRL:
--        plog("CKO_NETSCAPE_CRL\n");
-+    case CKO_NSS_CRL:
-+        plog("CKO_NSS_CRL\n");
-         goto done;
--    case CKO_NETSCAPE_SMIME:
--        plog("CKO_NETSCAPE_SMIME\n");
-+    case CKO_NSS_SMIME:
-+        plog("CKO_NSS_SMIME\n");
-         goto done;
--    case CKO_NETSCAPE_BUILTIN_ROOT_LIST:
--        plog("CKO_NETSCAPE_BUILTIN_ROOT_LIST\n");
-+    case CKO_NSS_BUILTIN_ROOT_LIST:
-+        plog("CKO_NSS_BUILTIN_ROOT_LIST\n");
-         goto done;
-     case CK_INVALID_HANDLE:
-         type = pemAll; /* look through all objectclasses - ignore the type field */
-diff --git a/pinst.c b/pinst.c
-index ef2d955..564458e 100644
---- a/pinst.c
-+++ b/pinst.c
-@@ -236,7 +236,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
-         /* more unique nicknames - https://bugzilla.redhat.com/689031#c66 */
-         nickname = filename;
-         break;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         plog("Creating trust nick %s id %ld in slot %ld\n", nickname, objid, slotID);
-         memset(&o->u.trust, 0, sizeof(o->u.trust));
-         break;
-@@ -265,7 +265,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
- 
-     switch (objClass) {
-     case CKO_CERTIFICATE:
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len,
-                                         &issuer, &serial, &derSN, &subject,
-                                         &valid, &subjkey))
-@@ -344,7 +344,7 @@ derEncodingsMatch(CK_OBJECT_CLASS objClass, pemInternalObject * obj,
- 
-     switch (objClass) {
-     case CKO_CERTIFICATE:
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         result = SECITEM_CompareItem(obj->derCert, certDER);
-         break;
- 
-@@ -497,7 +497,7 @@ AddCertificate(char *certfile, char *keyfile, PRBool cacert,
-                                    nickname, 0, slotID, NULL);
-             if (o != NULL) {
-                 /* Add the CA trust object */
--                o = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL,
-+                o = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust, objs[i], NULL,
-                                        nickname, 0, slotID, NULL);
-             }
-             if (o == NULL) {
-diff --git a/pobject.c b/pobject.c
-index f613678..a97f3e2 100644
---- a/pobject.c
-+++ b/pobject.c
-@@ -149,8 +149,8 @@ static const CK_KEY_TYPE ckk_rsa = CKK_RSA;
- static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
- static const CK_OBJECT_CLASS cko_private_key = CKO_PRIVATE_KEY;
- static const CK_OBJECT_CLASS cko_public_key = CKO_PUBLIC_KEY;
--static const CK_OBJECT_CLASS cko_trust = CKO_NETSCAPE_TRUST;
--static const CK_TRUST ckt_netscape_trusted = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-+static const CK_OBJECT_CLASS cko_trust = CKO_NSS_TRUST;
-+static const CK_TRUST ckt_netscape_trusted = CKT_NSS_TRUSTED_DELEGATOR;
- static const NSSItem pem_trueItem = {
-     (void *) &ck_true, (PRUint32) sizeof(CK_BBOOL)
- };
-@@ -578,7 +578,7 @@ pem_FetchAttribute
-         return pem_FetchCertAttribute(io, type);
-     case CKO_PRIVATE_KEY:
-         return pem_FetchPrivKeyAttribute(io, type, pError);
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         return pem_FetchTrustAttribute(io, type);
-     case CKO_PUBLIC_KEY:
-         return pem_FetchPubKeyAttribute(io, type);
-@@ -775,7 +775,7 @@ pem_mdObject_GetAttributeCount
-         return pubKeyAttrsCount;
-     case CKO_PRIVATE_KEY:
-         return privKeyAttrsCount;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         return trustAttrsCount;
-     default:
-         break;
-@@ -1168,7 +1168,7 @@ pem_CreateObject
-                 if (listItem->io != NULL) {
-                     /* Add the trust object */
-                     APPEND_LIST_ITEM(listItem);
--                    listItem->io = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust,
-+                    listItem->io = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust,
-                                                     derlist[c], NULL, nickname, 0,
-                                                      slotID, NULL);
-                 }
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 32bb9501d5b5..b0d37cf7278a 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
-EBUILD tree-sitter-0.19.5.ebuild 757 BLAKE2B 6e35d71a61461094f1b1f5b9973d9439b33dd9b46e31bc9fc454b0f9b1fbb9daac0052cf627e38f4fc6758419ffe7348b1d65969a21d0aebfdb7ebacbc17ffef SHA512 ecbf7f58b06040a0a6a27eeb1e31fa8a1ada430d31effd07b8c67079ef71f23b43133ac255e9149869e4352b9d569e6fd825eac7f5c052cd71ed899c8faa60dc
+EBUILD tree-sitter-0.19.5.ebuild 763 BLAKE2B 500cce0afffaef886e181be47fd55efe177d665440e897cd4b26be097e25f4b5a7f62f6d4c98c4c1c842aaa3ae0b36b73802fe542a8fd3e18e4109c8da98950e SHA512 35f228535e4d29cdefc9d8933b2009107d6e0472872b517ab354c3c87ca7fc060fa7cfbf7943cd843e279f3840973388ebf12ee6aada52b167aa89417605a3c6
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
index ac77081630dd..60833984005b 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 2cd4f0a4064a..7c19a0518649 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,13 +1,3 @@
-AUX tvision-2.1.0_pre2-asneeded.patch 1908 BLAKE2B 7a3013155d762b9e49ab91ceec8ac1eb4dc6b9217b80feda8e2f93d9927882b36796ea7b73b4bb65a57f07308cfb2c9a23652b0567c271788f96be12b1aa7b7b SHA512 673532f787496598498a179b6a59518e6e24bc63d45223b42660592e27afb37f0bb8102c7f791b645d1e809f9ffcdf065db580a683b8119fa574e3ada978b2f1
-AUX tvision-2.1.0_pre2-build-system.patch 1102 BLAKE2B 61f600f1922a4e969392c2b8770c7e291af0f4c8aef08f07d5e3206384babebc7d6bc0d7aad2a42cab4c882f64e4eb109c3f4c27c70005c1ea10238636cb80d0 SHA512 5459a69aeb70fff0832a9b24c80020ef63c535e942a8767888509f7a3e6ae8dd845a4d81a36d0be9335ec9dd7cbeb688fbb315737c9d748e1d0be66a46f20ede
-AUX tvision-2.1.0_pre2-flags.patch 335 BLAKE2B 972dd44183334619e24d25ccb9f9301088a9e539883a2d7ae42bc90d04f1f7d50d364cdeca7ff08979e1e9d369e09643e4567fe23fbd0a31c2866f35dd9201fd SHA512 3537bf54649dee2eb1b245c446ffdd07e1123f08724567ccbab008a5df9fd8c93e47e654ef7da35199fa05e032a731dc4b777bd35685b8aa756ed5541a773588
-AUX tvision-2.1.0_pre2-gcc41.patch 265 BLAKE2B 9e5ef9db210048f15f103e664762d7df3aec7a2c2e05a91ff2d95187407b3551eab2a7ec48f44878b40c8dd09023115a469c2443555ddfa951534c391f4a2fc8 SHA512 89b6130c6e62c55b8c6f0b380672cc5e305e2f6eedc3b4cd3bd511e0959727aa7445c5999dbc3fbc9d651ed67620600d56f40e3701c8d649f7d12bf1e0a0f4d9
-AUX tvision-2.1.0_pre2-gcc44.patch 438 BLAKE2B ad2f7400b9f6683862b67c2558010984c4e627caad6eaf775160d8f6015aea23681fefd1b6611d6a25fca75ef347bfc3b03a9c4efe86eaa15ffc9e848df38f30 SHA512 203181e2e110e93fa082cf351333e6b662bd2236fa3aeafe546cc83edd5e8ae639769fa3e60350d1d7f5466b82db840e313c3637c7f5e5c414f8638127ac14d4
-AUX tvision-2.1.0_pre2-gcc6.patch 4891 BLAKE2B 674ddaebc2d4fa35debd319627d862c152b491106c6fcec0cc8d4d09896e13362fda099a5541e2b68b4c27cfd46f607717bfa8d3500b5dec891aba3ea730010e SHA512 cba8d6f16e10e8821be6c255ae156760030c725dda279537180ac66ae2dfdee28aa286c2a93653b77f666ddc28ad3e4440b9f58449f81d5d8f2dbfb0060964f1
-AUX tvision-2.1.0_pre2-ldconfig.patch 522 BLAKE2B 459dd4941159ca23027339e812a0c21ffc81a10ff1afdb136f6d8ab9ca819f25120ec0172386140b1e8f15258507831903ec5232c108e784c87b2416f14686b8 SHA512 d54daf2946007f43a4777571e89cc4670fd0124f28d82471de7d4010a84878fd08923e952e9cca9b08938b45e1e367e268c967f1afd12c25f50cac75e591fcf4
-AUX tvision-2.1.0_pre2-outb.patch 954 BLAKE2B c0cf973c3d83008106b96ad2b1658a2b50891c88a9ce81091a65db9b98818fc6fbef105604b78101e2fd84e217eca17a18b21797876a119ab293ef986467f03f SHA512 bb9cf5ac414f02d008aac345299d1a0701103bc044e637cdf4be5181fabcc7c4851ee6d569f91d86a8c9ff1134e32db36f3efaf5242e528b091c029a489d1fd7
-AUX tvision-2.1.0_pre2-perl-INC.patch 680 BLAKE2B e525daf089b00cd22338dd483394591c12be634b3d825a22706b31aff25a46c119bf662c808f74267f2b9f465551b230b7753d816e23934e57ee087f5dbafe9c SHA512 007d2a8738a918e455685b50ed148b5a0b43c64c53c1674826771f4b3510706161e81477f82f1cf123d52fee123c649446644be9a78dbf6966650e3bf51db1f3
-AUX tvision-2.1.0_pre2-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
 AUX tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch 1267 BLAKE2B 3e0e09562052ff2830fefc9ded095f7693de0e92290aebb8317327261968cbc055dd908e60b46aecc6705e64974aa4921ad4e00bfa744e8f11fd838044053fb5 SHA512 83f50ecb6ee9f1eeb2599c46764257c8931fc6f6d8daac3b9f0ab28de25931718c90fdae4d52ef042dd42cacd3f5946c55697760ed35939e4ca5d6f0d0a9d516
 AUX tvision-2.2.1.4-build-system.patch 1119 BLAKE2B 98d594371ba91cb70acb8865b1817c4cfa4563bd7965d4079357ccdab2c679f584677f209275e9a4851b31cca0de7ca2ca1688d523970704a3cc126620b4df59 SHA512 60b239c4f2c6a5c3ca00e5f6c29293f92ebb5f00e6dcfc709bee986a1960a01cb77c542921c2e02c576ef9ffc2a7a600534997d8c2a6e5d691ae2825b38b161d
 AUX tvision-2.2.1.4-fix-dot-INC.patch 675 BLAKE2B 8fd53d6e384b5cd71a2850fa0d80fdcd4544f1462d21cbfeb0cd5056ed23f5892d5f97d4f5fca7d8a86757ae171aae19fb689df98927f8ae0acac2d351e92e5f SHA512 49ab191bb74388d1cb6fd31c825b924dccfee5e9a85a55e86c2df50c5a186f78e6112b3fc0dde361f481ea7daea5b9b656aaa93ebbaccb80bcf146d460efda7d
@@ -15,8 +5,9 @@ AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214
 AUX tvision-2.2.1.4-flags.patch 392 BLAKE2B 8124537533a9a9e6568dec6aebdae766f05b1c59f7bbfbb34f8096ce0c4b61e9e5f0a70f525505592fe57c41ee61c8e31db1cd5e6fad5c977c73649c6b4f9b8e SHA512 8b3ccdf1dd49d436d9ebb05ee69081ca0abfb6b1dc6b41042788ef7b0c1328cbcf67788837577897d2e2485b41aaf620d789b39b33a0f82d442a263508f52017
 AUX tvision-2.2.1.4-gcc6.patch 1108 BLAKE2B 7a99bd2aa759d7995fa1bd0afd93c4b1a329d764f9dfff47796a997079718d90eeabe71e09046a6801644fcbf04caa05c955225a3fc77a0f031cad6d6ccc45e8 SHA512 05f55ad5f99107419bac22226b82dd2f94ec673e2c10e9872b59d47a42c7ab12e0f36c30bb1d019b15c8c07d8f5ebe2cf7637d42ca271d34c2042bb259fab3af
 AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5bb25d68e5c9ad8d09c2fd16ca6e7a5c52c1febc2e8547b4f3444339f806415a396cccd140db1df10de6a3dbdb6ebff0f SHA512 92c867111f4f528da29ff612c72c90d77709eb46c587b5759f2bc69392d538a6c25ed2d54b8fe7eca0cd3b167a7db0c50de94e88f2107f7527884d15485c1a3f
-DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
+AUX tvision-2.2.3-0001-use-proper-AR.patch 622 BLAKE2B e95e94946361f3f32058318603dd863ca14620d4dcebcf9e0a2335afcaed221bf7dceaff2f210d4d928a9c9afa514ba2e3e9f43730d5a28aa098a9cd67845511 SHA512 aca74659cf17f614178cbcdc6f6161ed46d7f6dbbcd0166f9f4697bce63a8547bdf3d9a615483071616911665e8c2a154e7116388d8b0c2c64c8ca08b3b62bcb
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
-EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
+DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3 SHA512 96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030
 EBUILD tvision-2.2.1.4.ebuild 1591 BLAKE2B 25dfa8ba53fc2bf40e717daa4e502820ea2609fb2ea96d170c79acff33ff640c1242d3b98593ca9abc22026ec9bbd7162f12e4f65cb8a73f500f35bb4954945e SHA512 d090aa5a123d4b81ffacbaa14ec6dea5f728196afc185abc076c3ff288b5a3db9e1f788999f89ec124ce6d5130b12a2e4b5c03970c507d8e353b03110a864d67
-MISC metadata.xml 584 BLAKE2B 9e0a46f70886d90423d03dbacca6f561f72aca282cbbead51e61a78632d93b444caf1d4485f0cdc1a3c8ef6069e0da7f04fc9eb152a0f630f8ed745e2347e11e SHA512 5c47abf240f67aa4eac6aafb2d1ca26bd494ffb8eb3ecaa6c989939cf201707ca50be9244abda468cb17391d4d8acc287a6676f4fbd565587cea446d51da4bb1
+EBUILD tvision-2.2.3.ebuild 1696 BLAKE2B 1f59386adba13f4083bc84b19dd68f469ebeeb6069862ccb363fb633219bd48337c040f3076b8709b9974b749b68e102c586a690ed2de81d5acafa3c2401af76 SHA512 9894629043baf8046153d6ce042418e8b2ce28beb5e70b24cb1bba28f5c2eb0ca95cad03795e8e45ad33ccb6fbcad1e05103b35195a2259ef0a83df76d6a83dc
+MISC metadata.xml 480 BLAKE2B dae64ea0d83b95289c108bd2b7d6bebd3d715e528ac3805306855962df76fa3e30192776d344443c25b874d739753a963fa9074d302b26b19c697ee743ba6562 SHA512 b55cef1bf47c4254ecc1461f246e5f3548bce7ebd449bf62f08574a5c27394bc9cfa8affa948ff63d14f815bd7ac41e6d78780a1b94b77d52d28541e2ddfc88a
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
deleted file mode 100644
index 314ab225f051..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -206,6 +206,7 @@
-   }
- # Flags to link as a dynamic lib
- $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
-+$MakeDefsRHIDE[7]='RHIDE_LIBS=';
- if ($OS eq 'UNIX')
-   {
-    if ($OSf ne 'Darwin')
-@@ -229,15 +230,15 @@
-      }
-    $libs=$conf{'X11Lib'};
-    $libs=~s/(\S+)/-l$1/g;
--   $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
-+   $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
--   $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
-+   $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
--   $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
-+   $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
--   $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
-+   $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
--   $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
-+   $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
--   $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-+   $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-   }
--$MakeDefsRHIDE[7]="LIB_VER=$Version";
-+$MakeDefsRHIDE[8]="LIB_VER=$Version";
--$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
-+$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
- 
- ModifyMakefiles('intl/dummy/Makefile');
- CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
---- tvision/makes/common.imk
-+++ tvision/makes/common.imk
-@@ -54,7 +54,7 @@
- C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
- 	$(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE)  \
--	$(OBJFILES)
-+	$(OBJFILES) $(addprefix -l,$(RHIDE_OS_LIBS))
- else
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
- 	$(ALL_PREREQ)
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
deleted file mode 100644
index 8ba26208948a..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-index 8b78ba3..92aa570 100644
---- a/config.pl
-+++ b/config.pl
-@@ -1111,7 +1111,7 @@ sub GenerateMakefile
-     $rep.="\t\$(MAKE) prefix=\$(prefix) -C intl\n";
-    }
-  $text=~s/\@target_rules\@/$rep/g;
-- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
-+ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
-  $rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
-  $rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
-  $text=~s/\@intl_dummy_rule\@/$rep/g;
-@@ -1196,7 +1196,7 @@ sub GenerateMakefile
-    }
-  if ($internac)
-    {
--    $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
-+    $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
-    }
-  $text=~s/\@install_rules\@/$rep/g;
- 
-@@ -1216,7 +1216,7 @@ sub GenerateMakefile
-  $rep.="\trm -f intl/dummy/*.lo\n";
-  $rep.="\trm -f intl/dummy/*.a\n";
-  $rep.="\t-\$(MAKE) -C examples clean\n";
-- $rep.="\t-\$(MAKE) -C intl clean\n";
-+ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
-  $rep.="\trm -f configure.cache\n";
-  $rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
-  $text=~s/\@clean\@/$rep/g;
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
deleted file mode 100644
index e74b09ee57d0..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/Makefile.in
-+++ tvision/Makefile.in
-@@ -31,7 +31,7 @@ examples:
- 	$(MAKE) -C examples
- 
- rhtv-config$(EXE_EXT): rhtv-config.c include/tv/configtv.h
--	@GCC@ -o rhtv-config$(EXE_EXT) -Iinclude rhtv-config.c
-+	@GCC@ -o rhtv-config$(EXE_EXT) $(CFLAGS) $(LDFLAGS) -Iinclude rhtv-config.c
- 
- install-headers:
- 	@install_headers@
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
deleted file mode 100644
index 36246b214f99..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/include/tv/inputln.h
-+++ tvision/include/tv/inputln.h
-@@ -201,7 +201,7 @@
-      { return name; }
- 
- protected:
-- TInputLine::TInputLine(StreamableInit) :
-+ TInputLine(StreamableInit) :
-    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
- 
- public:
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
deleted file mode 100644
index 40911f3a3e29..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tvision/classes/ipstream.cc
-+++ tvision/classes/ipstream.cc
-@@ -19,6 +19,7 @@
-  *
-  */
- #include <assert.h>
-+#include <stdio.h>
- #define Uses_string
- #define Uses_TStreamable
- #define Uses_TStreamableClass
---- tvision/include/tv/textdev.h
-+++ tvision/include/tv/textdev.h
-@@ -16,6 +16,8 @@
- #if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
- #define __TTextDevice
- 
-+#include <stdio.h>
-+
- class TRect;
- class TScrollBar;
- 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
deleted file mode 100644
index 8570bb04222e..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Fix gcc-6 compilation errors; bug 594176
-
---- a/classes/tdesktop.cc
-+++ b/classes/tdesktop.cc
-@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
- #define Uses_TVCodePage
- #include <tv.h>
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
-     createBackground( cBackground )
- {
---- a/classes/tdisplay.cc
-+++ b/classes/tdisplay.cc
-@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes.
- #define Uses_TVCodePage
- #include <tv.h>
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- // Remove me please!
- int TDisplay::dual_display=0;
- 
---- a/classes/tvtext1.cc
-+++ b/classes/tvtext1.cc
-@@ -110,8 +110,8 @@
- char TCheckBoxes::button[] = " [ ] ";
- char TCheckBoxes::obutton[] = " [ ] ";
- 
--TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178};
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178};
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178};
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178};
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178};
- 
---- a/classes/x11/x11src.cc
-+++ b/classes/x11/x11src.cc
-@@ -94,6 +94,10 @@
-  #define TIMER_ALARM SIGALRM
- #endif
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32;
- const int cursorDelay=300000;
- 
-@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor,
-        TScreenX11::leftPtr;
- char   TScreenX11::busyCursorMap[]=
- {
-- 0xff, 0xff, 0xff, 0x1f,
-- 0xfd, 0xff, 0xff, 0x1f,
-- 0xf9, 0xff, 0xff, 0x1f,
-- 0xf1, 0xff, 0xff, 0x1f,
-- 0xe1, 0x7f, 0xc0, 0x1f,
-- 0xc1, 0x7f, 0xc0, 0x1f,
-- 0x81, 0x3f, 0x80, 0x1f,
-- 0x01, 0x9f, 0x3b, 0x1f,
-- 0x01, 0xce, 0x7b, 0x1e,
-- 0xc1, 0xef, 0xfb, 0x1e,
-- 0xc9, 0xef, 0xf1, 0x18,
-- 0x9d, 0xef, 0xf1, 0x18,
-- 0x9f, 0xef, 0xfe, 0x18,
-- 0x3f, 0x6f, 0xff, 0x1e,
-- 0x3f, 0xcf, 0x7f, 0x1e,
-- 0xff, 0x9f, 0x3f, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0xff, 0xff, 0x1f
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f,
-+ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e,
-+ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e,
-+ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18,
-+ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e,
-+ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e,
-+ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f
- };
- char TScreenX11::busyCursorMask[]=
- {
-- 0xfc, 0xff, 0xff, 0x1f,
-- 0xf8, 0xff, 0xff, 0x1f,
-- 0xf0, 0xff, 0xff, 0x1f,
-- 0xe0, 0x3f, 0x80, 0x1f,
-- 0xc0, 0x3f, 0x80, 0x1f,
-- 0x80, 0x3f, 0x80, 0x1f,
-- 0x00, 0x1f, 0x00, 0x1f,
-- 0x00, 0x0e, 0x00, 0x1e,
-- 0x00, 0x04, 0x00, 0x1c,
-- 0x00, 0x04, 0x00, 0x10,
-- 0x80, 0x07, 0x00, 0x10,
-- 0x08, 0x07, 0x00, 0x10,
-- 0x0c, 0x07, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x1c,
-- 0x3f, 0x0f, 0x00, 0x1e,
-- 0xff, 0x1f, 0x00, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f
-+ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x1c,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x10,
-+ (char)0x80, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x08, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x0c, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c,
-+ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e,
-+ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f
- };
- 
- /* This is the function which creates cursors. On success it return
-
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
deleted file mode 100644
index 6d7d94fe8a0d..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -1193,12 +1193,6 @@
-     $rep.="\t".GenInstallFiles('0644',"$makeDir/$ver",'$(libdir)');
-     $stripDebug=($OSf eq 'Darwin') ? '-S' : '--strip-debug';
-     $rep.="\tstrip $stripDebug \$(libdir)/$ver\n" unless $conf{'debugInfo'} eq 'yes';
--    # FreeBSD: merge data from libdir.
--    # Darwin: doesn't have ldconfig.
--    if ($OSf ne 'Darwin')
--      {
--       $rep.=($OSf eq 'FreeBSD') ? "\t-ldconfig -m \$(libdir)\n" : "\t-ldconfig\n";
--      }
-    }
-  if ($internac)
-    {
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
deleted file mode 100644
index 0735f8ffeb77..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Recent kernel headers no longer provide asm/io.h.
-
---- tvision/classes/linux/linuxdis.cc
-+++ tvision/classes/linux/linuxdis.cc
-@@ -300,7 +300,11 @@
- *****************************************************************************/
- 
- #ifdef h386LowLevel
-+#if HAVE_OUTB_IN_SYS
-+#include <sys/io.h>
-+#else
- #include <asm/io.h>
-+#endif
- 
- static inline
- unsigned char I(unsigned char i)
---- tvision/classes/linux/linuxscr.cc
-+++ tvision/classes/linux/linuxscr.cc
-@@ -123,7 +123,11 @@
- #include <tv/linux/log.h>
- 
- #ifdef h386LowLevel
-+ #if HAVE_OUTB_IN_SYS
-+ #include <sys/io.h>
-+ #else
-  #include <asm/io.h>
-+ #endif
- #endif
- 
- // What a hell is that?!
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -77,7 +77,7 @@
-    # glibc I use but the fact is that the needed tricks make it very Linux
-    # dependent.
-    LookForPThread() if $OSf eq 'Linux';
--   #LookForOutB();
-+   LookForOutB();
-   }
- if ($Compf eq 'Cygwin')
-   {# Cygwin incorporates a XFree86 port
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
deleted file mode 100644
index 8a559bde5ccf..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/config.pl b/config.pl
-index 53a7b50..784676b 100644
---- a/config.pl
-+++ b/config.pl
-@@ -5,8 +5,8 @@
- # To specify the compilation flags define the CFLAGS environment variable.
- #
- 
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
- 
- # If the script is newer discard the cache.
- #GetCache() unless (-M 'config.pl' < -M 'configure.cache');
-diff --git a/confignt.pl b/confignt.pl
-index e185f49..9ff7ae6 100644
---- a/confignt.pl
-+++ b/confignt.pl
-@@ -3,8 +3,8 @@
- # see copyrigh file for details
- #
- 
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
- 
- SeeCommandLine();
- 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
deleted file mode 100644
index d693a359a6cf..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug #160591; fixes a buffer underflow.
-Reported by B Douglas Hilton <b.d.hilton@verizon.net>
-
---- tvision/classes/ttermina.cc
-+++ tvision/classes/ttermina.cc
-@@ -233,7 +233,7 @@
-          }
-       }
-    }
-- while (pos-->=queBack);
-+ while (pos-->queBack);
- 
-  return queBack;
- }
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
new file mode 100644
index 000000000000..ce45ec32ef5e
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
@@ -0,0 +1,23 @@
+From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 14 Jun 2021 17:48:45 +0200
+Subject: [PATCH 2/2] use proper AR
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ intl/dummy/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8..d47e185 100644
+--- a/intl/dummy/Makefile
++++ b/intl/dummy/Makefile
+@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
+ CC=$(RHIDE_GCC)
+ 
+ libtvfintl.a: intldummy.o
+-	ar -rv libtvfintl.a intldummy.o
++	$(AR) -rv libtvfintl.a intldummy.o
+-- 
+2.32.0
+
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 9bf7fccc56e8..74ce76bd57bf 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -9,11 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="gpm">
-			Support text mode mouse through <pkg>sys-libs/gpm</pkg>
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">set-soft/tvision</remote-id>
 	</upstream>
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
deleted file mode 100644
index 0990426185ec..000000000000
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Text User Interface that implements the well known CUA widgets"
-HOMEPAGE="http://tvision.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DOCS=( readme.txt THANKS TODO )
-
-HTML_DOCS=( www-site/. )
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc41.patch"
-	"${FILESDIR}/${P}-outb.patch"
-	"${FILESDIR}/${P}-underflow.patch"
-	"${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-ldconfig.patch"
-	"${FILESDIR}/${P}-flags.patch"
-	"${FILESDIR}/${P}-gcc6.patch" # bug #594176
-	"${FILESDIR}/${P}-build-system.patch" # for EAPI=6
-	"${FILESDIR}/${P}-perl-INC.patch" # dot-in-INC
-)
-
-src_prepare() {
-	# Strip hunk from invalid characters for gcc6.patch
-	sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \
-		-e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \
-		-i classes/tvtext1.cc || die
-	default
-}
-
-src_configure() {
-	./configure --fhs || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		prefix="\${DESTDIR}/usr" \
-		libdir="\$(prefix)/$(get_libdir)"
-
-	einstalldocs
-	dosym rhtvision /usr/include/tvision
-}
diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild
new file mode 100644
index 000000000000..28c667ecd8dd
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="rh${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="https://github.com/set-soft/${PN}/releases/download/v${PV}/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nls"
+
+DOCS=( readme.txt THANKS TODO )
+HTML_DOCS=( www-site/. )
+
+RDEPEND="
+	dev-libs/libbsd
+	media-libs/allegro:0[X]
+	sys-apps/util-linux
+	sys-libs/gpm
+	sys-libs/ncurses:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libxcb:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1.4-flags.patch
+	"${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
+	"${FILESDIR}"/${P}-0001-use-proper-AR.patch
+)
+
+src_configure() {
+	tc-export CC CXX AR
+
+	local myconf=()
+	myconf+=(
+		--fhs
+		--prefix="${EPREFIX}/usr"
+		--with-pthread
+		--without-static
+		--x-include="${EPREFIX}/usr/include/X11"
+	)
+
+	use nls || myconf+=( --no-intl )
+
+	# Note: Do not use econf here, this isn't an autoconf configure script,
+	# but a perl based script which simply calls config.pl
+	einfo "Running ./configure ${myconf[@]}"
+	./configure ${myconf[@]} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		prefix="\${DESTDIR}${EPREFIX}/usr" \
+		libdir="\$(prefix)/$(get_libdir)"
+
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r examples/*
+	fi
+}
diff --git a/dev-perl/App-Cmd/App-Cmd-0.333.0.ebuild b/dev-perl/App-Cmd/App-Cmd-0.333.0.ebuild
index 5ae0a2f94573..0006586693cf 100644
--- a/dev-perl/App-Cmd/App-Cmd-0.333.0.ebuild
+++ b/dev-perl/App-Cmd/App-Cmd-0.333.0.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="Write command line apps with less suffering"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/App-Cmd/Manifest b/dev-perl/App-Cmd/Manifest
index f103a8dadfb1..348180229edf 100644
--- a/dev-perl/App-Cmd/Manifest
+++ b/dev-perl/App-Cmd/Manifest
@@ -1,5 +1,5 @@
 DIST App-Cmd-0.331.tar.gz 48848 BLAKE2B 84a5958879505499cb826a82cbda675a67dd4421378a3a7bb7943f39e68c414ceb5dddc9cf5000e0164f1553cb74d82f1c9f8f980c71a52811933d89c3282dc2 SHA512 cb5f4515417affc46e48aa0cfecc37b2856a35081f1e1a4197a1ef020de69a5d0ba19bc54be6c84f239147e8dbfb538e7b8ea760431a2d0f4b369684e4ea42c6
 DIST App-Cmd-0.333.tar.gz 49657 BLAKE2B 8958299e26083845eb6ea00f00b6629c823245d652a08b9ddd72a42da3f421dd7d5c1d6a667d2537dd1305ba9ff8eff19689d6810aeb308b616c62d50a4a57de SHA512 59b8526cc6efa29e9f5eafce1d9adbc9c706314aa8e7265d7be2c0c57210384a7bcfc2ef5650d36d9715a5da96a829a9a75524a5bed58c21eac1d35f286ef765
 EBUILD App-Cmd-0.331.0.ebuild 1142 BLAKE2B f9f9e12537efc65b43a4687efe72814b00ed3c272496200624bf70687a69ae2f85ecc4e5f04ea6fc5221304a74334244997c2871f20a8f18bec8299451482ed8 SHA512 37e55c6a1e7b6753e0c03ee63f8243776a48267c1a22231fde615a532649aeac174798daa3bb8bba4c15ed523353bd792c8b006dfeb47eda1076eb9fbd28d035
-EBUILD App-Cmd-0.333.0.ebuild 1143 BLAKE2B cba1d1503796f3a98752fe8602380ac53341917dc379d1b691c79844d12efc971c4cfa1fd48164ad874a853e8ee9a375e358cb1d0b1a63bb304354e5101988cb SHA512 b690345b07d0a7ac5737f0e98141b0873d755447515785f4949782f9eb52c7f523e714b990a34b8c673a938983d7b29ff1346b8f8c055fed28108de322f6b7e1
+EBUILD App-Cmd-0.333.0.ebuild 1142 BLAKE2B 01b867b67b5d74d20e223ab30171dfeda8f3300faaeb414bd99030d619df2542df954192f41899474b34b616bb925347a2ff271d6dcf3cb0f991f3680bc1c986 SHA512 c47dc57db36b71ba9eb5a0b1ea87184ace497bc6cc6b2ae1aa41fc371b493a4b94abb807d062dbaf7e4f4ebd5fc595aebebcdf5ad4cd2747861c53fe4177ea3d
 MISC metadata.xml 1358 BLAKE2B 6cdd36de69b0ed5e3571c24d9200036d60308ba019f29561cde6f3b8a19fa79943fcc773f9642fe4a686227c8bddf386296c0e3c8c0195e553c97dd1eb39b798 SHA512 fd2c12634efad7dfcf0329d8785d9e8dcb3d9de2e2db1a168611ab2bae8149d4a665cd88ea1789695b2e7b2241299ae7e4af0045ffa3975035c2d364c488a7a7
diff --git a/dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild b/dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild
index ef302ebbb046..7de90096d048 100644
--- a/dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild
+++ b/dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.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
@@ -12,7 +12,7 @@ DESCRIPTION="API wrapper around the 'tar' utility"
 LICENSE="GPL-3+"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Archive-Tar-Wrapper/Manifest b/dev-perl/Archive-Tar-Wrapper/Manifest
index b71a88ef0927..f2a0e11146aa 100644
--- a/dev-perl/Archive-Tar-Wrapper/Manifest
+++ b/dev-perl/Archive-Tar-Wrapper/Manifest
@@ -1,3 +1,3 @@
 DIST Archive-Tar-Wrapper-0.38.tar.gz 38425 BLAKE2B 5e280837241da9481418905ed5e29110f6574845be4a82afd712ab4a2f100389e74b81afb1b5f61fa2e7938e58cfa345883c134026cbb2662e24a9acb912c8b0 SHA512 99779c654f6f9ec507685ca37c041cdff077bce3b6ec96a6005454e9ef8a9c2bf470053b8fc751342d80b722ee115b1aba27b16b328e7210c7b869bee57cd3f6
-EBUILD Archive-Tar-Wrapper-0.380.0.ebuild 648 BLAKE2B 03638243d0bb5939ab4c76139ee1c910aac141604819608ed096548e49050dd95b60387adb973a6e17ffd1259b1c7337445ba734de91b81dfae97d30ea3ee6f0 SHA512 680b5bb113bd56f50d3163f470f24e9eb7aa84546215907813d651423d449378906333ad9ad106012371b20f9bf063d010f184cf68f5966e5e28f4db894f8256
+EBUILD Archive-Tar-Wrapper-0.380.0.ebuild 647 BLAKE2B 578bff6e9402ad33bfd9ba62a881360e9a3009d82040d7f4b4885e8b6f32277bcdfc8009f848ed3891faec9a4b5e7983d1974c666a126ee317813aa07162fd37 SHA512 26562cf3bdf625dc4f6ba87806ae756e0bfb766461d81adf1dc2b219e1e2ddf79a8edf04a3552169e25831f97181d96935b1021e5542e1a1e0539f0ce4e90d14
 MISC metadata.xml 411 BLAKE2B 371fff2afdf9e4e21454670ed9452d331a9526834c1c2689ac542a405003d096863247a81b47123bb2a34e5ded070ca6c523b1bfd1f1e2a232af2ea08dd93946 SHA512 a24bc660c069c2d19ee9b54a2620217d506f8541ebb2133878d6c1f17c193bd838dd736210de4ebc36787b0e88654fe721a125ff749c218529c707133b32a9f7
diff --git a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.15.ebuild b/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.15.ebuild
index c9d11b743e62..41c6ea8ee0f9 100644
--- a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.15.ebuild
+++ b/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.15.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
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="upload things to the CPAN"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CPAN-Uploader/Manifest b/dev-perl/CPAN-Uploader/Manifest
index 50548ebcc18a..588c0c416279 100644
--- a/dev-perl/CPAN-Uploader/Manifest
+++ b/dev-perl/CPAN-Uploader/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Uploader-0.103015.tar.gz 21615 BLAKE2B 63d576c6a57f7a28bee4ab4b2d5ed1b52d97edd6518b5eab8c7d932ebfa99ccd6b67d8c3c50ad2fd175a910bfafd203e30f3f35ddb185bf390d2ff839eabac71 SHA512 f4204c2b9caf98b50e4551b1eb68f1a8144b42b129539b4bcd71508e3df93b41219b3f323f01ac35d86d9d81ed14fbfccf4a77266296c62cdec44b268f512ed4
-EBUILD CPAN-Uploader-0.103.15.ebuild 900 BLAKE2B 01a1f28263c1e860a390143ab7609a19c739387afc39b0f52980a84b807c1a19b4bfcb0ba7f229ce85132cd98edcaac50d091f2db41af3cdb56bd888327576b4 SHA512 2804d126eb2b576eea0d25b0c2f3e56e1b633a0faa0d76b88c6776308bb9ce9df337d09c2669a7dbbc756c11ba9bf343c02407b8cb98eedcc020f93f0a606eb4
+EBUILD CPAN-Uploader-0.103.15.ebuild 899 BLAKE2B 58d5788edc48170cf2da68d83e717775def833c697a9e42b1aecdeff49396e046f58e83da3ea5f1b5eb0b1e2bd8fd7aaf8247660d68bbf8bd3ba5acccbf97e97 SHA512 1c82bb03f036eaf44ac56068a715454c52d4720d031df3a539eaf648cd47853f2fbb6e0f16bc1ec1f746fb40cdd7b863b605fe822c6db5ea104d3a396a1dcd5e
 MISC metadata.xml 398 BLAKE2B feb7c968153fec9cadca6c5973834b28161e94d0d4cbc062d1e5b65af914c1edcf2fbc731d5b6c2c264e3ac4eae748519a420c107e0777cc4553a5ed0bd2a6eb SHA512 07efe44d7a1e13c7678d188f012188cb8d5a0bae599a6d8b98ff881f7b99a1d6956c09053f4a345acddbddfad813e3e7aee6a352ce8b918ee5a03ff37481ce43
diff --git a/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild b/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
index c83252a04b60..ae3528e6ffdb 100644
--- a/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
+++ b/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Choose appropriate clone utility"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clone-Choose/Manifest b/dev-perl/Clone-Choose/Manifest
index 1a723754884b..47ddeed18487 100644
--- a/dev-perl/Clone-Choose/Manifest
+++ b/dev-perl/Clone-Choose/Manifest
@@ -1,3 +1,3 @@
 DIST Clone-Choose-0.010.tar.gz 10828 BLAKE2B 0a07211af1f1be7370520eb55f0bb663fa4c02642cbbcc20643137e719eade61e59548119cd79fc1442c85cad07840bbf08eb782a0b2ca433dff4f0bfdd0d327 SHA512 5dbcd1b031ddbdaff81c46c5a48eb51b31bfe451e0777dc88a107d2b104e8708f08a5717a0f82f4d03efb8610e2b42fcb2dc1269e3262ece16b9a503d606face
-EBUILD Clone-Choose-0.10.0.ebuild 519 BLAKE2B fd45126f31396ae0ef3f99a7b0fc37abcd120e2171c7c6063822fa19c258b61850cba2ab862c0338948b944beb873da5c86fcb43dc1039de0baa609535023fd8 SHA512 814417a598a6c35f4ef48fccb98c7622f41a8102a7c5f4c04e0bb4ac55e4dd62edf3826fb70bb9ccce278eddbe66042f2c0351be8afa29f7db676d71e9a08009
+EBUILD Clone-Choose-0.10.0.ebuild 525 BLAKE2B b36cf69c94f32535b0e056a282f5dff8cf20e6c24ae88633a6d2b4a52b07b73eb824eb1d234f8e2894b90d114c2bfab8c472b8090c9b7a4cb848f11208f83c01 SHA512 dc3cff203afd943889cf74f43c9b3791009eaa5c5b1372602f5d945490b0d5cd64bbb823d2b312046f7170888c006e35a2198129eec633a10efa426177ade798
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild b/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
index ba9243d9dbf4..3bd13cd8a207 100644
--- a/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
+++ b/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clone-PP/Manifest b/dev-perl/Clone-PP/Manifest
index e0c1a54b0512..9ddc1198e496 100644
--- a/dev-perl/Clone-PP/Manifest
+++ b/dev-perl/Clone-PP/Manifest
@@ -1,5 +1,5 @@
 DIST Clone-PP-1.07.tar.gz 9508 BLAKE2B 864239679a7af4362a01b3f250e073daf3751c07de8768793a3d5c0517a4035216eccc69d76b25ec1669b71a799196129f459ff18bd7232922ff8fa23de6e46b SHA512 28faae5dc42ff5ae850fe9f664dca8b52ff77823c5f157c62c52254fa4f1e217d3344f6e79a2ddad169f934e7be262dc79f32e885cb1d25db182050800ac805a
 DIST Clone-PP-1.08.tar.gz 9527 BLAKE2B ff93f777bc235146ce137c470931ee30422d72a45154bec22b3ef7d377d6f3ddc5af39feba41d89a76ff52ff9f8e5c0c5c0efc9d620d80e4d77392b9aa130b97 SHA512 912898b0617597429a08a6b2717aec75ee9c3f41e2c05512f434a9cb82dad3274b4dbbc4332725248d7c6071eec670e6977c05994cef090df6f591cdfe2f606c
 EBUILD Clone-PP-1.70.0.ebuild 433 BLAKE2B da280e1fff380e39e31ebf163185abeef26ae9f4ab4e6e752ea148dec926ad0b9ea4e9191de02839ee2c68620bfbed6828ef410bcc13db8f682c7a43c3191780 SHA512 bcf0e99fd91c7125a711554fd88fd19f21a1f11479ed828877ca923aae4ab1b9e27eb33560671010edf3b0ad2370c8f6b5db49ba46cc022bfabb51d4d6627080
-EBUILD Clone-PP-1.80.0.ebuild 442 BLAKE2B d4908463ac1ebfb91047677fedd4c5cfc2dfe64b609affac49cb9d5985d03ca105d74a05995fbbe3bbb017145a1e65c664005b449ab93b7cbc555d7c3b1a78cd SHA512 d9e3019bae1b21cb4bcd7af7b81006ca403906b6887788777ee469845b1f5b7666374579a613f11cd40b47035eba122b9f6089f487c9a28856d5f6300263bcda
+EBUILD Clone-PP-1.80.0.ebuild 448 BLAKE2B 99c8238a8d158f4281c056f99017e7e368f10004deec3d359e265958e6894b60f1c883c57ee4a5a592382756ef04458ee28fc8d8f11471ad6115b28e1e35f89b SHA512 bc4aee4e7c4920e32c4dcf173532aa6b90c48aaafef79d1f44aa5e0ed4363d94e61dcaf5ace8cf1eceadcfa9228192962842bd3143211aa57af668055aafa951
 MISC metadata.xml 519 BLAKE2B 2155021673b48902ba1044f0777a79eef87e791a9cfedf3f3fe06aa095e31fc7ec2ed4c4b8735e8bafe7ad4c2910ff8ac6a8065535c1a31a9af86e85386aa25f SHA512 4388a52e4a68f4851549956ebab0a12749e6f0f2d8f0650027755d711c8be7a6cf870da3cb8da8a49f09261a224ab837eeb3354f7002985ba8b42caba4574c9c
diff --git a/dev-perl/Config-INI/Config-INI-0.25.0.ebuild b/dev-perl/Config-INI/Config-INI-0.25.0.ebuild
index 701b3689afd3..dcd22ad2cc7e 100644
--- a/dev-perl/Config-INI/Config-INI-0.25.0.ebuild
+++ b/dev-perl/Config-INI/Config-INI-0.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="simple .ini-file format"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-INI/Manifest b/dev-perl/Config-INI/Manifest
index 79fef65ce2e2..37fa665fa69c 100644
--- a/dev-perl/Config-INI/Manifest
+++ b/dev-perl/Config-INI/Manifest
@@ -1,3 +1,3 @@
 DIST Config-INI-0.025.tar.gz 25405 BLAKE2B b1ea45c20d93c57490373ef5a3ba63c14d3a69cbc51121a05211067b059e08cdf77354eb866e2bbfc066036b57043dd58debc6f3e7380a8cd01b7feb5ccef69f SHA512 2831e2611409c1f09029b37e56bcbc875051cf9ac5e458f38fbac29a3e48665f49ea9ac66519eeee71e9b52b2c702507eb801c518a8417bbf0806270b0bc4155
-EBUILD Config-INI-0.25.0.ebuild 681 BLAKE2B cd3dd16a6db5c478459ca2c91a97e5da72b0826c3648033187e917e95c99cdc57745759218104bd92826978f5e06e54af3669990489eb1250ad45273fd8598ce SHA512 68ea9dcfb30f34906221f9647b20ae8d27db1377c2f076b09eb5f12bc9e1f8198466053d18171b74b37de3dea1e6acfb0926555fd533a249c09264ffba7c07cd
+EBUILD Config-INI-0.25.0.ebuild 680 BLAKE2B 7b99a48d003f7d886f1b0ffaeb698b19e9b9ac8c5a4eed76144c7cd226acc88dc15386e951d12e85e868ebaa3fb133447f10c272e4a1b4be59671f324c92fdc1 SHA512 e9122044ed8b58d2cbc8b182dc7060c78a2591c479f3a6a59cf9c18afc270b574ad58f9cfde2d5666fbc46b26d7269cb8fb8e47f2049bbe89fe1ed9af598b4a3
 MISC metadata.xml 524 BLAKE2B 2ba6794507f247c58b6f450799f5d031b661d2961100ebe3604cee66b07a1451fe1939c93ca369f4f0becee8d5b73feabf6902b67790294d5b92e04926bfce95 SHA512 9fd46c38b7a5aad329844d60c6526608a8beaf6753142bbaef16b3d994957ee747ebd5c5c069b39174c2f8b8767caf1f60d2384aa52ad4420e56fb9a68ab0aa1
diff --git a/dev-perl/Config-MVP/Config-MVP-2.200.12.ebuild b/dev-perl/Config-MVP/Config-MVP-2.200.12.ebuild
index fe983d273149..fafeb9091b3b 100644
--- a/dev-perl/Config-MVP/Config-MVP-2.200.12.ebuild
+++ b/dev-perl/Config-MVP/Config-MVP-2.200.12.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="multivalue-property package-oriented configuration"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-MVP/Manifest b/dev-perl/Config-MVP/Manifest
index 43ccc9588abb..1a924ca5183c 100644
--- a/dev-perl/Config-MVP/Manifest
+++ b/dev-perl/Config-MVP/Manifest
@@ -1,5 +1,5 @@
 DIST Config-MVP-2.200011.tar.gz 33387 BLAKE2B cd57bc21b3106ee991dcaf07017a41dbec4453bc98b823820f431d86101ed0c0a0814a8617c37b3df1bf1a264ff07a184fedc94920c68946837e3852076b0f92 SHA512 8e4c178b355a5e4ef4a1d7f8b304a1411f19f6ca601e6ab6593b0b3e9002f7f5ba64eb49714bc155741651dc501b87296e2fc4a3388e7616efdd4dd893866606
 DIST Config-MVP-2.200012.tar.gz 34232 BLAKE2B 89a99cfc6b9c79abbca4ee2d8874bc77be4190c62cf30cd92acdac3ec2eab609acb3492a4bdf465b6a7caeaaaa56f17ca936257ac22876a9babeacef804383f9 SHA512 1da64c93c0298dc9a25b289632ee59e61de0640d545049505825353c1f7c88e039fc09d4037e13bc51c27bea3f10fdca542eea2f15ef9e4694e5dd0d565ef414
 EBUILD Config-MVP-2.200.11.ebuild 1097 BLAKE2B ed8a4aa634c898c30e6d5e23bb8ac74fc7e32b60827e250c8aa2b8907149ed55694fda55560eb3ed30628137a2c7ca1ca6babd32e7347b710d6cd6e30cb28d6d SHA512 bd447399e64818371737947f12be16850dd94fcc84c673edc67c296aee0b2e5b58b2348bc30977c4ab7853ff26682fba8ce8f8c41fc39a68e458e7d2be9fc7c7
-EBUILD Config-MVP-2.200.12.ebuild 1097 BLAKE2B 621698792604141484709e3ce5e38282352ada1a48cb2258d1fd9becde9284eb05afa9d1db4be4dc637a7105a2a2e27c7f0bad685bf1414e301e664f11ed4cf7 SHA512 0950fd3b7eaf317c95e70d9f997d31ba745c4083056a5e786ecd2039f5909dff209cc7d14d5bad8654951709e6702761b37256fd94cf97322f5105dc21fec236
+EBUILD Config-MVP-2.200.12.ebuild 1096 BLAKE2B c958238da480d8f0b4fc03a67222015fe61630dfb32444ee0fe2b2fd60c6bd5be98991b14a647e35ff12751d99585b9d7c16d580b32a69890d8e7300b12d1fd8 SHA512 25c577cd8afe16054a755fe389f6360a997a3c4f9616b7c4427b045b669d9b5fadf06851ce46c08a5c9fab609b98d67a32654776e41c02b61c1cac530b58f7ed
 MISC metadata.xml 1120 BLAKE2B 907f79c0e2bd0f6d98f0b29c6142e89560a33417cde5ce0c2a4b9c0c0d65aeab720cbd8775bec33df54635c4a25cd6e70306759118d732420abd1a793ed75c8f SHA512 5dbdd3e476561f08efd747c14edf5353ee9d8edd3ae50830167aa47f1d2498350dffe4eecc0fb6b9d79031f668b43865c3f25bcb7aba8ecf5ab4d63be64a7729
diff --git a/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild b/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
index c33bbcc4bf64..2ef0dcde0a29 100644
--- a/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
+++ b/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Merges arbitrarily deep hashes into a single hash"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Hash-Merge/Manifest b/dev-perl/Hash-Merge/Manifest
index 195720fdc2de..3ff4b5303cab 100644
--- a/dev-perl/Hash-Merge/Manifest
+++ b/dev-perl/Hash-Merge/Manifest
@@ -1,5 +1,5 @@
 DIST Hash-Merge-0.200.tar.gz 10339 BLAKE2B fd9107148f815c3eb86fc4fffd75eaf1a939e5cfea79f00e373e5f03985cb654ae7c8a9d5cde74bf7fd6bf5866995c9c62c2724b01fd0dcc9e73891efbd18524 SHA512 b04f5229f70630d5a1552dcff83743d4c053bfd8b7b294fb03b21f2e7c12b6540a39e6c93fe016960686e1e9107dc0507d15406247da827fb608bc273e53eeec
 DIST Hash-Merge-0.302.tar.gz 14151 BLAKE2B 04dc202b8ca48cfbd3446f2b1172cd5b5f39b4d19afdda5c2793a1c028a1501bf861aebdf51537b23c4644530c31a0e74fe4f10ba5ebff7d952df38a8cd11df7 SHA512 ac07e1154541b5d9a7fc2f126927a7d86d49ebb2ec4f5439c4f21178d0986d78f2f8f17ab5e6b692cfe8dec63a5c36afbe07b16492a983e13b33247c0789bc47
 EBUILD Hash-Merge-0.200.0.ebuild 367 BLAKE2B 37c6ec8caf4041b5db6e9d78dc395af6ca2e1fcfa3c94616cdd8bbf24eefe64e588bf40b3b4a64d61b4bd842fd789f68cadf3aa589f7b19d542bff37a7d35f72 SHA512 9cbac5a96185c6bbbfd9acec8c9cf6d9e4659a9d55fc1086cffb8f3002c7386f82716ad3be5d82f0c2e197a30f5b6fa94f50dbcd24737abe7f398bc9f5674921
-EBUILD Hash-Merge-0.302.0.ebuild 521 BLAKE2B 0a7d9c0873793f5b6dd7cf57a941b0ca7b8e004ca4d30fdcf785b6adbafd66ace96cd8401e7bbf7c10256c23879cf084572f5e7af58dee4cd7c23526776e8257 SHA512 b57767ae21a5dc39c703ef693062213737f2a9ec9d75f4066362065d1f362c2b8f55e03696245bef99c658170aec8d437bdd1e74165e12151451d1a3ee4addae
+EBUILD Hash-Merge-0.302.0.ebuild 527 BLAKE2B c4cefeab33ecbeb8ffdeee016dfbefb007db846a0644b391467a10bf9e4d0fc71b123b913070e391072214906f6d88049848445722581a880341ad4134a0267b SHA512 e2fdb67bed87a28fe281716cc750d56ac0bc8794562d2666503828a476a9801318806b26edbfdb4adf8025af874504eab694720ec4354183dbd3d888ae287f35
 MISC metadata.xml 392 BLAKE2B 2ef942afae800b73aaf0c86100b5f377a476cbe3f463a7aea1222fa9595fa637621d60239a05d17d39313e2e1070bdf7fd3df4e036e66d8de2fe194b08713fad SHA512 9dd968dc56b4203ba2aa012e0d5743341c60f5c837552369ae657ce4eff9fea485db7bc5410c2d4b61eb9ddfb060e05665281dbc1bfe43e3a2d4ddc34ff3bbc9
diff --git a/dev-perl/IO-TieCombine/IO-TieCombine-1.5.0.ebuild b/dev-perl/IO-TieCombine/IO-TieCombine-1.5.0.ebuild
index 6ebe241d7d61..1399cbfdd570 100644
--- a/dev-perl/IO-TieCombine/IO-TieCombine-1.5.0.ebuild
+++ b/dev-perl/IO-TieCombine/IO-TieCombine-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="produce tied (and other) separate but combined variables"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/IO-TieCombine/Manifest b/dev-perl/IO-TieCombine/Manifest
index a79e396abb07..256734ef12f6 100644
--- a/dev-perl/IO-TieCombine/Manifest
+++ b/dev-perl/IO-TieCombine/Manifest
@@ -1,3 +1,3 @@
 DIST IO-TieCombine-1.005.tar.gz 16863 BLAKE2B 3b8df2fe711ea59ded531236c41f581898c9af16bff3a6688159b3fc54e6a23ffbe8effb533a50f2311a1cdf9849f50abb4635fd818198476827d9ddbcf46612 SHA512 d0de091279d13e0421e5e0c901a994760cc2f427a1a05305d947f94feb2c040728bcd738965eb583b2c57481fdc474a5516660457069b19f30695962f56cfecf
-EBUILD IO-TieCombine-1.5.0.ebuild 495 BLAKE2B 9e4dbbebf70362a95da2a41059817339025fbc29c42cf77e44eb0cf34c6c0b5da5f9b39ac9b0fb96d194061247fb41510a537195bdd3188e66de45c1589cab45 SHA512 a411255f5141424f4f098662f901f3d627e13ca3f7e854ef315ecba31aa7d170dda22a5da88c96513ba333c43013c0f3f4e6886f22ce74960c82d4cc6137cf9e
+EBUILD IO-TieCombine-1.5.0.ebuild 494 BLAKE2B c7dea0c32847b6a29dd009a11a4f1819845d61c072656432fc35903280ed7bc984603be7349e82c049034f6c69599638d20bd250e2cd4f21b8dc5da1f3f31e6b SHA512 3524fb364a068d96d7fbe81f97d81e8b7f5f9a67a6f39952de98f9484811d903176d4e6b48a2face14030a9b20b97e777afd744b1a4add4f56d3db5a769e762d
 MISC metadata.xml 536 BLAKE2B 3c046e26f148dfe09df7f753e2a302d46bc7333010ffa7cf217b8f3b9d6c7797e05e40cfabeb77abdbfaf929ed6dd412d9e8396924ff724ff703f9ed737286ae SHA512 95506cd667eef3b03f6475d62aeca1d828061bbe667d248a4ca797ad9e455c6a55c53c5a2e7e1004c5f758758cc02360f783002209c0bdc0b770e38fad9b1973
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 6d4e63612ce0..8b51248379f7 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Mixin-Linewise/Manifest b/dev-perl/Mixin-Linewise/Manifest
index c182b6fe8a27..9eeaf1de403e 100644
--- a/dev-perl/Mixin-Linewise/Manifest
+++ b/dev-perl/Mixin-Linewise/Manifest
@@ -1,3 +1,3 @@
 DIST Mixin-Linewise-0.108.tar.gz 19151 BLAKE2B 14a4670c9d1080b08bb27950f4a3aa21150e2761ef7069d7b18f0866e10a2450ef84c79aaf170bc62216903dd43efb8d95594dd1d8926c0c99025b85ad609188 SHA512 2789126737e2798a94ab6d90614503717dbc6c4178d19a9dd1e32689869e8e1298ec168fd6ab53580e65b5ad7ff94e065dca4afb7b71c2bb453810da61d29450
-EBUILD Mixin-Linewise-0.108.0.ebuild 698 BLAKE2B d429264887af5b659ebecaf849a93ba2de04c7a1a2c00386047a6738d822796d69314c53fd77066f3e5ae4c5ae0ed3c52e5de8e135e87ebb791a9d80c39b4f98 SHA512 0608fbf6def04fdb5ea30021a4845ee12653d2d78ed82dddc06d792ec442cccc6e8aff6466ed0a02595bbb55a92b70c9897985461877c5d2f2d00738f7d30a83
+EBUILD Mixin-Linewise-0.108.0.ebuild 697 BLAKE2B 97b92852b2859517208a8722f09cb205075b3117fe0d01deb6830108c8d4ee01272e1bf309fe1eb56231e5a4a909ba28af6ba5f87608325137f8da0d78f179b5 SHA512 ac6c3a6a6ce93f3aeb6df8a6f96d3a373fb886f3a531ff31f5fa5528a3d721b3c28fde257179b07263f5d8331e2ddf8c473c3267ba3ce8333c6f9099efca7e4c
 MISC metadata.xml 542 BLAKE2B 50e578ad0d411fb55bf8587de9873cfb4f964e4b339d333524973f5c785cf28762690b336592cb8529c09dcd81f06a94e60bc4a014292332c5f367e56d8c558c SHA512 f5ceabc747666b86e67b52d052a8bc2a1b0473706a4fc97ef0fcb286b6ec339c9d6acaa053034a44ef2c708a64d9e17e02cc2ff392dc5dabc75f33c9cd55abbe
diff --git a/dev-perl/Mixin-Linewise/Mixin-Linewise-0.108.0.ebuild b/dev-perl/Mixin-Linewise/Mixin-Linewise-0.108.0.ebuild
index 7d8331a1581f..8d05609ba8a0 100644
--- a/dev-perl/Mixin-Linewise/Mixin-Linewise-0.108.0.ebuild
+++ b/dev-perl/Mixin-Linewise/Mixin-Linewise-0.108.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="write your linewise code for handles; this does the rest"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 # r: IO::File -> IO
diff --git a/dev-perl/MooseX-OneArgNew/Manifest b/dev-perl/MooseX-OneArgNew/Manifest
index c408129bd4c8..345c68d7cb25 100644
--- a/dev-perl/MooseX-OneArgNew/Manifest
+++ b/dev-perl/MooseX-OneArgNew/Manifest
@@ -1,3 +1,3 @@
 DIST MooseX-OneArgNew-0.005.tar.gz 16071 BLAKE2B d7e6db6b7b70622ee16e531b744fe66b453d717fd699a19dbe977df8c2654edb814d6561f26c6184fa58ee68c846b14bb4088239cc2a0acfaa4bb4c5acb18da1 SHA512 0d846346be4eb2deb8a212220991dc727a3ca1fab4109292117dadc8f64fef20ddc93877d198d56974686fbd5d3f4ebf10abd429f08c7fbf1de42975138259ba
-EBUILD MooseX-OneArgNew-0.5.0.ebuild 675 BLAKE2B e434af087124ed49aac65a463e2ce5487c09b1e4b055aadc7b540667a69e46880ac0663d9df0ad55f4f9b041c82ce3f73bec3c00df70b9e1fa3cf57097683b9c SHA512 2186731a51b6771512a3f2b08ab476b18c3122d456af14cc9b65855d7f1432a2c28e45f58171b5006ee15a659a652372accfd31865f20c995a2199632d4188f7
+EBUILD MooseX-OneArgNew-0.5.0.ebuild 674 BLAKE2B 87d15cb9b17bdfafc247815ebcee31b7c5c98369bd8c06453d006367d47dbb40523472fad7e22861ac03f658c082ac5484042b5410c07ad236482fd42dcf66d7 SHA512 849dfde76022c4e838a720eabb1c30e8566edf145704df19399dcad2043a1bfae08552b7b0665235d14dc6ecaaa54615e9a2f08d4379ec405e70090b00fb93b9
 MISC metadata.xml 404 BLAKE2B 607bdecff3586def56c827e82a768aa25348a10673acf232ad3719c5954c3cd59f05080342a493cebe2e3194c17097aa867ee7d71adc79659a8076c496bd07bf SHA512 a36e66059c6179c994229dc075ce07684aec9fe7b5e74716f7765cee7d970155940b140bf801ed42f2f64ddc1469e7f164c03c74e160849a5f642e441d66c489
diff --git a/dev-perl/MooseX-OneArgNew/MooseX-OneArgNew-0.5.0.ebuild b/dev-perl/MooseX-OneArgNew/MooseX-OneArgNew-0.5.0.ebuild
index 58b83f57d8cb..cd2a5cd68d59 100644
--- a/dev-perl/MooseX-OneArgNew/MooseX-OneArgNew-0.5.0.ebuild
+++ b/dev-perl/MooseX-OneArgNew/MooseX-OneArgNew-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="teach ->new to accept single, non-hashref arguments"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MooseX-Role-Parameterized/Manifest b/dev-perl/MooseX-Role-Parameterized/Manifest
index 51e9b445b22b..e3a80a7e7bfa 100644
--- a/dev-perl/MooseX-Role-Parameterized/Manifest
+++ b/dev-perl/MooseX-Role-Parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST MooseX-Role-Parameterized-1.10.tar.gz 47012 BLAKE2B d4be4867a73838db599ed0a2ccdc76f147c8f2a6b58eed08b60e73a40bb8e29966fdd28fba79f340f78ae21b3eeffa3e2c9d6d02c109820f00322a87d50f1964 SHA512 10f6b51dd6e09c30e36496469c4a213e0ab6d12529e0b91161f680ae595b312e9dbff035d6c8a2d10dbff7fa55cf7ca6b53cd66b848f75f7e6ac43b6e6eb9e84
-EBUILD MooseX-Role-Parameterized-1.100.0.ebuild 919 BLAKE2B 561fb3b4eff884060fa6ce3c34be15c8772abdd1691bf6f2387a915f09e876af66f96b824427e4149ec70f8b38060f004ea5445c0d8fca9cce9d03a5106229e2 SHA512 f4d8ede5915cf8487366efe120205f5e249c9cc47fe745de81566fa8fa18bf21e26cadaa7ff51fabd1bc2b2e58605cfd1fa62d2f4cc347fb11cb81b640e96912
+EBUILD MooseX-Role-Parameterized-1.100.0.ebuild 918 BLAKE2B d0a42f6c36f9bf03b92a35db0ce876c6e3ffdf54fa52c1aafcc6e0ae11647101041fe1834f83ed01ab35b0a5241e8fe452972c4b556151e59e5388c0508d7350 SHA512 83a9434a7fc3844e479f2d3c5f214ff65fa4285d057a8762b9dd52d7e91ea1bff6508a08382450c00c82a3428cdf3de2493ba2e93c6187484926b6aeab7e4f8e
 MISC metadata.xml 934 BLAKE2B d8f64265ebfb6b886dce0a148dc64f0a1082203a88dfc4a9fe90ee9d38f0009e569ba9d7fa64398ef967fe3feaef67d2e6aecef2d2c57f225d2c40239c49ff2a SHA512 f6f0eb7aa2ffced3b23c4256a7523b4f21492e6375eda92f4e96a079729dbb6fee99d3448076e97cfde8cb513811e55b7cacbe127f97d1b46e13a3cc8dbb1a49
diff --git a/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.100.0.ebuild b/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.100.0.ebuild
index 41216f384558..95e9591e21a9 100644
--- a/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.100.0.ebuild
+++ b/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles with composition parameters"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MooseX-Role-WithOverloading/Manifest b/dev-perl/MooseX-Role-WithOverloading/Manifest
index 890c2a7f9f1b..59913e52f8a1 100644
--- a/dev-perl/MooseX-Role-WithOverloading/Manifest
+++ b/dev-perl/MooseX-Role-WithOverloading/Manifest
@@ -1,3 +1,3 @@
 DIST MooseX-Role-WithOverloading-0.17.tar.gz 32308 BLAKE2B c862b4f32e7c5a6cea15d0cc92c6352301340f8ad3e136fb703cf0328b1dd93d11ff4c9204a573de911a607a46d342c4ce4d3d08400e9e2f580f33e6f7066ea8 SHA512 510c243dc561b82ee50934e802e697d1fcd4db35c6a4cd8044f5cd5668c890e38a6ba38648f8ca0f11ac55dfddc3d4fa94f2e6ed90871547d76e3b5953e54155
-EBUILD MooseX-Role-WithOverloading-0.170.0.ebuild 821 BLAKE2B 85d0d8a1ab7ba548cdcaac1a0ce1d7a32082ef03e03d2bcf8df34ac4d3c008250bc00a2a03a0f4c6850e09ef0172aabe65398320781356c916ab499a4139b5da SHA512 d334de4b0d1255cfb20792360eeba6b3ad05f7690de5d323104ed76db7ba5f00b08ff592ad7d48d1d454f8d04c50bcf9b5926c683c5d2dcd0756a716217855c2
+EBUILD MooseX-Role-WithOverloading-0.170.0.ebuild 820 BLAKE2B fe764d21a42da1b585c8f7fcb6e8af41fbe65e3c3aaa658e03c3242347ebe4d44983f293aafb4cb0658ba63223a84cad712713d62bf47c95781de61e06c07858 SHA512 e6798db97cc956e4dd1a99a5d4a08fafedb6b4b60ff9d1862b7368f79670485ee60c26019a864679db5e253d220f66461ac4483203505c7967435121d1eeec77
 MISC metadata.xml 1712 BLAKE2B 53d54d8963b2fb8e8f0f90d6a77d25e141e5b8a490b6680548eb0274e8600b84670eb9d73abb54bd4756440ff02248b5567f729dc0491605dce444f9a4fb0bd9 SHA512 1d2b1bf883b37622a589e037eb25fa0f492ec97254c212513dea18b78b2d5760abf627f683441092dfb04b5b0c8fcd0c68dabb04609ed7ea2bc49a82b1b4064c
diff --git a/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild b/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild
index da105f7f1ed3..93ae305232f9 100644
--- a/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild
+++ b/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles which support overloading (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Role-HasMessage/Manifest b/dev-perl/Role-HasMessage/Manifest
index 4446d266fc85..6c9ff41e2e73 100644
--- a/dev-perl/Role-HasMessage/Manifest
+++ b/dev-perl/Role-HasMessage/Manifest
@@ -1,3 +1,3 @@
 DIST Role-HasMessage-0.006.tar.gz 13518 BLAKE2B f4c702aaf375b02aa9de749e7769d258931b31c3460431c0cd8c4399b733bf702d12b33c8ee13c314cd23c5acabf6521a4ea76942bdd03292023bb14a6882691 SHA512 2bb8b19fe2c113c0c92a5e16180f53879ad92fbcb63a5b3af4ead167a4c8b3dcd460c9307d3c8e24ab5070e6c58f378d9e6854ed82da0ea231e456d5786b5398
-EBUILD Role-HasMessage-0.6.0.ebuild 646 BLAKE2B a235fa5a26a9dad9e4e2685fa4247e450fc2b0e4d36ea892eba1867575f1561759ad993168b13ab77fd7b699376bb476684b82a391714a8bd247e40fded72aba SHA512 f9f8d6f4eb92062290e1d761df9becefaf8066154399bb7362ed18d160af83ebde2a8ad08497ce60211c480b89c700ec09d9afe16aad4c296c482092a9a46137
+EBUILD Role-HasMessage-0.6.0.ebuild 645 BLAKE2B 6363b6df3536fdde29d7912695165a3cf7b962cdfd310cb4511d6884cce3f34173b63dcfe5d2d5d90b44ec7be7f84a388e2e7182fa11f0cb458581ca5122db6f SHA512 90227515218f59f42f515c25222db268541246ebf0b84832785ad2a04b3ed51f691f492a78fb521fe253debea11f944bfdeaf29e78a4f96f84be68d8fdbca2dd
 MISC metadata.xml 471 BLAKE2B 8fb171746328492d111acc977d2146c6bebae81707ae0ccd03954ceae436469b0b5176f791642be4a7677fa36e81a2df3c574aa4a6946a6fbf0c972b931c2297 SHA512 3ad81cd2d4af7eb1bfcec4f9155c454435dc3ad9e7c2cf2383fb59f36e679130719dfd947255ae5d88a343d7291c68ca21908680437ffc00d34f4008bb6a8e3d
diff --git a/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild b/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
index 3dda7e6e4f5b..d7d673493432 100644
--- a/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
+++ b/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="a thing with a message method"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Role-Identifiable/Manifest b/dev-perl/Role-Identifiable/Manifest
index 86b7abdaa594..f9e9c1c5ea79 100644
--- a/dev-perl/Role-Identifiable/Manifest
+++ b/dev-perl/Role-Identifiable/Manifest
@@ -1,3 +1,3 @@
 DIST Role-Identifiable-0.007.tar.gz 13429 BLAKE2B 181094bf86a12c218c437706b4876ba9043c3808c460048fd911316eb49e0766b69e96559755c1ccc9d2344fe0639a8856c70aa7583e0d23ca0ca6e4e5ce1782 SHA512 811c81e3fbf8499269c4db3a45d60b35ae6ff8a8d5a93308607f37c97c2f52ad4ee6db28d15497d4d1f8cb59c67f03f479632d1a2d440034e8cd711b2a5349df
-EBUILD Role-Identifiable-0.7.0.ebuild 584 BLAKE2B e67c6889551c2bb537b11c84e7d9137846c85cec8895d8b598cc0caa3dc0d5e4f3a70b34df70f4ce9753d6259653d6c9a99aa4dab83fc72e4ab83ee398440cb6 SHA512 f12eff61f69f5ca0fe8662d0d644b66281d61c2067c1fea8171640ff1df7064a64d18351757a3bbe9823803372a5f26b7e8747ec2a51d86433219d0d201653ac
+EBUILD Role-Identifiable-0.7.0.ebuild 583 BLAKE2B 1b0a713b9eef52d2464ac27294bbfa9e19c1d4f77f5eef3407117217c1501baf22b40e69f8f83db338f9d5249baf602c0ab0a27bdf0efed60cb5b0c9d96adffc SHA512 e7f9ee3927c9840643d3503e8a8b0b4b5ebcd5fe8a3dea48b2205548f77366c3366326d55b0e757349168fdaffc004c2f7d8e0a34612f28169897bc0e9a413dd
 MISC metadata.xml 490 BLAKE2B 13ada2a7ed354b26cc1ded4ade3a9c00bd34eeb2c6793d39ff94fc09aec393b1bcba7f7bd7ee3d7c3ecfbb8ee8e8216e61d794fc6f49f3b5999b24c8ce7f3824 SHA512 f795809c97dfa59ad1d6b63d5678b73602a395afa2440c24bd81b039f3934a349975c194454c24d196d1598b6ba5be8f0b5a939dc64941a34c403264f9bd20ea
diff --git a/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild b/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
index b76f96e97cc1..4ecd27c1376c 100644
--- a/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
+++ b/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="a thing with a list of tags"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/String-Errf/Manifest b/dev-perl/String-Errf/Manifest
index 027f27c56e62..57a78a61a7a5 100644
--- a/dev-perl/String-Errf/Manifest
+++ b/dev-perl/String-Errf/Manifest
@@ -1,3 +1,3 @@
 DIST String-Errf-0.008.tar.gz 21477 BLAKE2B c0f1d7e15d9cea21ed6b5121a1f43caa148b47a2bf169f95d2877679a06f160f1d5fc0c8f079e0ffa52c80b51b965cfc12bca4466f11d0f2e11a0005f8ab16d6 SHA512 0684613c932ace4b7ee2f44a73a1bfd90ce195203ffb3da8ec5689d7ed912854490288d8e559cd97ff7af5b8c0486abdb357353c1dee4edbdc4b17ada56b156b
-EBUILD String-Errf-0.8.0.ebuild 743 BLAKE2B efbf1bc217373bce5cb6f3c3f544d9984ea7633b862bb101840e2491b2ab3d7cfd464a97ab4878c9e99c48d4be9fca6e254a34485e7b492003389144d5fff43b SHA512 4aaaad00f40b7e63fa60b9bd8a50101921ec8ca2aa911f56df08d78fee4b9653bcf823901cf4108122af984f41f8c6b239cf820f6d2d1f76ff226e20af8278fe
+EBUILD String-Errf-0.8.0.ebuild 742 BLAKE2B 8895beba17c8dd4df00553d7c64bb98c17bcc4e15bf59817ce8ec4f97bf262a41bde1c9be0d9b61835069c72706066e4ba4b584ee305ee3bf35de3cad11a85be SHA512 60a264d5aa6c9d66501f7c5941ed51490f1534cf5dd5c23cdc791c847d2210782239c3867b8448f38cb52b6c0193ab727f6d92bbaee1d6c067856723d608151e
 MISC metadata.xml 394 BLAKE2B 7334d95d0073c70bcaa32d562a5e7f2c7debe3011e6e2bb971b8084c2d4bcd83dadbf313add0a22e5879b1c7ffe81b85956f21a09d13975ddceab847c34c5a33 SHA512 90b2ea8819ca1996890af112a10c2c1232280d99fd279a89e2c760cdcffac1140ac00fe496ddbf59d36f8f3bc2586a9b986eb9a1e209047771d2361add12a0ae
diff --git a/dev-perl/String-Errf/String-Errf-0.8.0.ebuild b/dev-perl/String-Errf/String-Errf-0.8.0.ebuild
index 4cd744f673f1..ba31abfda27d 100644
--- a/dev-perl/String-Errf/String-Errf-0.8.0.ebuild
+++ b/dev-perl/String-Errf/String-Errf-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="a simple sprintf-like dialect"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/String-Formatter/Manifest b/dev-perl/String-Formatter/Manifest
index 02cdadcae686..9a74ab2d4d8e 100644
--- a/dev-perl/String-Formatter/Manifest
+++ b/dev-perl/String-Formatter/Manifest
@@ -1,3 +1,3 @@
 DIST String-Formatter-0.102084.tar.gz 20981 BLAKE2B 960a9ee9ef5ac6d378406697d16ab44c891d959d6f6aa888b8b0950b178d9167b8882d372fd86271a69f51a85a243b8ab491d8b21f3cfdb4ad47d7577aef282c SHA512 d9e72e01b78d9b571cde6cb0107e334e41739b07006e224016cff5de4648b9f924003446de75ddfd911bfc25b3046554cde09502344dce53a8fed2ecfd7994dc
-EBUILD String-Formatter-0.102.84.ebuild 555 BLAKE2B e3a2df916f9e19e67771ebc4fe986a2f4e688cc1c157f819cf045385ae68a817b36a7b33c512034d525d41d516f0f7039030400e1f6d7838f0f2f4fcad374211 SHA512 7105301b0420dbb99e65b63ec8f3872c111660d000d3e5b5b0c8f451bf4e030282ec2f01d6cd89ed66c4c8a43bb8f1f602180886d39e87713f11b970107c08a5
+EBUILD String-Formatter-0.102.84.ebuild 554 BLAKE2B 2476ff1711399480bc8b79ea93549176daaada9045ddab8975044172f5ea4f4d0b5dc9d7e3405cf17d3ad6932e6861aabfe002197b7b9036c41273f14fa76d97 SHA512 8e24fb028124a0a5108d29121072ceaf165656181e88eaa4a4263dab53e254b1164a5be8c061f6d663409da3c10c61671d9a47e1c2198299f122054579f9dcb9
 MISC metadata.xml 478 BLAKE2B f8db7886132b9da674e0c2c7e6a1d253bbe0189e9d204f6ff549a4eea1d6370391b1392c720261bd124190fe2c5c50988d9b9b8cfce79a28edfba2ef141889e1 SHA512 78759d4e1dfae4b9452edf7746a312d481dd3b3ab5b8af85ff7054cab84dd7564c7862729f9b6d780d2462c7a649a0c9e4d34d261cb3e9a21b3d24e97dc8534c
diff --git a/dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild b/dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild
index 4dcb27e46901..b06de3d6c970 100644
--- a/dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild
+++ b/dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="build sprintf-like functions of your own"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/String-RewritePrefix/Manifest b/dev-perl/String-RewritePrefix/Manifest
index a589e0dedf77..d057149faea1 100644
--- a/dev-perl/String-RewritePrefix/Manifest
+++ b/dev-perl/String-RewritePrefix/Manifest
@@ -1,3 +1,3 @@
 DIST String-RewritePrefix-0.007.tar.gz 13553 BLAKE2B 3f8ec74cda91415e2c587b30a694a2ed9873ce6d7ce8e67e31df263690f7ffe67b15694275faee924b96b9e65b6596934bdbad760ae8924777020f44340d6115 SHA512 c5f2eb6c7661809b4783378a4a33445dfd91fea22cd0a11c9e8d42683879fd6f95c465f7902db2573d5939dc18b250c1fd787d63e3c8a2e15febfd2c8fbd5a10
-EBUILD String-RewritePrefix-0.7.0.ebuild 526 BLAKE2B 002d73b5508d2ff655aec6d3945e454bd579bf0e6c44ce9e49107ecd4e03fd7ae83e489113623c9aab5f8b542e48c8d27ef9d8abd73b96532ad38b0211efacbe SHA512 73040070b9a3d433453b414c428f842211e75539bdbb9e1aa571b7de899daaaf9c11c24110267271b01d81cae02b48d9e0f3838a1899b0291e272088486ef732
+EBUILD String-RewritePrefix-0.7.0.ebuild 525 BLAKE2B 2cb949815d8156bfa45aed88b88bef466797ea52cb730832c4376dcd86c9000086e948e578fa2c3ee1f5fe1a4865a8de3f5948f3ec463359872d5479c6c4ae74 SHA512 43c13bcfba5f355d9d1e2590d2eb0ecc271ce0bc2063c4aaabccd4f61c317b9c0452b303fc83377e7d59191d85f6e2c7428aa3d5c92fd2083ad9aa8c2ef9c6fa
 MISC metadata.xml 412 BLAKE2B 392f75b3886624af97ea330d2ab726ee5a198ad8774ae40aac0d7440caa2c60cbb14c859d3106f632fe6d45efe79fc9a5169e133b308b07dc4d36adf15c053bb SHA512 4cb4d8678ce29d00b769175aafb87781754886c47f129d32e071dcdaf31806e3732aacb5cf89aedf83c0d426ea3315549fef09836337b03f2ca964d933ebdf11
diff --git a/dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild b/dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
index 35218a908921..f66fe45e899e 100644
--- a/dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
+++ b/dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Rewrite strings based on a set of known prefixes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 66c57d246abb..3561216b8909 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index d53fbdcd0ad5..a80ffc318926 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,3 +1,3 @@
 DIST anyio-3.1.0.tar.gz 122097 BLAKE2B 4a16a5d231cc5262dd4138f628b9d210180733bda4b9e81ced0c0e0c7f49e1760c8dd22db0a1db3b7a21f3210072f4e1c543e52a7dc716ad3f0415827da48e38 SHA512 120d8e3e24f542c06caedd0a67d16b3fb69c94f5feaebde5262e54f8ffba3f1cf927c82030d65fa2efb3479ee64abd968b6ce67aee767ea33ccef6b0e3fbd358
-EBUILD anyio-3.1.0.ebuild 1034 BLAKE2B 058016a8bb359455f1c53b38521347891575baae09a5d9f020f17d8478c5f384f4d770399becb61e66b30d07872add4d5a1e62eae6b5f9e35221d1eba63e54f8 SHA512 e387dfbfa5ae1658adeaa43414c693c4931bde040b58d7dd403353c6cc32688fe6383837f1183116b3f7be68698edfa458d3a40ed4061b889f7b9391be663415
+EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 MISC metadata.xml 1320 BLAKE2B 0687bd9663338d0f39ad5b705f3ba3064ad7a399e31e6b6dfba80124b4ce719bbde82fb39f8b19b4a2fd22a040919163a59bfb57a3db143983d60db78d05811e SHA512 306491b404e5929eb19f61e359741b2961b3e600e3e6190e29215ea571db2d270d469c331956246f3336e05f5379d37d35bbea30931a9bbd8fb79a671d7642ce
diff --git a/dev-python/anyio/anyio-3.1.0.ebuild b/dev-python/anyio/anyio-3.1.0.ebuild
index 53b2893ab605..d4d7d1e46906 100644
--- a/dev-python/anyio/anyio-3.1.0.ebuild
+++ b/dev-python/anyio/anyio-3.1.0.ebuild
@@ -18,10 +18,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# This will pull in dev-python/trio and a whole bunch of other new things
-# And trio does not yet have a release compatible with python3.9.
-RESTRICT="test"
-
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
 	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
@@ -40,3 +36,19 @@ distutils_enable_tests --install pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/sphinx-autodoc-typehints
+
+python_prepare_all() {
+	# This will pull in dev-python/trio and a whole bunch of other new things
+	# And trio does not yet have a release compatible with python3.9.
+	rm tests/test_taskgroups.py || die
+	sed -i -e '/trio/d' tests/conftest.py || die
+	sed -i -e 's/test_cancel_scope_in_asyncgen_fixture/_&/' \
+		-e 's/test_autouse_async_fixture/_&/' \
+		-e 's/test_plugin/_&/' \
+		tests/test_pytest_plugin.py || die
+
+	# skip network test
+	sed -i -e 's/test_getaddrinfo/_&/' tests/test_sockets.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9f53d8d0c580..a4e5c04be523 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -18,7 +18,7 @@ DIST boto3-1.17.93.tar.gz 382205 BLAKE2B c665f3a98ffffd3a146914e5c061ec222def64f
 DIST boto3-1.17.94.tar.gz 382448 BLAKE2B 84ea4989b47ff4b1adbcb1118bf1a18996d98d954c195671483ac2ada94afd1fbda151afb6dd1be556c5a63535ebf9747c7f9eac99d55ee6cdd64dd163941572 SHA512 a157df1cef3d7d99f319bdce20ff4128cd171cb9ce5b3cd7e286711cb0b3939efafbd4f8b1370fb131af60296d703c1244d4232cedd28c3615d1437c98ba4445
 EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.78.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.78.ebuild 1367 BLAKE2B da22f912dd19d83b7e2a4e22bda42785dba18b67bd6f0b9a5a6d13cc87a1cbec9810e8071a8f7407be4249fae4aa6a27357970f0f9b60f914e9f82b034b862f8 SHA512 568133f9ab499b8ff9e95340ec99b4bb3c9e6f53981d2fe337a3220a189d9bf91dd8f7f03db055e0a02169f36546f5257fa04c1a0fd2918d712c636e02903240
 EBUILD boto3-1.17.79.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.80.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.82.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
diff --git a/dev-python/boto3/boto3-1.17.78.ebuild b/dev-python/boto3/boto3-1.17.78.ebuild
index 5577742efeb7..95cca01df831 100644
--- a/dev-python/boto3/boto3-1.17.78.ebuild
+++ b/dev-python/boto3/boto3-1.17.78.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index e2f94755f0c3..2ac8d5f45180 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -21,7 +21,7 @@ DIST botocore-1.20.93.tar.gz 7827854 BLAKE2B 6297172731db3367d5d769c38de4d8ba8e3
 DIST botocore-1.20.94.tar.gz 7830564 BLAKE2B 4c52bb0f782a4560c1c966ede26a5741428f5b06aea8a46f76956b7ebebeec92c6eecd62fd3064a3eeb206c68116a64104222dc141d860cc9d1c53eb37567c24 SHA512 1dbb52626b03f82b48cdf76da0e0138b11d47c9f6aef64a164c7489232a46af4f2d214fef5d132a1c656f2728608cecd23b4a781f58252ee7a69c7efe853d4f3
 EBUILD botocore-1.20.54.ebuild 1541 BLAKE2B 2a87a90a023a6f4a203b686d8ebff52dcc013ecd083a103e6b77f9f738c4cd9fbb04d6c8a63311aacb867f46328676c296c0ac0fc7c8923eeea6b310295a9bb2 SHA512 293c8a55e0f1c424026e395c05e901ce2f233a42b1105d7ec03c85a99c7f111a4701553598e009210ac6f7517ca7d9849592b81ca7ec62d99265972a7dd5cd00
 EBUILD botocore-1.20.74.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.78.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.78.ebuild 1508 BLAKE2B 63c6bf25a6af7e1f5e39d58577efd2044a915b4c9679b02941600fb89e061b403b9b6f5c47d12180768f8461660f39771a394dd90dfa851bd6b6d9ac895c7eb7 SHA512 83d93e13674e604cb4a0593fd6e189a689fcb5ce23a60756cb6b2bbe6050d4c07421953ea21b697f83cc876a6e77e1505e89344bf1143b8130d8854bcabc644d
 EBUILD botocore-1.20.79.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.80.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.82.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
diff --git a/dev-python/botocore/botocore-1.20.78.ebuild b/dev-python/botocore/botocore-1.20.78.ebuild
index afca295f8bed..42a1ef99e273 100644
--- a/dev-python/botocore/botocore-1.20.78.ebuild
+++ b/dev-python/botocore/botocore-1.20.78.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 1e036f2c5879..e04883c55522 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,3 +1,5 @@
 DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
+DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
 EBUILD dbusmock-0.23.0.ebuild 884 BLAKE2B bd4705a564681c26f4a7df8e7c7a1ea5c81d2ba34cd9076668b6ef0bcaceb1d8f1d275845a1ef41edd2f87c59b7aa3a4eafabcdba628690c969aaf592d1216c6 SHA512 dd458558957c6a95d08462e85bc54b14ccb865bcb872f282208dd8b8233bdd43ffaceea4d6fc92ca614e12a8d9601b36d831b1685e0af1a2ca237eb047969ead
+EBUILD dbusmock-0.23.1.ebuild 892 BLAKE2B 0ee63c7e0d6ba48b0df8a5ed6d91bba31e383b9c1eab70b25d4bc0f2811e514d84149aa2d4c21c00ad5fbb3b2a4cf53259884fb0c0940bd8fb75a3b61e59dfeb SHA512 4eb1f0405fa6313580046694131c1a314080b5c570cb099d0f223c813255425ec98d190af4bd86c86de4a340e05108d7698f870cfb8705214a04ed321d8fe81f
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
new file mode 100644
index 000000000000..e0fb9905254e
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 7543f9c86180..17e11b6bbebf 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,4 +1,4 @@
 DIST diskcache-5.2.1.gh.tar.gz 652769 BLAKE2B 25fcdcf51c8be7a6e2a9de645258f776647789a7f06c70c8564ad28bd003a745167095b11a54d435e733d9f5181a1443be2510fe2d901cc208ea426d3359c0ba SHA512 6e55bada12145d931f4a465092decc3f2cfed2e618d1ea271ad6daa6caf7c3abfd6ae5de11072efdf898ebf272acd39136136b58d7b5e735092963bdd46af52e
-EBUILD diskcache-5.2.1-r1.ebuild 1007 BLAKE2B 099c57ed08d4ecf517d305a231a2a66983f5b1bf66c43a56917e9e03904dc85b728b6ee3d4e78aac744dd87aa021c8ae18b72902cdef52a7e0bc35fda1562bd3 SHA512 8708fe09184a5a92cf49a1782f2940e32cb1960fcbb3b619a6800f35a947dda3e8e9a048d845fcc8471a1d386055ad4fd3e804b5edb9fa701ed5a536203aa149
+EBUILD diskcache-5.2.1-r1.ebuild 1013 BLAKE2B c8ed9d89f3abae1ef235510bcd8d4c552ae999ed9a7a9d28cabbfcc10fdcb98c1ccdd425b32778731f49a5020eb12764ea8bd426b5307e2f4ecf00d604a016b8 SHA512 bfd5916c7dcc03bfc20eff5e7eefd8debc5f49f2d75670120677117efd98994c3cf1ba9f0e0932a1ff1dfb4b693850ea39b2cb96784f949b7f55ede716bb35a9
 EBUILD diskcache-5.2.1.ebuild 845 BLAKE2B 9b435c3adf032acdc81a283d00102cb3f0b9dbe22f76438f02eb98b0234cbe0418af1526192f84409d6c4bb7a1b6baec07dcc0ac888002c808dbcc3913462fd8 SHA512 3525d0cefdfa839fd45bf337501a2a17c799eaada4edf79e9ce7a3d890282ba98036b5dbb3741e4a53d7afdb9f0d3e21ea17fb984bd1d084f9569180769c7b02
 MISC metadata.xml 416 BLAKE2B abce0086d9e449bb58281c7856b518501d837b88473dcd611d3f7026a221bb320d866ba631f704a2cc9a5d24af88fdb171e5a0dc28a79f88852ce6931d4a37e7 SHA512 14c60bba29274523a81a24008d51d74ed2ff3c5ae84ed11110fd1e3b83c39c35eb0a95d56edf53db5bbccd08c6bea62cc3019405a077dc00a0869f01e6968c9e
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
index 362a97886afd..2fbcef31ab35 100644
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index d10977e29f25..1dc25bf10e51 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -3,5 +3,5 @@ DIST fasteners-0.16.3.gh.tar.gz 29727 BLAKE2B 67b4bc260858abe7ee330c2c5a625ecfea
 DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
 EBUILD fasteners-0.16-r1.ebuild 654 BLAKE2B 1ad152a2d29ab8487b70412aa57889a2f7351449d221662a423fc696e4e16884af1917bd387251642cc57d3c3a21546221dd1449be577638f74f6734cf8f87e5 SHA512 28c3dac7d4620f6a6ce1a04361ce249cac21f68b7fd75ff1f83165be28050328ac9d994c78b589f17241afe52593dfac12b74a57c1f61c4675f14a454acad05c
 EBUILD fasteners-0.16.2.ebuild 707 BLAKE2B df46efc7b85996ee878b2e64764b4a32f27ae143916dde9a4fae6874b8896234a6f7e7964de826bf3c07ac23a9b6206edbb68e0ad079384f160a791151a94a2f SHA512 816ca129228a771284b482080712f98c89a1e148abf5aba95204da3735ce51fe16390dd23433b2339ce1bbb474bf8bcab429c3ee483804aa088c718bd019233c
-EBUILD fasteners-0.16.3.ebuild 707 BLAKE2B df46efc7b85996ee878b2e64764b4a32f27ae143916dde9a4fae6874b8896234a6f7e7964de826bf3c07ac23a9b6206edbb68e0ad079384f160a791151a94a2f SHA512 816ca129228a771284b482080712f98c89a1e148abf5aba95204da3735ce51fe16390dd23433b2339ce1bbb474bf8bcab429c3ee483804aa088c718bd019233c
+EBUILD fasteners-0.16.3.ebuild 713 BLAKE2B f90354087f582ebf2e7c94b2229b3a8eb983e34aa3b79261fbd681a654e6ba09e0e5187283c055ff09f7d828650262069dd8a3cfa3b6ff8468e938c137c2cc0b SHA512 37218e151df46cd10945ba055b92ff243454102736b3eb5ab8573233a4605d6bb546e3df4e4120e7c834c842febbb2bf6cbfccdb5811bb4f8c8cfc87bdf14166
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index 87fc43fd2b6e..2a838396d4e0 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index d5ad3436654f..f17252c798bc 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,3 @@
-DIST filesystem_spec-2021.04.0.tar.gz 288179 BLAKE2B 896982345533fef9593f393209202e0a90473e9826ced9d69854dca20c66c64b85e1b1c44413dda718cdd1af7f41ac821b4d67b600536b32a873a4f73ab32801 SHA512 6806d6fbae89b514955a309346f19b2d199db10aecece728d117798368c311e3fbb38161fd5a54ea4a60ee7e656d2e50fdf8c4444ec3d6bdd761229b4a6341f2
 DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
-EBUILD fsspec-2021.04.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
-EBUILD fsspec-2021.05.0.ebuild 1196 BLAKE2B 82cfbe3e6835ce01aff5eb944a83f70746590d2d72d793874d7997ef3ca8afb67ad24c934699e4641bb496f9709f55c00831f8d6dbba370d0cc9894a01450f29 SHA512 536f1540703e35e123c69db1183da475f2e67a142e47b0084d197e5dd84f434a5b829ad84a935f9963c661896183d74444e1181890a10f73515cac62e4009b5d
+EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.04.0.ebuild b/dev-python/fsspec/fsspec-2021.04.0.ebuild
deleted file mode 100644
index 102b4d61d8dd..000000000000
--- a/dev-python/fsspec/fsspec-2021.04.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	epytest \
-		--deselect fsspec/tests/test_spec.py::test_find \
-		--ignore fsspec/implementations/tests/test_dbfs.py \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py
-}
diff --git a/dev-python/fsspec/fsspec-2021.05.0.ebuild b/dev-python/fsspec/fsspec-2021.05.0.ebuild
index 4032b21e0f99..102b4d61d8dd 100644
--- a/dev-python/fsspec/fsspec-2021.05.0.ebuild
+++ b/dev-python/fsspec/fsspec-2021.05.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index 0d7dd6e361ba..60a6f073e703 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,3 +1,3 @@
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 474 BLAKE2B 8d99dcbc37023b88163d0b812f99a2c8f25bf98905442d27908a1bd63d347e1be2e62b151a391c9a8c7b31349f6dc0420c861fa36c1ffce3a83ff90d332913b1 SHA512 03b9e3ac99ee005d6cb61739ee12bf00f089bdb68a22058e2adf2833250ef06da330e269edf13de62819ebdf6b8ec93db6a1483b9970569c7a2a9c6b13359a77
+EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 469 BLAKE2B f026e5b1520cd3447d86f889b54e45bb2403e4a8044bf701d5d40feea8e6c41903f8eaec415866cdf58e6bad50e848727b956dac8efc532dcf622d6ab8b34725 SHA512 53ad06860f1562e56987e6f76b6a0c29614bf8c4afa3f74c955431656362943ae730e8b44add64031e6a3f3c15f5c1ebfb202732b9fe736873284e90067bd6e5
 MISC metadata.xml 339 BLAKE2B b05bc0183201fb2155f2ac06a76f77a1bb0cad3bcfaf0a6419f5de867d710b9ed7a336acb825ff25e685806128f733bdcd0d70825cbf995ca6d17eb57ed1c8c1 SHA512 2a0348e805f633535dc358cac761f51867b0e6dc13724e11d3671523ee13cfe67eceffd811989eb9cf71c697fc3b3f254844746468c5f4e0fff7f5e77346ee52
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index fbfcd1885e01..430144a62462 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index c8a17bd54ac5..5e93092b95e4 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -3,5 +3,5 @@ DIST jinja-3.0.0.tar.gz 271882 BLAKE2B 7013d74802534273c62db275d95f05f203af97f52
 DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
 EBUILD jinja-2.11.3.ebuild 1558 BLAKE2B 11b319f676e492a970f2ade22a208431ae247aa5277219c5cff90ef23e21b675b779cf1c09402f6c07f41629f77b4f8be427bdcb97d40c8b8de07c6ab45e9645 SHA512 26f8f456af243710d4fe9d2b7782f90c6800b23403b6da77742f975b4fb151c1f18b34b091689ff8b84fbacfa78b81564fc363fae467848d2841572be1007a5c
 EBUILD jinja-3.0.0.ebuild 1321 BLAKE2B a26cfa25c06793e7f6a64f0d5822ea4fdd1d05925ecfcd6236278740d825b29474fd693171a2593364e72974f40110f4f550cf3c0b2637a019af9ed147a78ece SHA512 b66905f4f7b230a266d0b3500066604de1cc9823276ed87f988a487a5d971a93ff7bce3e11727f6e3a9326d05c8b75e613c655c1035958f5b44800227f3a2bd0
-EBUILD jinja-3.0.1.ebuild 1318 BLAKE2B f82bc926f6ff4d0c32b1ddec651cd9c8fe7cb8620fe403f940b03e042eb0df29d935ce22ff5781e345a7dd811d23407d3520840932f73eae3562b450010102fd SHA512 11348fbc645a929ce2fec09c7042558977250930f9811ab464983fcc81846d2d7f729e7d72b480abfba7b0bc11efc8952420fc432ac943a9a2883537afa42a63
+EBUILD jinja-3.0.1.ebuild 1316 BLAKE2B 1e506a9a26eb44ae6d7c9d02afe7367191be6aa679dc69a4e3b1e4f3fc4d8e3412ec87b8ff97f0cd640ac85c80e2f7988f19cdec20f10a92192f2bf4443219e1 SHA512 914d98d07d954f9d47e59290ebdbd2f94aa319101f4588a6a7b90824dcc5e1c3e412b31832f4fea12643396526bd814bdd846bd74e227274365bb4ce5015c985
 MISC metadata.xml 466 BLAKE2B 76540215466d45bb582810d8e8fad3db88cf0ccb7d4340d3ddb2c6c85e3ce552fdfe81517466382db89adf660269711a0fb861cf881487d7e4d1ce474114d6a0 SHA512 3ae5a895f264984d8538551346b7031c712ca244c154ff435847949db29239ca1c7d9ad88f82dd7cdd02ea8906600b6d7f7d4c0c6dec1f025a5d5e1173569c10
diff --git a/dev-python/jinja/jinja-3.0.1.ebuild b/dev-python/jinja/jinja-3.0.1.ebuild
index d44c19383010..b2160c435abc 100644
--- a/dev-python/jinja/jinja-3.0.1.ebuild
+++ b/dev-python/jinja/jinja-3.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 422cac052b74..4cb8e5efaae4 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,3 @@
 DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
-EBUILD jmespath-0.10.0.ebuild 572 BLAKE2B f705aea089881191d94dd923de2999bcd4353f73f501038e7da89bcc28f9973801fea76e480592b7a5e0f93351972d2f4cf1e79a4908573729e67f510618e3cd SHA512 06d57b98863abe0749f7f7be117aea64b48fd2f0a66cc0434bd45e15c57cb71f40c1fb51a6bc3ca98d645681bbbc012e2efb2199d762709fdb83c49f4bb60d76
+EBUILD jmespath-0.10.0.ebuild 568 BLAKE2B c9f93ef1fad9c7913dcbc8c90d724f3ab660f01a0e4830fe770c237f3be4ab03f2e7b0dfc9ae5fd280225c48996b1e2241d380dde6a53da9437caec192513c03 SHA512 b8a988a44c2401ee4812dbdd2d6dcb4626981cbb18f2ae7f88ada8ad6291c588f793c11a4a0f6c429d2bb564ae17f795bfea03a0443249bdcec952a50cd14b05
 MISC metadata.xml 408 BLAKE2B 9181b68543881bbf8c74385b007f757debcdf6e6dc8c92524b8f86eb9ad893a1fc8a23f49e37f68e568ea99eb52580b2f7c40d997705d54fb526ff3235bb941b SHA512 f7f732a0e399f618d1b5fd59211c2f8fd88883ba7f94b40745d46342b7c9ac61cbf47ee8b0938151eb5d5e1191341796c4e2cb89010560fc7468fb632ecbbbaf
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index 2f7ca6851d90..f1018ee7a209 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 1f42868158fa..fd91f371a521 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,3 +1,5 @@
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
+DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
 EBUILD libtmux-0.8.5.ebuild 897 BLAKE2B c85a8896ceef6b29baa93f6a406b6256b635b76c0a3123ed5782a6f2224a2a238a35bc90284fa6bffdf8e80fc92317c60ab4e6cb2ecfbabd6beeac2f1fdcd20e SHA512 296c8a852ef822604240edabb47f029867817f86d6d4f5f0b6046f8edbf9ba9788354864ee921046621681b5942ee371372d1fbd1cd5632ef52459d68035db4f
+EBUILD libtmux-0.9.0.ebuild 977 BLAKE2B cb7b24f0ece2c8d5f7814db0767d54e1fab90789c92a3fa34a020260cef26bf31aaaf51d20480edb188b2d187df2cfdff953b58b81326ce2ebc6173d73379878 SHA512 3767d7932a928e80b6088e58f52e7f14e6810e0b76943b28f65eeac018377d3b9c93c17cb9454f5c3297253a8e79f494a90f37a71d02dac4c28988b3ee3a4c3c
 MISC metadata.xml 343 BLAKE2B 66c3f5a64242dfaf69b7828e9e90de5eb93bd1d95a008cd41b748fe768280678f7be3d9e930690be44fa7f639de589074f056ec4d39bb882fdfff9dbc76f3558 SHA512 897920796a56516a2cd2455e689b364cf92080b65a3f7c0f8b40b56e2f4c1c693a29cd6eca755ff51e3b1b57a8be1136a5648f1ed8857933d6e7e20628eece5e
diff --git a/dev-python/libtmux/libtmux-0.9.0.ebuild b/dev-python/libtmux/libtmux-0.9.0.ebuild
new file mode 100644
index 000000000000..b252f9c9bdae
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.9.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=app-misc/tmux-3.0a"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_{7..9})
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index c6978956cc09..3b9078d1ad92 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -3,5 +3,5 @@ DIST MarkupSafe-2.0.0.tar.gz 18466 BLAKE2B d065eda7f3f2e02abf2d1a9a20c2eb8ed774f
 DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
 EBUILD markupsafe-2.0.0.ebuild 647 BLAKE2B 249f78f4628f85d1d5998373544c70c609d403d9f9a572fd8929dc4ecea7495e7efcae42aee361a037368f9706096788825a44bed25b65b68720e85352c09ca5 SHA512 ccf216823b5eae1fb4572f6163381410e59dbe3a194b76e01456f0c787b59560b5b5c8b75379350980c789e81806b98f71c1c84cb5429fe80b5c4d2daaca4ac0
-EBUILD markupsafe-2.0.1.ebuild 642 BLAKE2B 402e2633d003c2995b059ca49e6320a0351a7d6d9b20779405c639ef8f04f9f1cf8de287ef7efe577deb5db04b77e9f5a367b2ce9a944704ecc88aaef0092e9e SHA512 0bc7d155f9f8af766348b1beea3b531d264f6fefbfc3e96c16749e64ccf91dc5f24e2de41493275be39e0aa4cfa770b5eedf3af7b56c40fef2b0539ec0ef3e40
+EBUILD markupsafe-2.0.1.ebuild 640 BLAKE2B e098d9f416a87a5d738e1ea1affbaa841d9633d010dbe7b4f495bc0b5e3d80ccb886f0355c1b2cf15f44924f81f969cfa3dbfbad7dc798e654116518860267fc SHA512 cf08749deba3267ac033926c1947100b30b80acb6af16cdaa0a34beaf45704b993e9747f426a962b46d629b24dda01d2d29d8e8cd3bfb4c033bac89da643627c
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-2.0.1.ebuild b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
index f44da218e1af..4a294d143e0c 100644
--- a/dev-python/markupsafe/markupsafe-2.0.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 9455f4dc2e71..e2845f585baf 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST pymediainfo-5.0.4.tar.gz 445381 BLAKE2B 37578ba4c748ad7b8fbd435ce8bd4b452812667aec06131b00e27bdc7b50baf10e8d8517e270d1f02eb7c867a278ccf68b3c5f26a588a55c970b79287aabe31d SHA512 0bc231b51e526bf69d10c59085814578c9f5fb542099613ea014484cfb37757413e640332604c01070d5e6bf81564514346400b5a7522864a5755acece2aafa8
 DIST pymediainfo-5.1.0.tar.gz 445630 BLAKE2B debef8de004232c4e39bd17018c447474a4f71bc386b01710bea8084febb5353cb70512ee77c33ea8b3e6c7b67baded99aecb77b60c52da58be35ef91919f34a SHA512 d3c48e37f6d59b0f5bc1d66d4fad9fea26724863dc2ae75a30c80d972f68f3be650298d25105d330c20b83083f94d2ff5e2690c29573897e09afa44931f3228e
-EBUILD pymediainfo-5.0.4.ebuild 856 BLAKE2B a90415d2e99a09fa3e97a7302b41226b0661e066d3a8c1035139ee12d868c226d887e615a50afd67d92cdfe482719a5b85337e151e3157894616801ae7f15ed5 SHA512 e39a604c6b87f487722615d5b8dafe41d1a141ba4d160db7d99fa51918eea7251ac649024a0ca275b5fe40bbabf003b4b317988b87af636f7fed56ef346889e6
-EBUILD pymediainfo-5.1.0.ebuild 858 BLAKE2B fa15308227233b245eecacade0a81878ecbf3afbd74a5c53591052a906b58c65dc2a3ad773b82873ef6bc0b2498afd616b13e79b51cb064b9e2af108c199fe06 SHA512 e28a05a8e94439588ad858b6707d84adb651ddc27418c235d04bfa52a78f30afcd221adaeb70d746a05a3a15c52c57658e60c75c243e1e55901635546009153c
+EBUILD pymediainfo-5.1.0.ebuild 857 BLAKE2B a6141e2daba59432f6bbac7e4469a49cc58f79ec0e77919ad514707aeb83ad1c9fdc712d4b6f4f9a11c9b8691a484ecbd899041a7f814481791a1b9c10591bea SHA512 5ba55956f93155596ad8310c7c0df0810be0f6de402f283291ced49e4610ac5d8e3bf4b589dec543f964675f4a75a6ac7d76dc575d021ce9b6efb771e0208d71
 MISC metadata.xml 490 BLAKE2B af57dd2a5e345a6f7278614b276fc5ff9e9754286e2e24a651f94f18c238a0be6387319fd10d3b3709bdd22509840b9b02344d4bd3c5d196eb2816d41759890d SHA512 10ecb149acb001a0ba8e0e4af45121672f4a683f5e5690cc2d5fb112cc17b45754cf2a3fe303408fd99c16ea57d799829eca56037a2252ab36fddf730a5fa22a
diff --git a/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild b/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
deleted file mode 100644
index 706ecf9e9807..000000000000
--- a/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_7)
-	media-libs/libmediainfo
-"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs dev-python/alabaster
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable tests which requires network access
-	sed -i 's/@pytest.mark.internet/@pytest.mark.skip/' \
-		tests/test_pymediainfo.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild b/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
index 0ad7ac94edd6..2c8bb46a3a7d 100644
--- a/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_7)
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index bd11143e5add..14ba19ad621a 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-testinfra-6.3.0.tar.gz 76309 BLAKE2B 95b4a6ac5ea3c3db2afdd537209bfeb2c188ec7c7935b73e831733fbbf2540b8769d1187338b3b9c9da997cd653e800004e7199537d95530967cd73a15cb2c2e SHA512 ff0add6bdadac92f6f997a94734d69d39598bc8d1f7689a6b269e59bc886825fcf8a42968c2d34a9ad7e77ed0112bf4044afede8e0dca2bbddc76c9c5612ae92
-EBUILD pytest-testinfra-6.3.0.ebuild 880 BLAKE2B b7e518cee07ed714ab245a15890a8c4be7954bdb0166430f962c964f4d13eb8ba77671168a67c2db9dd5a9b923fba8903ae2e9a05110e854fe01bf487debb79b SHA512 af159afef4aef06f0a431cbd33c7f990be07a5a98327ab3416e8bf8058962d2d08740dd15eeb241f188c7fa9373a3c3209e819d2dadb7e9b598fc3ebde8f6d1d
+EBUILD pytest-testinfra-6.3.0.ebuild 894 BLAKE2B 3a4b17c1d33bd23982f78a4797c21e23aa2b54d33f9feba4a19a071954cc69a3143a544b60aa07c46c7a08aa2529cbabf6ef19f083357ab28928a18623ad9a4b SHA512 d58c5fd2fef7b6dea76b52c807c370bf64abdaccef78b6bc401d567d8c257f3f49f06f3d3f79dc89d47031f9da0fd879b5e97070449a2bfe9cb2675cb17b5528
 MISC metadata.xml 679 BLAKE2B 288c8de180a7dca25dd78c05228bc045480fb675a6968f24e35daf4d5b89433d040d0457d8276284019632aaf7fec979e7bf52328d08b4dd9ca1512c00add0a9 SHA512 8163d5d60f43e615e40ccaa4354713765b5a666a802b18373d06cb7d8c7f35a3b2258678f9137d0547916fa766269c5bb21c88f5b43b029e9aa24a9dddfc81f9
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
index 8081571a974a..3f037acb055c 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
@@ -16,9 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+# Ansible is called via its CLI
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		app-admin/ansible[${PYTHON_USEDEP}]
+		app-admin/ansible
 		app-admin/salt[${PYTHON_USEDEP}]
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pywinrm[${PYTHON_USEDEP}]
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index ca3cb06e1936..a490b3d08584 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -1,3 +1,7 @@
+DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef26d5bffcfc9e0c8d9ba105b689654fdce7bf9068f71c49a2ce590f05c16b93c53bbe468fc1a339e7fa489adece2 SHA512 cb027c5478c217f6f8288b42a933665aaf6e59280e7aa88a25f6594e589e34ac2b75734764e331d0889ad9cf0c60b8cbdfa14b01dce023a76870bb21cfc4d926
+DIST resolvelib-0.6.0.tar.gz 16471 BLAKE2B 2cc7b616d1818588070e84f42c195b828f32da374b5cfe16d89ae0e32bf6d8bf0fca37065f570f1ddf4e769b9eab5cc3082ada1a1d907f258e099c45072d3f2c SHA512 7d73d9368783bf5657b95c19470d4e8c444bfce3902fd986f80f5ad44d04f486046113c540c879601bcc29a420630a74117bb5f6b77ad28fed75c94769deeac4
 DIST resolvelib-0.7.0.tar.gz 16439 BLAKE2B 5e48f3b5618b84498ec5646e4ef502c9cf1ba6ec720ea450064983d26c8890a6399839261f92a471bb5f235c6c7d976bd7a1c0e2ccc29ba51c0fdb740ce607a6 SHA512 4cfc4ca58c3308209b4fc5c96e8e379a3ec897943493478cdd5b63a6edc21c7c416877eb3ce12954be98131e5f37a9727d753347414790c625284a8e9dc393ea
+EBUILD resolvelib-0.5.4.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
+EBUILD resolvelib-0.6.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 MISC metadata.xml 746 BLAKE2B 0a3ef5d793c24d91afe9bdbfb7337ebd1653d4d7e281197f66eaac8b934bbceab74e54964feddd2a1d63c56b9c65d19634828cc26bd1be23f533965d646f8db0 SHA512 9062907f4295661308d4a7754aa430ea8f4a1e850d29efe62653615ee91deb4c2cb65c246b16b1032da119e78717684c88aeabd812fc20b2297283ed076e5f0a
diff --git a/dev-python/resolvelib/resolvelib-0.5.4.ebuild b/dev-python/resolvelib/resolvelib-0.5.4.ebuild
new file mode 100644
index 000000000000..2535428a3c16
--- /dev/null
+++ b/dev-python/resolvelib/resolvelib-0.5.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="provides a Resolver class that includes dependency resolution logic"
+HOMEPAGE="https://github.com/sarugaku/resolvelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-python/resolvelib/resolvelib-0.6.0.ebuild b/dev-python/resolvelib/resolvelib-0.6.0.ebuild
new file mode 100644
index 000000000000..2535428a3c16
--- /dev/null
+++ b/dev-python/resolvelib/resolvelib-0.6.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="provides a Resolver class that includes dependency resolution logic"
+HOMEPAGE="https://github.com/sarugaku/resolvelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index d2c2ee11f99a..276a0b81ae93 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1,3 @@
 DIST s3transfer-0.4.2.tar.gz 129664 BLAKE2B fb3658efd7a6aa6ba42ca55a1f9efc19671806fa22db7f6f5a30aaf19615863e027cabd472345637fd41f2c0436ad8f6b034f6bdf75187a71d2c6eacdbdee914 SHA512 8dabdc0d233f6edcf35d9fe1a06b6fd5bb5f589f455d6d53ad989c7eb368cefab4fee90e707bb8fa09f2caac6a27e67ee7aa3ada5709be43f2b649302e412efc
-EBUILD s3transfer-0.4.2.ebuild 613 BLAKE2B 5be8f29dd92acd933b4205960e5d7a1a13ad72ee3eb6d33e8dad820454a4980d0059d189d26e38bcbd81de1d86e1131ce1f3038039768ef6d2efbb559d3e770f SHA512 fea84e43e95e97051f409c97e952731dc72d1a7a3c9fec8bb881f9fff19f4d3ace02fa6e9b7917074a32b145a2c2e80d94429c4ba2c421a8d0c6b11b3b122879
+EBUILD s3transfer-0.4.2.ebuild 608 BLAKE2B d9c4554716475f82c88fdd395453ddf699758b8feff01da7c46e78d5a5d47693cb5fac87944d477931dc793ed557c46d1116f1bab2a4267c7a0e41f7f97fd8b4 SHA512 85cfcff25ba906a8811944990395565104aa009870b8926b1e75e8b89830a775f8f20b36beb07003587625a6452922ab14053e03ec047e59f518e28466da67d2
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/s3transfer-0.4.2.ebuild b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
index b2bb5b6dd9cb..e177fba989ae 100644
--- a/dev-python/s3transfer/s3transfer-0.4.2.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index c162d55ed3cb..fdd6800951fb 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -7,7 +7,7 @@ DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38a
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
 EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B 435e4dcfbef4d0bb3acbbe40222b1b834f2bb5fcf4b62a727f2421015110ec65b8756d38d0d8046d5436756c8523ebdb37eba89f0258404ee45294abf7eac3b4 SHA512 41d6e08dbc381bcb68b40f1d420f11500e0c53e549e68d352840bdc2079ce28c3aad741953c29e1680251df124fd9f84b8aa38bf86b120b881ca1254369ffaaf
-EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1267 BLAKE2B 2ddd285e89a5e78f12c3dfafbdf27c86b9e9ef86a9630df9050eaf2e8ad37657f10f50f19d4a9625b9d5a4833c0784befbf8c7843593b6ab93be97988cdb0a03 SHA512 582e93c7af899c87bb21a861d05cda936d14f9f3cc69d7af975d23ae18e6f54773232c714b215677b48a764faf5b96a04de8487192dcb4c9bf87795a0168f860
+EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1273 BLAKE2B ecfe62a8d9f1ebbf48684f521c04aaa71a703d031a8a4317240e94d317d10010d6ef0dc6e4fc070bfbdfe4e2f7e970b5d9afeb504c06fe29de2620b994583e52 SHA512 771ba99ca306b35ed3abc4f4bc0358e230d4ae0ebde68639ad815e36c0e83db6026264b8e634b06ddc8887d6a657932aad38ce8d4e5dc98d5fc731c8c6d10169
 EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
 EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index 2fb179fd2587..356bd0132b36 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 07d49d1e7cdc..7006f37295df 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -5,5 +5,5 @@ DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.3.ebuild 892 BLAKE2B e4be44b841127430ac9f7fc683b8ad7d088fe51d7579cbda444517be3435ec4051c3568ec030dd4ef6a7332a3e8f4d5550f0b76bf96da00746ba820b8e21fa43 SHA512 871894c2e566a524ce7abb58f7e324def71d0a80871a6aee11c5d37f85455e7121e60b9bee3d25535e23386fd537d06a8e218b8b1c777174c84cd9df6a26ce3f
 EBUILD watchdog-2.1.1.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9
-EBUILD watchdog-2.1.2.ebuild 1044 BLAKE2B 923f8a8d6f7838bdc2080278730e26e133ea1a7ef02f4d9483a9f0f18b9d8042b730b1b60104240d102c7bb44a770b906761ef95c91e739741c89a865919cd3e SHA512 a3e89038c773bb95fd1a78be445f729fe39e3206086200864dcb2d38123581f199842ebbf53b18bc7b83a7f02834f47e8899488c0ee25326651b557fad775f71
+EBUILD watchdog-2.1.2.ebuild 1043 BLAKE2B dcc88e2fa6b6c300b4ee78335ea17a5807fe02ec943a4d9bc180ffa677d0f87fdf417c5781569afbb88369c958bb9a55b963d57c9592a5ca39895d971887a4b6 SHA512 88e48e6398dfc62150f5b27fdfb2562721e5a54006990c1b5f1f336069bf016a964c113655b334de7962d72ed9e15aeb83a6ecba3b0944314a9376c6b58a2e7d
 MISC metadata.xml 462 BLAKE2B b18ac987fd2ea50f8f05f5ada3cf82db92cfedd0e032759b0063407d54acdf3ace017ac4321af37cdcc5a4d2a2872185db22971226aebe1914596e5f8bbbf580 SHA512 46c75850890be381d2d45d00c5118d862aa97ccbac569fa3b44a85d880de2a2c6a6c0d266d518826f4e4206003d2aedc508707258890b60c5e42c2a564459ab2
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
index 5e6bffb365e2..3de398dca868 100644
--- a/dev-python/watchdog/watchdog-2.1.2.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7e170b0387b3..aeea8dbb4fa5 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d7f6297d4961..bb9bf30b5b8d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,8 +11,6 @@ AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551cce
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
-AUX cmake-3.20.2-boost-1.76.patch 1921 BLAKE2B 5590aaf1083792806767bd7ada6d7a97c6c5fd6a4bb17d211589dae1a32d238d7ac98df983eb6a24a7a3277253a9d93e8eda1a237d2d7e1113dc4a7b74df258d SHA512 0f77f0350c296cf98e9f14425e3c822360dcbeda8c4ead5d5e3c2c75d3110fed4bf7df81f1cdd56f18c70a17d6f302771b1a67890599938de62a6716b7ba1eb7
-AUX cmake-3.20.2-sphinx-4.patch 937 BLAKE2B 433693ccca65d8f389bac738217efaa79e8ee2dc6d498df7aea63b6f26aa198ba8923f4c172907b0e6a5a384c2498671e97fcd5850cb1822858d571225eb16a1 SHA512 22215383e98d90cda79396ba9cafbfaba10c43138228d033a89544c5190e4e415fecf541115169f9c062afe6b95ad42b2678f0afefe3af16aff8a8c711558a49
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
@@ -20,11 +18,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b SHA512 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
 DIST cmake-3.20.3.tar.gz 9440009 BLAKE2B 25098305b2fb9d719ffd3a25936207d98901651a6d9c6fe0757d4da3619274021025d7ce9f78b3813826c8b52347f12321db905083839d3882a2ba85a294561c SHA512 ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b
+DIST cmake-3.20.4.tar.gz 9440363 BLAKE2B b04cf6e41878b8626b13516ecbe9d27f0fe801437342217389b739f1549743be10620e06aa521de4ab7b1dcb8f0a8208bf8b3805cca54ac782c320d938c8d9b0 SHA512 f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.2-r1.ebuild 7140 BLAKE2B 7f72a4516fd9f0456698b7f444dc148c3e0b2f6c9c06a63fd9be92873012032c241fcadcb7e4ae1abcf50fb478d136ec095547ab8aeabe3c2d0cae0d46a439ae SHA512 004c1f323dc8a1dec2f9b5c237c636adee77c5dd4aeed8b515ae06fdd9dc61df5ceb8f307b72e2040a99ffd9d7946658ce1fcefb9fcf4b81394256eba757afc9
 EBUILD cmake-3.20.3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.20.4.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.2-r1.ebuild b/dev-util/cmake/cmake-3.20.4.ebuild
similarity index 98%
rename from dev-util/cmake/cmake-3.20.2-r1.ebuild
rename to dev-util/cmake/cmake-3.20.4.ebuild
index 627ca4f7a027..b1cc1455ac6c 100644
--- a/dev-util/cmake/cmake-3.20.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.20.4.ebuild
@@ -70,8 +70,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
-	"${FILESDIR}"/${P}-boost-1.76.patch # bug 791712
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
deleted file mode 100644
index 898f8a75d7e0..000000000000
--- a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 79be37b94e7353ec056e6343ba293ce1b60627d4 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Fri, 7 May 2021 08:51:40 -0400
-Subject: [PATCH] FindBoost: Add support for Boost 1.76
-
-Update the list of known versions.
-
-Run the command
-
-    cmake -DBOOST_DIR=/path/to/boost_1_76_0 \
-      -P Utilities/Scripts/BoostScanDeps.cmake
-
-to extract dependencies from the 1.76.0 source tree.
-They are the same as 1.75's dependencies, so just update
-the version check for warning about newer versions.
-
-Fixes: #22167
----
- Modules/FindBoost.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index f8887ad2be..d31f925cb6 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
-       set(_Boost_TIMER_DEPENDENCIES chrono)
-       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
-       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
--      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
-+      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
-         message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
-       endif()
-     endif()
-@@ -1622,7 +1622,7 @@ else()
-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
-   # _Boost_COMPONENT_DEPENDENCIES.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
--    "1.75.0" "1.75" "1.74.0" "1.74"
-+    "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
-     "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
-     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
--- 
-GitLab
-
diff --git a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
deleted file mode 100644
index dabe39e0b376..000000000000
--- a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bb9c69ed7052614546d34d98a9cf1218e4a45bdc Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Fri, 14 May 2021 10:26:11 -0400
-Subject: [PATCH] Utilities/Sphinx: Update man page config for Sphinx 4
-
-Sphinx 4 by default generates `man/#/foo.#`, but older versions generate
-`man/foo.#` as our install rules expect.  Update our Sphinx config file
-to tell Sphinx 4 to use the old layout.
-
-Fixes: #22192
----
- Utilities/Sphinx/conf.py.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
-index 5def681dc4..c383828bd7 100644
---- a/Utilities/Sphinx/conf.py.in
-+++ b/Utilities/Sphinx/conf.py.in
-@@ -53,6 +53,7 @@ for fpath in cmake_manuals:
-     except Exception as e:
-         sys.stderr.write("ERROR: %s\n" % str(e))
- man_show_urls = False
-+man_make_section_directory = False
- 
- html_show_sourcelink = True
- html_static_path = ['@conf_path@/static']
--- 
-GitLab
-
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 0e4663bd2929..34124aed7a82 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -2,6 +2,8 @@ AUX 2.8-musl-tests.patch 1068 BLAKE2B 804671d01cba50821e63d60dd54154506be03fa8aa
 AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832f7b95bfc66686751f9f2d8b9eef4ef6b7d73f7fe9296d5d04a154b0330f71000065f03412b440c010d44439e6 SHA512 d1a3f447037c4b7408fa20710989b262d37072c4e0552b74e3e25b673f3da4cb0280bbdccfe2e1c97eeb0b318b3923ad9a3d9afab17ba067e7b6755f33ad4f1d
 DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
 DIST gperftools-2.8.tar.gz 928379 BLAKE2B e94bac4153cb5d3170d6486a9065b56d631ab261d25b4a5a150f04f87f767c203508839daf400dbe06dc82e9e3da2988e4b4c74725c6be836fa9c70ed0576209 SHA512 c959ffa2b36ecfea10927b40b6dd668385cff7eab3c4bc2d7c5aed5f4de87ce8e4f9b30ab44652a0288badbb6c5aa7110c491b13c4030fb656609c2eb25918a8
+DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab
 EBUILD google-perftools-2.7-r1.ebuild 2410 BLAKE2B 24f3d8e35ac243ed10d1be42498845a4c462158b56faa4a6c8ae3e18cf4d4ae4c326561d2407e702f9777d39e03b1b889efbf960c3ca64acf0cc118d735f5775 SHA512 fbb6a745414d0fc606a560cd86a9acb60f3b504a3c19128c26e96c8fab67b9ddd6b7138edbfd680f46d8e25662c7eb0c89cc07079a09f2bec1a2f0ae4feef11a
 EBUILD google-perftools-2.8.ebuild 2458 BLAKE2B 54871c3ba0c08bb28b18ee0aab24fca1ad455358d172f738cfee926c7290066b06ab2dc5f08c409eaa86d4b48345a2b4baa6b2db0168ca401185ba6427882bec SHA512 ba816192037a1a8bfad8b1d295fefd29da93ea06e4361c52227b120371d9cb0b5ec9da3f4861671f7ec8335c2811b058b77878553acb98dd7c8bc2d34f995c43
+EBUILD google-perftools-2.9.1.ebuild 2407 BLAKE2B 813d6b48cacb1ce4ac7df91ad5a384ec5d8c3016d7af40b655004793b517399d1b95d1ba1627a95d31000566ca7327f1cd772d1266a5b4ece511ef0adfd305c4 SHA512 cf84b11266564ac2946a1c521b0feedfc497b0c29ee5de7b9f20a16b71c8affc53755c13f3d0b5b39e022ead4f68122d14821e4914443152199c86ea46f0851d
 MISC metadata.xml 1128 BLAKE2B 68fdc3c01ff36a8915e07fbfbead0d1c77522dcda726287603fc77807bf062794d6255c76f53acb1e68ff9c0db7dc2da07e69632480059a814240ceec69d3bd6 SHA512 42b5ba08a7a9b64141352a3c9465f0ecea9a58ef336ede3def57165697832b0ad5b1ac4798aeb37e3ecf3d2bcc5b53f9225f31039ab585eb37d4b59303d741d0
diff --git a/dev-util/google-perftools/google-perftools-2.9.1.ebuild b/dev-util/google-perftools/google-perftools-2.9.1.ebuild
new file mode 100644
index 000000000000..a1f7dcceb6c6
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-2.9.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_P="gperftools-${PV}"
+
+inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="https://github.com/gperftools/gperftools"
+SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# AIX ppc/ppc64
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="largepages largepages64k +debug minimal optimisememory test static-libs"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="!ppc64? ( sys-libs/libunwind )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+	use test || \
+		MAKEOPTS+=" noinst_PROGRAMS= "
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K
+	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
+
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug debugalloc) \
+		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sandbox is enabled."
+			ewarn "See https://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	multilib-minimal_src_test
+}
+
+src_install() {
+	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/gperftools/heap-checker.h
+			/usr/include/gperftools/heap-profiler.h
+			/usr/include/gperftools/stacktrace.h
+			/usr/include/gperftools/profiler.h
+		)
+	fi
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index b9da3607a5bc..db624e2c2534 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index c2474531945a..f4575b612cc8 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,5 +1,7 @@
 AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
+DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
 DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
 EBUILD widelands-0.21.ebuild 1294 BLAKE2B 83dd55f08b40846aa9ccbe6ae4a1a77fe70e4e700978922b2642d5ed1cc19b03300fb5b1ff4046a5c30a1f58b5b799201b93aa5799517099bec4d4d0b642fc8f SHA512 d056e4c495b2279d1d95bdb5e3cfaf141b949c5db661783c08b204e7214e6a73cc780b00c04e93fe813350da3d70dc9b961e71f924a07a2439aca952cb82a475
-EBUILD widelands-9999.ebuild 1429 BLAKE2B 93c6b569fc17dc185cd9d55dba7aed3da6fec188916dd2fbd82b4ed46e582147b6cb321db031a3b4369391c46a20a2b09e98b1543aee8837651176416eaa5620 SHA512 843a18d9a84e599b432b86bfac573b1bdba923edce2517a00b8746b2051e5eacbaa4d103ccfd7118ce36e9f9475faa1d72be8f63f507648e095c3fef4588b0f0
+EBUILD widelands-1.0.ebuild 1357 BLAKE2B 569d0090f1af86933decd1a94000198ebee6249cc9540ed6a29a969df400cb212cb3bf78b4ef47e98dc64269b369073885ed886183ca8762425c1ab53c4cc671 SHA512 3cb9ee60a48c922e1584a75ff255f97ea91c829c0be012c99ed857fb09deb1c7254c4bc2644249df8622a2a1c8c161c1dab28c35591b9347d967889e21a8e3a7
+EBUILD widelands-9999.ebuild 1357 BLAKE2B 569d0090f1af86933decd1a94000198ebee6249cc9540ed6a29a969df400cb212cb3bf78b4ef47e98dc64269b369073885ed886183ca8762425c1ab53c4cc671 SHA512 3cb9ee60a48c922e1584a75ff255f97ea91c829c0be012c99ed857fb09deb1c7254c4bc2644249df8622a2a1c8c161c1dab28c35591b9347d967889e21a8e3a7
 MISC metadata.xml 389 BLAKE2B fe4a764c97dea6a413ad64f616b14f041d94682a5bbb92f02c07506f1c727c1c391fc1beae37c01bd16471a765d8ff5c96badfbfac2ab6647c88db4afa59499f SHA512 4192abec8b668283343c9066c80d89441f7a9491078589a792e9584ab1b9195f443313434350954979acdbfa23c8c048557e1884d18d7d0cac90d63919758dfd
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
new file mode 100644
index 000000000000..180526607235
--- /dev/null
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit xdg cmake python-any-r1
+
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
+else
+	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/icu:=
+	media-libs/glew:0=
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,sound,video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
+)
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
+		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
+		-DGTK_UPDATE_ICON_CACHE=OFF
+		-DOPTION_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 8eede6cd3dea..180526607235 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -14,12 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
 else
-	MY_PV="build$(ver_cut 2)"
-	MY_P="${PN}-${MY_PV}"
-
-	SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 656c80b50594..69c50f049a74 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index cf8ed867535d..d4eedfd6908a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,13 +3,17 @@ AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d3
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.5.10.tar.gz 4621130 BLAKE2B 32a0ef43131c1bff319fb8a159e78a4fd81aba85aa2c8aab3020d575e6216a1e5fb4612a4aa3693b62de5825a29bf5ea1c1870835f033569a5d2d3e494306ef1 SHA512 5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da
+DIST postfix-3.5.11.tar.gz 4621709 BLAKE2B 8c6ed5047790f121b1e248a3c8985c04a95a4071a960376c9a1b31cabdbb6a8b0ee9a378fb813061442c7aad98956ed4917e92155ed3b7ea10369a41eec20d58 SHA512 a1fb3ef8114fc044e9e51af115ffce8c3b3668c1c7123915f728b2b2dadc4418d07af520377512733214e3aae2490d608fd2776de86c5e9300bb29ab92348d6e
 DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
 DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
 DIST postfix-3.6.0.tar.gz 4748506 BLAKE2B f4692500cb78e82cede48d750eb86db61dc67ba1d69d220d24c965b57941402a5bf157b4a69d65133d37ce3d9e1341260d07ebd4477184b3caa56b22fd13b4f5 SHA512 af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf
-DIST postfix-3.7-20210605.tar.gz 4746772 BLAKE2B 1169245101898a6da83a84f524ad34c04567e227b6e71b9292af279d1e70ed3b210e3bd338335836b98d8fa414d8955d1b165f951183b082c603085726114479 SHA512 dde2c6bae572696ea2e761daad75bf33c27c647d98fe8efc799b48e7945fe531386968516a34b636cac6ff8d25f6c1ecca5ba92718be22b824129c0d1821e1ef
+DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
+DIST postfix-3.7-20210612.tar.gz 4747624 BLAKE2B 1e1dd5969885c8af6f4c59bfd0c0860b64c372ba5662a89a4e39800054c3077a9bb85c2bab262173bd22a7ed02b4c7b6d53971a74a589655250da398851babe8 SHA512 a539a912ae679450e8f19a24593d4a4f70409c266b14404743dffdc9ecd7b843e414dcb84c47f15bdb0b754c06b65d3aa6b7bbc037db56c4339f9da762896099
 EBUILD postfix-3.5.10.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
+EBUILD postfix-3.5.11.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.5.8-r1.ebuild 8693 BLAKE2B e0ca3baeabcb4b0e703115c6839b4b0e0d75c789421c8fbd0aaeccff22630f797f11e5b8cc5ae1f09d21773f257a5edc117392b377d9c743e5de62cf42289540 SHA512 7ff76d64ab024375f4d015634898f1f8475d349ed9718c40e02ffad2abddfb32676b076168bc0bdb35f78b4e95df596d1fd286b95b9d5a7fb57d4c8188dd46b2
 EBUILD postfix-3.5.9-r1.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.6.0.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
-EBUILD postfix-3.7_pre20210605.ebuild 7984 BLAKE2B 8ff4ea5764bf32b9950ec05d0128bd86f37a2379d97112863c56b55f7d823c4d1d96053c35235b707c92d4b3bec8307ce401d386cc9ebd1661b1a6725e52ad02 SHA512 0f06f240cdbb600cedac028f95f12e35562d88dd1bfebce4d750458ec8c207441ade65838931b986140d4dc148dd8189c2fd78ff7afc8b1b8199a4df6020b476
+EBUILD postfix-3.6.1.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
+EBUILD postfix-3.7_pre20210612.ebuild 7984 BLAKE2B 8ff4ea5764bf32b9950ec05d0128bd86f37a2379d97112863c56b55f7d823c4d1d96053c35235b707c92d4b3bec8307ce401d386cc9ebd1661b1a6725e52ad02 SHA512 0f06f240cdbb600cedac028f95f12e35562d88dd1bfebce4d750458ec8c207441ade65838931b986140d4dc148dd8189c2fd78ff7afc8b1b8199a4df6020b476
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.11.ebuild b/mail-mta/postfix/postfix-3.5.11.ebuild
new file mode 100644
index 000000000000..e68677152aa4
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.5.11.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.6.1.ebuild b/mail-mta/postfix/postfix-3.6.1.ebuild
new file mode 100644
index 000000000000..96598ffacec1
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.6.1.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.7_pre20210605.ebuild b/mail-mta/postfix/postfix-3.7_pre20210612.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.7_pre20210605.ebuild
rename to mail-mta/postfix/postfix-3.7_pre20210612.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c3cd4f798aa7..ad1e60b6eeaa 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 2b49aeab7df2..c583fe403ad8 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,9 +1,8 @@
-AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
-DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
 DIST alembic-1.8.0.tar.gz 860886 BLAKE2B eccb1c74e90094a9b473ecb66260714a519110c20b18248c4fc5ecff5edf2b424b303764f80ee76333e588e85a92499d75a8104b972ccd142cc26532fd89df30 SHA512 23fc881863741f7fd081342f5c53c1ec3d00ab300ba8cd10e4a659ee820a9ed1244cf7cf2fd40482f6be32b9d7df44128363246e942bd03c802f3a2a81533b57
 DIST alembic-1.8.1.tar.gz 861482 BLAKE2B fd23e6b080dbfd689fe0d63e1cf815cd26dda0624181b4b536e81a59c497d4f22481db1206d8fb140734d90a24f06f2892b6fbd9c57cb81c5fa2d700f3bd4aab SHA512 895493f36c895aef0675e1300ee3bbbf1b8819b4978b842c48810078e51219423500f74014eafe357a318a755ffa8c5c17c2c806b4216bab6cd334908bf684a4
-EBUILD alembic-1.7.16.ebuild 1252 BLAKE2B e05bd0776543434d0375db0574660f939b9e8a30da1066b4399775554dadce0e9cfe06abc571357c373bb3176b6d07dd8d0566ab2558fc9456686e7e678fbf58 SHA512 4c24d13e574f8ff4572e61bf6de62eccdf07a3cfa7f5887b18a170c55fde542a9dac3dea9bdab733ca0ddd1f53961e971c18a2d4e52e5ed30c7f5472b6597c0a
+DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217
 EBUILD alembic-1.8.0.ebuild 1297 BLAKE2B 532e1266cc1bc0be96e2c8951d6f54bca5ee55bf6ad822529361bf98c5cb254fc7c7b08ad1881f292d8da58d82b0ddf740942a2d12dbf4387542747eef161672 SHA512 49699ced65a5a8d40613e8d0af72bd4d42309dcea2acd0474298a5ede4422fef27adc5fbe0443042405dda2af7611d92ab2b4163d7f1c40650e270558efbb14f
 EBUILD alembic-1.8.1.ebuild 1235 BLAKE2B 0ba9f4f0d4b59b5f6cf9f94522ab3d1c18dd426c4124c4e95c19db8067d742c2ebce0260705b7d0b5de883df1f7ad5671f8949d94d694cddcd8fb603f8d3c027 SHA512 93f4f680498c5e1c291c8647e80624e4f3915090201667d4c1100c9bf1f1362914fd2510608e8b6d459341b43fd166cf42b0579863f65c36b095d55449f29290
-MISC metadata.xml 895 BLAKE2B 4529e89d7ecc7b70e768104a6200fffbbcb42786f15c963aba54a3697d78cfe7006d7d2e7063a1efe2958ac651c5c2175b1aae2e2c3f6cb29c7eaba7de9d6b1c SHA512 5677c55df82cabd36468d0dc458dda3684304168bbe5eb9d229bba98e58e17e4f24db12ae56a8844f4dce87fe38bf42159d73e96c3e62a96f77f3ead15db851d
+EBUILD alembic-1.8.2.ebuild 1235 BLAKE2B 0ba9f4f0d4b59b5f6cf9f94522ab3d1c18dd426c4124c4e95c19db8067d742c2ebce0260705b7d0b5de883df1f7ad5671f8949d94d694cddcd8fb603f8d3c027 SHA512 93f4f680498c5e1c291c8647e80624e4f3915090201667d4c1100c9bf1f1362914fd2510608e8b6d459341b43fd166cf42b0579863f65c36b095d55449f29290
+MISC metadata.xml 823 BLAKE2B a7aa430883c5db2c17c75688d7c52bb3bfb21859d272d4171e3730f0d414e84b84cbc39c119a6c770fd0b1849489825ac826da62ceb4bad1a33b67f982904d47 SHA512 9f73afcf88484bc7958259bf91218f21cf7212405123dd52764a807b829b8d71602804fe698ee541a54d0771fd8b82b92bcc40b6598229bef2b11277df8da7c9
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
deleted file mode 100644
index 674a8240cfd0..000000000000
--- a/media-gfx/alembic/alembic-1.7.16.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multiprocessing
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="hdf5 test zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="hdf5? ( zlib )"
-
-RDEPEND="
-	>=media-libs/openexr-2.5.0:=
-	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_SHARED_LIBS=ON
-		# C++-11 and thus {shared,unique,weak}_ptr are common nowadays, so these
-		# are no longer needed and using boost fails. Options will get removed by
-		# upstream soon
-		-DALEMBIC_LIB_USES_BOOST=OFF
-		-DALEMBIC_LIB_USES_TR1=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=OFF
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/alembic/alembic-1.8.2.ebuild b/media-gfx/alembic/alembic-1.8.2.ebuild
new file mode 100644
index 000000000000..d6553f86e84f
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.8.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+# either pyilmbase or imath need to be keyworded for arm{,64} to re-add
+# python / pyalembic support
+IUSE="examples hdf5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		>=dev-libs/imath-3.0.1
+		>=media-libs/ilmbase-2.5.5
+	)
+	hdf5? (
+		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
+		>=sys-libs/zlib-1.2.11-r1
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.0-0001-set-correct-libdir.patch" )
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_BUILD_LIBS=ON
+		-DALEMBIC_SHARED_LIBS=ON
+		# currently does nothing but require doxygen
+		-DDOCS_PATH=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		# TODO: needs imath keyworded for arm{,64}
+		-DUSE_PYALEMBIC=OFF
+		-DUSE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch b/media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch
deleted file mode 100644
index ec3c01d10764..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From a867fa646d7af98fe57c9d6c96a407e648fbca24 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 16:39:50 +0200
-Subject: [PATCH 5/5] Fix install locations
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt                   | 8 ++++----
- arnold/Procedural/CMakeLists.txt | 2 +-
- bin/AbcConvert/CMakeLists.txt    | 2 +-
- bin/AbcDiff/CMakeLists.txt       | 2 +-
- bin/AbcEcho/CMakeLists.txt       | 2 +-
- bin/AbcLs/CMakeLists.txt         | 2 +-
- bin/AbcStitcher/CMakeLists.txt   | 2 +-
- bin/AbcTree/CMakeLists.txt       | 2 +-
- lib/Alembic/CMakeLists.txt       | 4 ++--
- maya/AbcExport/CMakeLists.txt    | 2 +-
- maya/AbcImport/CMakeLists.txt    | 2 +-
- prman/Procedural/CMakeLists.txt  | 4 ++--
- python/PyAlembic/CMakeLists.txt  | 4 ++--
- 13 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 51a95d7..0622613 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
-index 69e00da..027e646 100644
---- a/arnold/Procedural/CMakeLists.txt
-+++ b/arnold/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicArnoldProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL ( TARGETS
-   AlembicArnoldProcedural
-diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
-index 451409c..5b41a14 100644
---- a/bin/AbcConvert/CMakeLists.txt
-+++ b/bin/AbcConvert/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
- 
- set_target_properties(abcconvert PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcconvert DESTINATION bin)
-diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
-index 511864a..c9cf482 100644
---- a/bin/AbcDiff/CMakeLists.txt
-+++ b/bin/AbcDiff/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
- 
- set_target_properties(abcdiff PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcdiff DESTINATION bin)
-diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
-index be5f5c1..3020041 100644
---- a/bin/AbcEcho/CMakeLists.txt
-+++ b/bin/AbcEcho/CMakeLists.txt
-@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
- 
- set_target_properties(abcecho abcechobounds PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
-diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
-index 815f84f..cd216e4 100644
---- a/bin/AbcLs/CMakeLists.txt
-+++ b/bin/AbcLs/CMakeLists.txt
-@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
- 
- set_target_properties(abcls PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcls DESTINATION bin)
-diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
-index a963420..5882287 100644
---- a/bin/AbcStitcher/CMakeLists.txt
-+++ b/bin/AbcStitcher/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
- 
- set_target_properties(abcstitcher PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcstitcher DESTINATION bin)
-diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
-index b4f65f1..841e1d2 100644
---- a/bin/AbcTree/CMakeLists.txt
-+++ b/bin/AbcTree/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
- 
- set_target_properties(abctree PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abctree DESTINATION bin)
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index e4d33cb..e43dcce 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -85,7 +85,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
-     TARGET_LINK_LIBRARIES( Alembic atomic )
- ENDIF()
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
-         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -118,7 +118,7 @@ EXPORT(TARGETS
-     Alembic::
-     )
- 
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
-     "Where to install the Alembic's cmake files")
- 
- INSTALL(FILES
-diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
-index 50d2fd2..b4ce46d 100644
---- a/maya/AbcExport/CMakeLists.txt
-+++ b/maya/AbcExport/CMakeLists.txt
-@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
- 
- set_target_properties(AbcExport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcExport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
-index 6826183..5a5efad 100644
---- a/maya/AbcImport/CMakeLists.txt
-+++ b/maya/AbcImport/CMakeLists.txt
-@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
- 
- set_target_properties(AbcImport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcImport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..c774c2a 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -60,10 +60,10 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicRiProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS
-     AlembicRiProcedural
-     DESTINATION
--    prman/procedurals
-+    $ENV{RMANTREE}/lib/plugins
- )
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index af8dcb5..90f7428 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -141,7 +141,7 @@ IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE A
-     )
- 
-     SET( ALEMBIC_PYTHON_INSTALL_DIR
--        lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         CACHE PATH
-         "Alembic's python bindings install directory"
-     )
-@@ -156,7 +156,7 @@ IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE A
- 
-     set_target_properties(PyAlembic PROPERTIES
-         INSTALL_RPATH_USE_LINK_PATH TRUE
--        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- ELSE()
-     MESSAGE(FATAL_ERROR "Unable to find Python libs")
- ENDIF()
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 3c7f24c84661..364da7938657 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -16,7 +16,6 @@
 <use>
 	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
 	<flag name="test">Build and run the test-suite</flag>
-	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
 </use>
 <upstream>
 	<bugs-to>https://github.com/alembic/alembic/issues</bugs-to>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ded2f18a3da9..5d16283cfc4b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,13 +1,8 @@
-AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
-DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
-DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
-DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
-EBUILD darktable-2.6.2.ebuild 3451 BLAKE2B cbc98737fe7778c37a2637708e34a48cc71d1803652a0585c6110b4468b73d962cc3cb347b2929d5e3ce344b24e2be9b449f5ad555275be90c6b93d9b8313481 SHA512 dfbb22a74bdfb6d6001f32313e954240546a376fae19f489e0530e0dd6f37e3a5fbf39e1ea4144b97403fed2d4e69d67cf7ebe01c2d53f363a0adfa4303ea567
 EBUILD darktable-3.4.1.ebuild 4412 BLAKE2B 402c0e8f4cc2c299e8a2a7b425002993eda544735302c4482c4f4d9fe6b605eaa6c14671e41674c8d64312c1406ff2d59a53a762e28bcfbc40f954c12fcd34e5 SHA512 bd292ddf983f2b23e3f0140e2f7d8d0ce84ce2b1e6dd41945ff9f6657f00e583eafdd60da5e6bb34c23d1d8eaadfa279fc0b0b7a38c5e11600abc2bd189a5e11
 EBUILD darktable-9999.ebuild 4407 BLAKE2B 41e9636ef86761982a80ddd449ee45ef28a7904f751061cafdd68b91fcac28242e581adfc3873ddb86ac534127a2b49611db3560956e4126ef574233cef34f44 SHA512 46111450051510f2de6ce1694978ab36268d9680e82de016feddd40fff0bff470ae5572415493982e6fb68ee62e63ba82655c315244b0a578144e7186e72426d
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
deleted file mode 100644
index dbca73f7b5f2..000000000000
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-gcc9.patch.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${WORKDIR}"/"${P}"-gcc9.patch
-	"${FILESDIR}"/"${P}"-exiv2-0.27.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "when updating from the currently stable 1.6 series,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
diff --git a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
deleted file mode 100644
index c0eb59bc639d..000000000000
--- a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 556887d7a973bdf0611fcc57231e107b503d9949 Mon Sep 17 00:00:00 2001
-From: Bertrand Antoine <nexus6b@gmail.com>
-Date: Wed, 22 May 2019 21:49:59 +0200
-Subject: [PATCH] Fix build with exif2 >= 0.27
-
----
- tools/basecurve/exif-wrapper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
-index 72550721f6..f4d4d46e12 100644
---- a/tools/basecurve/exif-wrapper.cpp
-+++ b/tools/basecurve/exif-wrapper.cpp
-@@ -17,6 +17,7 @@
- */
- 
- #include <exiv2/exif.hpp>
-+#include <exiv2/error.hpp>
- #include <exiv2/image.hpp>
- 
- #include <cstdio>
\ No newline at end of file
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index bf8360050d3c..feb70da4b2fd 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -8,6 +8,6 @@ AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAK
 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
 EBUILD freecad-0.19.1.ebuild 9240 BLAKE2B f8dd7d7a0a04699a2fef44fbb204f5ba95b304aa851743aba899a1a80228bd8896c8ca9d20fe85ea4ebaf6e38fab5c94db619aa12c1cecb7b8534514b138ecca SHA512 2a9a5edc12a38413043f57762d6e1d8b622abbaa594f27db7711388b055f02b247854e56d2a92612165e35360f82e285cf924947c6bbf675b9dd95063012338f
-EBUILD freecad-0.19.2.ebuild 11045 BLAKE2B ea1dff90bb4e9aaaaf16d8d67db8f1076003105f771ce2ee0101b87443f7e1d9414a44dc302d2b6ad3881378ed99dea84dc8731d97dc94da318252b2f8f66bab SHA512 d5aaef2a1d591a4f4c1bf419f2cdec029129e017ce6ae3bfe937b8250eea9c7741c459ba848ea5580151e417b5e08b46d18ddefdacc1bb49b7b86f3dd392bff1
+EBUILD freecad-0.19.2.ebuild 11022 BLAKE2B bebf8ded5e6a01c7ecf6fbfccd7fd6021515c635bccee5cdb6cdbfb816f1760acc2d456acd7cda5250f67a5e1bad1eb9b0ba99e0ff33ccdbbbd868f4856a6b23 SHA512 ba650e428be060f07252cfa7b96772a072841ceae2db29dc26f5600926eb40470f7f34f78fb537d7de851bdc5a6d76f8128fe23259ffe44466b614f529d08c02
 EBUILD freecad-9999.ebuild 10999 BLAKE2B 5599d2539df1c00804d441d0b1ba0a8b4860194585e573395dcc051e21e2685a47303a4b947b8c32978de16cb9ec52eb25e29bde5269b60deac035257ee307a0 SHA512 ba5e260db5d825e803906551accec9b6407aa91979c11c687932488bf1625953ab5dcfb6b1702e19b89b70ec7f1b58312e0ea681a6ca9eaf82d2549ce1bd54d3
 MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild
index dcceebb859a0..a2a32823f67d 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
@@ -69,7 +68,7 @@ RDEPEND="
 	sci-libs/flann[openmp]
 	sci-libs/hdf5:=[fortran,zlib]
 	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/opencascade:=[vtk(+)]
+	<sci-libs/opencascade-7.5.2:=[vtk(+)]
 	sci-libs/orocos_kdl:=
 	sys-libs/zlib
 	virtual/glu
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 54566aeb31da..af12927b61b4 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index f89a01f6162f..2a2edae30e67 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,4 +1,6 @@
+AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689bb66b7abcd93552a6a87aed0a8677c5d1352944071f3621b6298d27bcad0e02dfe54c2abf386396e71fae2b923747dae5999684 SHA512 8aae4dc353f6299e7790743694d7c67ddaba1cc02a8cba81a36962112f3a0ecbf4e078ef27d5d3c28bf779fbfdc6e5c3935ca5437ccfcf84b3e2e5ed5cba1f63
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
 EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+EBUILD libao-1.2.2-r2.ebuild 1679 BLAKE2B d139b11c2bf71a9ac4899a148d167d537f471ab34ab5f87e576888700d781fe9ddf8822492bc8cd0b707c00f7a020433a05ca3faa81f1878e535e52a405ec15a SHA512 21b1fdba34f3a1ea88a52e8687df9053a549985f2366897c1c5a04951701a15a72ac52a9e2e46328d13efae4b52aba6d3504328adc1a9d42e191188bf5edc8a8
+MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813
diff --git a/media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch b/media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch
new file mode 100644
index 000000000000..7c1e6895fc2b
--- /dev/null
+++ b/media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch
@@ -0,0 +1,43 @@
+From f1ef6b4b11080a98d622b6a6c657be5a3a9aae2f Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Tue, 15 Jun 2021 08:41:08 +0200
+Subject: [PATCH] configure.ac: Put sndio and OSS behind AC_ARG_ENABLE
+
+This allows to avoid automagic dependencies
+---
+ configure.ac | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0e53752..2f34123 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -266,8 +266,11 @@ AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
+ dnl Check for OSS
+ 
+ have_oss="no";
+-AC_CHECK_HEADERS(sys/soundcard.h, have_oss=yes)
+-AC_CHECK_HEADERS(machine/soundcard.h, have_oss=yes)
++AC_ARG_ENABLE(oss, [  --disable-oss          disable OSS output plugin ])
++if test "x$enable_oss" != "xno"; then
++  AC_CHECK_HEADERS(sys/soundcard.h, have_oss=yes)
++  AC_CHECK_HEADERS(machine/soundcard.h, have_oss=yes)
++fi
+ AM_CONDITIONAL(HAVE_OSS,test "${have_oss}" = "yes")
+ 
+ 
+@@ -321,7 +324,10 @@ AM_CONDITIONAL(HAVE_SUN_AUDIO,test "${have_sun}" = yes)
+ dnl Check for libsndio audio
+ 
+ have_sndio="no";
+-AC_CHECK_HEADERS(sndio.h, have_sndio=yes)
++AC_ARG_ENABLE(sndio, [  --disable-sndio        disable sndio output plugin ])
++if test "x$enable_sndio" != "xno"; then
++  AC_CHECK_HEADERS(sndio.h, have_sndio=yes)
++fi
+ AM_CONDITIONAL(HAVE_SNDIO_AUDIO,test "${have_sndio}" = yes)
+ 
+ dnl Check for roaraudio
+-- 
+2.31.1
+
diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..b3bfad6d156f
--- /dev/null
+++ b/media-libs/libao/libao-1.2.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib multilib-minimal
+
+DESCRIPTION="The Audio Output library"
+HOMEPAGE="https://www.xiph.org/ao/"
+#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
+#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="alsa nas mmap pulseaudio sndio"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${P}-automagic_sndio_oss.patch
+)
+
+src_prepare() {
+	default
+	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-arts
+		--disable-esd
+		--disable-static
+		$(use_enable alsa alsa)
+		$(use_enable mmap alsa-mmap)
+		$(use_enable nas)
+		$(use_enable pulseaudio pulse)
+		$(use_enable sndio)
+		--disable-oss # present only in overlays
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS CHANGES README TODO
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libao/metadata.xml b/media-libs/libao/metadata.xml
index c870d0eef0ab..ea193e38f4d1 100644
--- a/media-libs/libao/metadata.xml
+++ b/media-libs/libao/metadata.xml
@@ -5,4 +5,7 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<use>
+	<flag name="sndio">Add support for <pkg>media-sound/sndio</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index add64f63eba6..522c4cc7f72d 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,6 +1,4 @@
-DIST liblscp-0.9.2.tar.gz 689968 BLAKE2B 1b78389a764a58e47b24676a4b4cd6ada7647ef1bc16e9d63a7fe6ad6b62870521ec39eef866b862e07fad55baacb3f0814293858dcdaa6bcd6d8a94d600e780 SHA512 e0d6f2ae3679cf41b1bc8f04910614424d3bbc046e51272a9d526429d098b0e674dccd5951482fd85832d9788a74eeefce99d1d81291e3829c077c98bcb87602
 DIST liblscp-0.9.3.tar.gz 696509 BLAKE2B a3cddd07f55522291be12f2952eafd0b9761ac8c3d38c05010d9ca6593ef9db62d9bdd7a1e8f31d74fd9cbd29cbe3ade71f3b51ffa330780a0b7feb18ff71d32 SHA512 e776b0d48a9728e69b1a198d44ab88862366ecece293d71f6552ab395fd33bfdc395dbea6f56000c2ef9897ba00e0e287b0bc042fd6b6bdc1b4864b72b20753e
-EBUILD liblscp-0.9.2.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
-EBUILD liblscp-0.9.3.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
+EBUILD liblscp-0.9.3.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
 EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.9.2.ebuild b/media-libs/liblscp/liblscp-0.9.2.ebuild
deleted file mode 100644
index 515fa9bdea37..000000000000
--- a/media-libs/liblscp/liblscp-0.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org"
-SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
-https://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/liblscp/liblscp-0.9.3.ebuild b/media-libs/liblscp/liblscp-0.9.3.ebuild
index 8d147da49de0..515fa9bdea37 100644
--- a/media-libs/liblscp/liblscp-0.9.3.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.3.ebuild
@@ -10,7 +10,7 @@ https://download.linuxsampler.org/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c1241ed8c606..22c334bd5095 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index de3a89d63f62..07c080b60d89 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,8 +1,6 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
 AUX din-50.2-gcc11-rename-identifier.patch 1207 BLAKE2B 336f06a9e4baf9e7dcb44c86c40adef61caa2ea231d695e59720e600d2fba9c7f788be63c18b135ebefcfda879ea067b633066c80a7f9b8bb501c0c31bbbe16f SHA512 2496ac4026b70f0c3b00adcf3b295ddb77c25e10f436b0222432536f0a5d3efd1d5a8df4d5ba15643c7c29323e2d25dcd197649815e90c11e19fb28dd6a8eedc
-DIST din-50.1.tar.gz 3684686 BLAKE2B 3d73f31f91a57188b63f1f5fc9a68923c4fb6d9a14cbfd602510d0006ff4079ab60865e49118a02e46381aebd4cc4ee9415172bac724f8491655326147b6466b SHA512 c860c70bb9f3c3db66e05dd9f9048daecab1b0c9d0588fde901ce26723e291b56d23086f792180fb5fc688165e4ed7efdc302d0d3d02efa913be5f2d4a90f5eb
 DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
-EBUILD din-50.1.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
 EBUILD din-50.2.ebuild 1145 BLAKE2B ad96be1ff43ee274ffc8d7605024888952ea6f2cdf9dc8c11dd27b6192d065bf7e4e66cfeff4abdcc2514934ebe55795a33f185f59c81f147e95540a21edba8e SHA512 1050c39d47fbf190f35f410220a5c38f637c32d7bda5fd33efb896df8fc2ee2348a52f084b3f8261b912a7869008fb1a13fb0f901d9c9f13e26ba3baf285f34e
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-50.1.ebuild b/media-sound/din/din-50.1.ebuild
deleted file mode 100644
index f2a1cb085d4b..000000000000
--- a/media-sound/din/din-50.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-49.1-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 3647931b739a..f144e70c7271 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,3 @@
-DIST qtractor-0.9.21.tar.gz 1945423 BLAKE2B 8c76966695e6054cd0d3743313f50de1bf4f741dfaad0d60f41ae87bd531ce394d11c7fc719c75ee159bf0bf7dd3037679cb93d7d4295132a7dc2fa6d89a786e SHA512 12d823c4efd557709d83e0e5ace6cb84ac066a0eddbfdbac0dbaf6b75e6bbe37c0e3548270e80fb89f318c58db4b0ebad95daac989eb7d6b8f82b8cc7ccc3a3c
 DIST qtractor-0.9.22.tar.gz 1946367 BLAKE2B 7d53d9a31f6d9df6bdeb19d4d5687ec3037842ecfcd4e1ae167a541ade301c4cee1f1bda68c9186ec8d5f0e879c80f636536b5acd51137f4be783f5892d377be SHA512 80e5dae7c38b95719ca16997022529dfbd5c51af209b54f819098299d2798677b6238dc9eaaf664cdf2437facda3757e39472ca74636eeddbb5e1f0f28a78b2c
-EBUILD qtractor-0.9.21.ebuild 2456 BLAKE2B 36c9e63143b085897618b492a94a7539281959d12ae8618192e915dbd28c368409fb6f5460b5856404b25505080b72b10d6b6fc0747a3e0bfb60003d81fa3d27 SHA512 c34b4164cb5a367caf9fd2e7e5ab7743b11b4e5c517ab30b0b4844c39bbd1212e8a09394b8984c09bab05de31405f6f871a5f32c2cc183746e26f497e4d0b879
-EBUILD qtractor-0.9.22.ebuild 2458 BLAKE2B 5636da8bb06ebdbb61bbf36fef5874196fa98acbad31fe83fee09a139726a1ea2a426f5a2bb9b7771845b3a7e6b180cf0f9534773e7f4d44221321dd3612f423 SHA512 e28098e49f0a53fe5e779b65e604f7b40489060a5a4186669d7543e0b89e07fd6976599a8d87bb791a2fe98f3676ed76ecede7d0d7317c52281f874753917614
+EBUILD qtractor-0.9.22.ebuild 2456 BLAKE2B 36c9e63143b085897618b492a94a7539281959d12ae8618192e915dbd28c368409fb6f5460b5856404b25505080b72b10d6b6fc0747a3e0bfb60003d81fa3d27 SHA512 c34b4164cb5a367caf9fd2e7e5ab7743b11b4e5c517ab30b0b4844c39bbd1212e8a09394b8984c09bab05de31405f6f871a5f32c2cc183746e26f497e4d0b879
 MISC metadata.xml 890 BLAKE2B 449553d45029499af8d185e9e524674f035841e5e36fc7acb8781c82b4cd8f804c87075dae592481294835cddef2a40dbbbd7f9ca7e507e6191680b25d19eef9 SHA512 bf1fc12e5da4b1106ee3a84d510c255fc9b4ab9f1a59c1827b1f81df3ede0cbd0916f5cb95d04872b7771ddc03058ea6d7a16c826e4bb5afe42438f0347b8486
diff --git a/media-sound/qtractor/qtractor-0.9.21.ebuild b/media-sound/qtractor/qtractor-0.9.21.ebuild
deleted file mode 100644
index 77a9466a3449..000000000000
--- a/media-sound/qtractor/qtractor-0.9.21.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic cmake xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=0
-		-DCONFIG_VST=0
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/qtractor-0.9.22.ebuild b/media-sound/qtractor/qtractor-0.9.22.ebuild
index 56455102cfda..77a9466a3449 100644
--- a/media-sound/qtractor/qtractor-0.9.22.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 6eaf161e118c..1ed422cc4dc3 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.0.tar.bz2 466517 BLAKE2B 9fee766b71ad7f9cd96f9dfd859dc31434f14c913c75f5a8e76c66150522dbf04c6e28582269d1603c6d53d6db436e9e7f73cab1172c0d6b004cc71edccb21c8 SHA512 b3e1e40792661c1e4ce3a5274513b4b75742ca861a6233c2653d6df90b7a89e086d15a4196d59c7021c48e9e2aae83116ba29c3395960179d602f0cb06c1f608
 DIST vmpk-0.8.3.tar.bz2 481537 BLAKE2B 985609c3a9ac69b29ac40dd6a71132d0f429d7961d306caf1f77e9e5b510e8b5af8f996febf87df8dfde02ee486cecbb1ef412dd3ba718dc3f793771230e5988 SHA512 829121a9f7bbbe73a9882c9f569204e4096c57c1c7dc7ba22949a35d3fe104028ba7e259fc2163d2711f31f8adfd52c4ec95bfc78ae9b35574835c1b404183ca
-EBUILD vmpk-0.8.0.ebuild 908 BLAKE2B aca2539550492fbb5a379a7d3e6b9f81f241f4a17df342836d718b9df7e0ab6fd2e7d29485dd4d537a3e0b44bc69e81d65101d72583c08ff7cd6e182ccaab6db SHA512 0138b45e35d4c8ff15e6647656255b25965b56141ad46ceba6d4b72db150f8526e8d3da26be5d2226615f18412e302eae4b9ed48f7dd324f0162450ddcec21c5
-EBUILD vmpk-0.8.3.ebuild 902 BLAKE2B 096ba5ac32644adbcd1be030ad996fbc30ab412c5049ba0a6feba4862da96e1a8bd203af871c71493bf360d0b06410e20147acdb808cbc44817636f2ec34cc86 SHA512 312b15206dda76d9315492a4c9651af13b0086ea8be993d28eb3b8d5f440d3be489539136e2c2f8a2ce027fadab934ce084aed24757101ab119f65e467994682
+EBUILD vmpk-0.8.3.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild b/media-sound/vmpk/vmpk-0.8.0.ebuild
deleted file mode 100644
index 7d6762defdb4..000000000000
--- a/media-sound/vmpk/vmpk-0.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-2.0.0
-	x11-libs/libxcb
-	dbus? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=$(usex dbus)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
-}
diff --git a/media-sound/vmpk/vmpk-0.8.3.ebuild b/media-sound/vmpk/vmpk-0.8.3.ebuild
index 8c7430f56134..7865aa398687 100644
--- a/media-sound/vmpk/vmpk-0.8.3.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 33894727f923..33391ac649e6 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 960a3e0ca1c5..1fc7a1839e21 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jun 2021 06:09:09 +0000
+Tue, 15 Jun 2021 19:09:02 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7afdbd1acc02..bf52f71b2909 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 509049 BLAKE2B e2b5c0e25d30cb613bf6b26a404bdd5c9ecf1ebe0f765c98e65b5c6abb8c3367dc1f4e8d19e68c1568e7e055e9c4617562aea2e0f52899586498178621fa32fa SHA512 460ef918d52020ec8e54fc6c17e54e0f11f0e50117f6c87479422f3fc3f4face3581664544e8cbcb8fc1265b88f7145a0e90a36cd8e1acef5b7908d625bdb379
-TIMESTAMP 2021-06-15T06:09:13Z
+TIMESTAMP 2021-06-15T19:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDIRAlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDI+tNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDvBA//WEyeTjrXSfM2O+paL6Q+zjZwx8rbvKwgPJRUUvm13wGUwAu77kU4jk0h
-yqCuDt99tP+j1ApZNxilun2/MW7YtwjZ+PSElWoSLIEJMtotab9piC5t+TTa3pKf
-tXuSpcxyenfQSpRQxN0LDkojdBlGIsz00tJTaXnIkJIqyfUbQoy/67m/7jp5ThzD
-+W46K29Q0J76ay+KwdRYMLraUn4F0+4R395fMRWnysO/79PXMuQD4fpdcgHzPrTr
-R/t8IzakC7EAXafuu8kF43ynAjOqMOSzOa3kM7MiwvNkI6eBYp+H1z6oVNsNijMg
-5dgPyN+hQJZV8dB3cODJ+IfzxrB92YD8toSQqGOfEKGWFO7b9q7CeOo5Yefy3x4s
-X95q14hp+Op+P5qsoVh4XpD+YW1kiMblNmB31xD2nNfZ2DDRz9YkQ4OfZw0obu98
-1NaglJKGLq5VQ+3QIxuGq/hsSS5UcyyO2U0mYseqv2hyA33fB7WY1DrXJfCkEkC4
-dsIMpoUON5VBVsTzznJfKQ4Nx2+ipN0gUfruKAtwf6WyPE/RXnZFzgq8co9pa98Y
-zph2VNBe9OqzxLr8Icd6SlPuD+uq6eY8+eqWPwYHsAlGVgOV6eWI56l57npOt/Iq
-Z5zWUJ9cZMyM/bgogFp6jWWcGLrKTHNcvZgBlDWlndO8aQEw+9I=
-=h+rq
+klCMbA//VfPGe9LsFBOcw6qxsk0SdmYQdTHaCABVv7RgRtj9Mwq67O9Ix6L/4+tD
+ru6kMfoD+L1xTj1WRIFBzsKcH9rEOjdp5oQ3IzlngPHoDRbgNawAcIEmOjPGOV9A
+YE8EVei9ZKmK0IsvR26dQuHk8eJRtDV8r3zmSS5kJAhaWk0uRWadVcE7faURzcB4
+G+4JiFAme3uiKIivI5uvBOw1jgMfEvS2ECGwEEqJ7qePvPX9kXqYQC6SZxojMm20
+qksu804vp9dr9/jf+4i8XSLS+N/IJLr8b3SV8od18L33eWezBL0WcfSTfiH3fJ8C
+OkxzXhxG+io+zl5G3MOetGsJAzMeIIB3VJI8HA/Nq3DRcvrQo6gnQkRrl4BkBc9V
+1d25TrGdGkntKFKdqdyt5yO8+KbFJJ8dnkLJpmy9BTRP4Eq+Qm4hLX4Ew0gfK+35
+O1N54QIPV7bDOsuPDlSaXBCJ7YMGEdC3vkj8bvi1NPdudQAYnXtc0EluG8aFJnfJ
+4JF93qQLfjQsedh/EACdJKcfIWoXLq7edQWaI4rYzr3PCry4I6Toqw0EMVOhVtI8
+pOVCaMih5mZ8f3eKtWsgKVCPG7TWLeyfoxBiszRWFtiuWplMt//fOSeq1Wd+W14+
+s3t8ezfYqfDxCeHItMQikcd3Ft/IBpgNX7rF/odYZ/FwW3v6nSk=
+=I+r9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 960a3e0ca1c5..1fc7a1839e21 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jun 2021 06:09:09 +0000
+Tue, 15 Jun 2021 19:09:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6f50c93e59d6..851117e78fe8 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 6952bfe847d3..29153072a6de 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.7 b/metadata/md5-cache/app-admin/ansible-2.10.7
index 4f36d9cd9afa..8f29db3d88f2 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.7
+++ b/metadata/md5-cache/app-admin/ansible-2.10.7
@@ -1,16 +1,16 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-admin/ansible-base test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <app-admin/ansible-base-2.11 test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh <app-admin/ansible-base-2.11 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh <app-admin/ansible-base-2.11 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2965d192c3dc02133d79867f73324d97
+_md5_=796048c74255f34773fed50e2ae59aca
diff --git a/metadata/md5-cache/app-admin/ansible-2.11.1 b/metadata/md5-cache/app-admin/ansible-2.11.1
deleted file mode 100644
index 5cefa0757543..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/resolvelib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/resolvelib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cecc5f50b715d2a7db22cfd79876f0b7
diff --git a/metadata/md5-cache/app-admin/ansible-4.1.0 b/metadata/md5-cache/app-admin/ansible-4.1.0
new file mode 100644
index 000000000000..69ab3a869019
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=>=app-admin/ansible-base-2.11.1 <app-admin/ansible-base-2.12 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-4.1.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dd91958933833e6d85078810a1938624
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
deleted file mode 100644
index 33f14c472c5a..000000000000
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=65174ee205daee1123a42904a8ac8793
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.1 b/metadata/md5-cache/app-admin/ansible-base-2.11.1
new file mode 100644
index 000000000000..3c4a34df6ddf
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.1.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=20c8011f43e4321515cf107ad28a549e
diff --git a/metadata/md5-cache/app-admin/ansible-base-9999 b/metadata/md5-cache/app-admin/ansible-base-9999
new file mode 100644
index 000000000000..811e3822dfbd
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-base-9999
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+LICENSE=GPL-3
+PROPERTIES=live
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=20c8011f43e4321515cf107ad28a549e
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.32.1 b/metadata/md5-cache/app-admin/syslog-ng-3.32.1
new file mode 100644
index 000000000000..244a8eb4f879
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.32.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
+DESCRIPTION=syslog replacement with advanced filtering features
+EAPI=7
+HOMEPAGE=https://syslog-ng.com/open-source-log-management
+IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.32.1/syslog-ng-3.32.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5b598720480e06f2fea26bd26c35277a
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index c5fd2b0ff2fd..4891b77a2625 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1 b/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
new file mode 100644
index 000000000000..e5b8f00d2186
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
+EAPI=7
+HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=FDL-1.3
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=mirror://gnu/vera/vera-1.24.tar.gz
+_md5_=786c928b8e4157abe08ef64bca7bf3d5
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 12acdd31adab..8a7bcf6beaa8 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/gummi-0.8.2 b/metadata/md5-cache/app-editors/gummi-0.8.2
new file mode 100644
index 000000000000..033e453d477a
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gummi-0.8.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm
+DEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 x11-libs/pango
+DESCRIPTION=Simple LaTeX editor for GTK+ users
+EAPI=7
+HOMEPAGE=https://github.com/alexandervdm/gummi
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 x11-libs/pango
+SLOT=0
+SRC_URI=https://github.com/alexandervdm/gummi/releases/download/0.8.2/gummi-0.8.2.tar.gz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=874ce54e47250a92fcdac22205257340
diff --git a/metadata/md5-cache/app-editors/nano-5.3-r1 b/metadata/md5-cache/app-editors/nano-5.3-r1
deleted file mode 100644
index e896376f41c0..000000000000
--- a/metadata/md5-cache/app-editors/nano-5.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=7
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify magic minimal ncurses nls slang +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
-REQUIRED_USE=!ncurses? ( slang? ( minimal ) ) magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d497817171e6750a84e254e73558eee2
diff --git a/metadata/md5-cache/app-editors/nano-5.8 b/metadata/md5-cache/app-editors/nano-5.8
new file mode 100644
index 000000000000..edc8ef28ea7d
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-5.8
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
+REQUIRED_USE=magic? ( !minimal )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.8.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=266ae1743ec51e3bad8fc968c417430a
diff --git a/metadata/md5-cache/app-editors/vscode-1.57.0 b/metadata/md5-cache/app-editors/vscode-1.57.0
new file mode 100644
index 000000000000..dfd95089afc9
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscode-1.57.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
+EAPI=7
+HOMEPAGE=https://code.visualstudio.com
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://update.code.visualstudio.com/1.57.0/linux-x64/stable -> vscode-1.57.0-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.57.0/linux-armhf/stable -> vscode-1.57.0-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.57.0/linux-arm64/stable -> vscode-1.57.0-arm64.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d66722b7ef1832393e371e785fa70f75
diff --git a/metadata/md5-cache/app-editors/vscodium-1.57.0 b/metadata/md5-cache/app-editors/vscodium-1.57.0
new file mode 100644
index 000000000000..1f7c84a1e572
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscodium-1.57.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
+EAPI=7
+HOMEPAGE=https://vscodium.com/
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 net-print/cups x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.57.0/VSCodium-linux-x64-1.57.0.tar.gz -> vscodium-1.57.0-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.57.0/VSCodium-linux-armhf-1.57.0.tar.gz -> vscodium-1.57.0-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.57.0/VSCodium-linux-arm64-1.57.0.tar.gz -> vscodium-1.57.0-arm64.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=784419342a1516dd1d8019f328c5c506
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 0832d5f519a1..1bcf72e22dd2 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/jpipe-0.0.1 b/metadata/md5-cache/app-misc/jpipe-0.1.3.1
similarity index 57%
rename from metadata/md5-cache/app-misc/jpipe-0.0.1
rename to metadata/md5-cache/app-misc/jpipe-0.1.3.1
index 76afc066210a..be3808ae3caa 100644
--- a/metadata/md5-cache/app-misc/jpipe-0.0.1
+++ b/metadata/md5-cache/app-misc/jpipe-0.1.3.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python implementation of the jp CLI for JMESPath
 EAPI=7
 HOMEPAGE=https://github.com/pipebus/jpipe
-IUSE=jp-symlink test python_targets_python3_8 python_targets_python3_9
+IUSE=jpp jp-symlink test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=jp-symlink? ( !app-misc/jp ) dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=jpp? ( !app-misc/jp[jpp] ) jp-symlink? ( !app-misc/jp[jp] ) dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/j/jpipe/jpipe-0.0.1.tar.gz
+SRC_URI=mirror://pypi/j/jpipe/jpipe-0.1.3.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=81842490f8f9e40aeb61b7211652c5bf
+_md5_=32c29ac3a4d4c8d7d8008dcbc6c37f74
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.1 b/metadata/md5-cache/app-misc/rpick-0.8.1
deleted file mode 100644
index 048712e18a35..000000000000
--- a/metadata/md5-cache/app-misc/rpick-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Helps you pick items from a list by various algorithms
-EAPI=7
-HOMEPAGE=https://github.com/bowlofeggs/rpick
-IUSE=debug
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/alga/0.9.3/download -> alga-0.9.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/approx/0.4.0/download -> approx-0.4.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.3/download -> assert_cmd-1.0.3.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/byteorder/1.4.2/download -> byteorder-1.4.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/csv/1.1.5/download -> csv-1.1.5.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.10.0/download -> downcast-0.10.0.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fragile/1.0.0/download -> fragile-1.0.0.crate https://crates.io/api/v1/crates/generic-array/0.13.2/download -> generic-array-0.13.2.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.2.4/download -> matrixmultiply-0.2.4.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/mockall/0.9.1/download -> mockall-0.9.1.crate https://crates.io/api/v1/crates/mockall_derive/0.9.1/download -> mockall_derive-0.9.1.crate https://crates.io/api/v1/crates/nalgebra/0.19.0/download -> nalgebra-0.19.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.7/download -> predicates-1.0.7.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_distr/0.4.0/download -> rand_distr-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.4.3/download -> regex-1.4.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.1/download -> rpick-0.8.1.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.123/download -> serde-1.0.123.crate https://crates.io/api/v1/crates/serde_derive/1.0.123/download -> serde_derive-1.0.123.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/statrs/0.13.0/download -> statrs-0.13.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=cargo	7a8c7ca59987a0dfb53f3c68656d2c3c	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8e102bb8609df6c6bb67ef60b9852ec2
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.4 b/metadata/md5-cache/app-misc/rpick-0.8.4
new file mode 100644
index 000000000000..9163c4f77276
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rpick-0.8.4
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Helps you pick items from a list by various algorithms
+EAPI=7
+HOMEPAGE=https://github.com/bowlofeggs/rpick
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.4.0/download -> approx-0.4.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.4/download -> assert_cmd-1.0.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.4/download -> crossbeam-utils-0.8.4.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.10.0/download -> downcast-0.10.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fragile/1.0.0/download -> fragile-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.1/download -> matrixmultiply-0.3.1.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mockall/0.9.1/download -> mockall-0.9.1.crate https://crates.io/api/v1/crates/mockall_derive/0.9.1/download -> mockall_derive-0.9.1.crate https://crates.io/api/v1/crates/nalgebra/0.26.2/download -> nalgebra-0.26.2.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_distr/0.4.0/download -> rand_distr-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.4/download -> rpick-0.8.4.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/simba/0.4.0/download -> simba-0.4.0.crate https://crates.io/api/v1/crates/statrs/0.14.0/download -> statrs-0.14.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=cargo	7a8c7ca59987a0dfb53f3c68656d2c3c	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3ae37f5749cc2b1add0a0ba1e3ebc910
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.8.1 b/metadata/md5-cache/app-misc/tmuxp-1.8.1
new file mode 100644
index 000000000000..deece7ccf212
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmuxp-1.8.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !dev-python/flaky ) test? ( >=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] <dev-python/libtmux-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=tmux session manager. built on libtmux
+EAPI=7
+HOMEPAGE=https://tmuxp.git-pull.com
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] <dev-python/libtmux-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.8.1.tar.gz -> tmuxp-1.8.1.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8185af6b1cd9a8dc29a7ad1076bb7e91
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 7b848f771d22..d8d3335d9005 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r4 b/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r4
index a11d19941fe0..2cbe126fd8de 100644
--- a/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r4
+++ b/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r4
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( >=app-doc/doxygen-1.3.6 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib:= ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) doc? ( >=app-doc/doxygen-1.3.6 )
+DEPEND=sys-libs/zlib:= ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) )
 DESCRIPTION=C++ library offering portable support for system-related services
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/commoncpp/
-IUSE=debug doc examples gnutls ipv6 ssl static-libs
+IUSE=debug doc examples gnutls ipv6 ssl
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib:= ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) )
 SLOT=0
-SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.8.1.tar.gz
+SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.8.1.tar.gz https://dev.gentoo.org/~soap/distfiles/commoncpp2-1.8.1-patches-r1.txz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2d575b25a286df37a263633c25a6dca3
+_md5_=1d8f22adfaca45447007cbb90fa5cdb4
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 1598cca09f57..4aa269992f66 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902-r1 b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902-r1
new file mode 100644
index 000000000000..e3575ad08dce
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=test? ( || ( ( dev-lang/python:3.10 dev-util/cram[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-util/cram[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/cram[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) )
+DESCRIPTION=Convenient & cross-platform sandboxing C library
+EAPI=7
+HOMEPAGE=https://github.com/Snaipe/BoxFort
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Snaipe/BoxFort/archive/ac0507b3f45fe58100b528baeb8ca04270b4a8ff.tar.gz -> boxfort-0.0.1_pre20200902.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d8b7872adeb34d2dd8dbf99dfa178731
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.0-r1 b/metadata/md5-cache/dev-libs/cereal-1.3.0-r1
new file mode 100644
index 000000000000..65d955f25200
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/boost )
+DESCRIPTION=Header-only C++11 serialization library
+EAPI=7
+HOMEPAGE=https://uscilab.github.io/cereal/
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz -> cereal-1.3.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd287c2ff3a14fbbb182d7c1a3034ce8
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4_pre20210114 b/metadata/md5-cache/dev-libs/criterion-2.4_pre20210114
new file mode 100644
index 000000000000..62dbe073b7c1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/criterion-2.4_pre20210114
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:= dev-libs/boxfort test? ( || ( ( dev-lang/python:3.10 dev-util/cram[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-util/cram[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/cram[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) )
+DESCRIPTION=Cross platform unit testing framework for C and C++
+EAPI=7
+HOMEPAGE=https://github.com/Snaipe/Criterion
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2 MIT ZLIB
+RDEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Snaipe/Criterion/archive/4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz -> criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz -> nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9486a12c70a1bc9e0435a1ecdda3805e
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
index 31e5daabe4f5..1b3af7db48f2 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
@@ -5,7 +5,7 @@ DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
 IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-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
+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
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r3-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=89534e0fa5e8e62bb889f07d378138d6
+_md5_=423495010e6a6f70ae82a859c85a5e3a
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.5 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.5
index 8579f2fde0ca..fa2be59ce0a5 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.5
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.19.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
 EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.5.tar.gz -> tree-sitter-0.19.5.tar.gz
 _eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d842a75bf762b69b4f217c670a0639fb
+_md5_=c4229fafa4d9cf5624fc7e373c67d272
diff --git a/metadata/md5-cache/dev-libs/tvision-2.1.0_pre2-r4 b/metadata/md5-cache/dev-libs/tvision-2.1.0_pre2-r4
deleted file mode 100644
index cd13056ea837..000000000000
--- a/metadata/md5-cache/dev-libs/tvision-2.1.0_pre2-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Text User Interface that implements the well known CUA widgets
-EAPI=6
-HOMEPAGE=http://tvision.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/tvision/rhtvision_2.1.0-2.tar.gz
-_md5_=751a1ab64f7cf787db0bbc2e8f7af6f3
diff --git a/metadata/md5-cache/dev-libs/tvision-2.2.3 b/metadata/md5-cache/dev-libs/tvision-2.2.3
new file mode 100644
index 000000000000..377a39970bda
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tvision-2.2.3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libbsd media-libs/allegro:0[X] sys-apps/util-linux sys-libs/gpm sys-libs/ncurses:0= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxcb:=
+DESCRIPTION=Text User Interface that implements the well known CUA widgets
+EAPI=7
+HOMEPAGE=http://tvision.sourceforge.net/
+IUSE=examples nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libbsd media-libs/allegro:0[X] sys-apps/util-linux sys-libs/gpm sys-libs/ncurses:0= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxcb:=
+SLOT=0
+SRC_URI=https://github.com/set-soft/tvision/releases/download/v2.2.3/rhtvision-2.2.3.src.tar.gz -> tvision-2.2.3.tar.gz
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=793a000b706b971b2ec40548069a0f89
diff --git a/metadata/md5-cache/dev-perl/App-Cmd-0.333.0 b/metadata/md5-cache/dev-perl/App-Cmd-0.333.0
index e8db64a04600..53d17d0b866f 100644
--- a/metadata/md5-cache/dev-perl/App-Cmd-0.333.0
+++ b/metadata/md5-cache/dev-perl/App-Cmd-0.333.0
@@ -5,11 +5,11 @@ DESCRIPTION=Write command line apps with less suffering
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/App-Cmd
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.130.0 virtual/perl-Carp >=dev-perl/Class-Load-0.60.0 dev-perl/Data-OptList >=virtual/perl-Getopt-Long-2.390.0 >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/IO-TieCombine dev-perl/Module-Pluggable dev-perl/String-RewritePrefix dev-perl/Sub-Exporter dev-perl/Sub-Install virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.333.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=1349fbb59311f0b9a93b5fefa9306407
+_md5_=ad63dbcfda274e018405c1fb60bcb483
diff --git a/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.380.0 b/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.380.0
index 39b903a7da69..0fdb4a1ec253 100644
--- a/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.380.0
+++ b/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.380.0
@@ -5,11 +5,11 @@ DESCRIPTION=API wrapper around the 'tar' utility
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Archive-Tar-Wrapper
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which dev-perl/IPC-Run dev-perl/Log-Log4perl virtual/perl-File-Path app-arch/tar dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.38.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=780437191e81bfe158a310b79194f53d
+_md5_=3fce99ce3d231511868fed95b80b18c5
diff --git a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15 b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15
index 2c59ac78a8ac..8124aa830d3e 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15
+++ b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15
@@ -5,11 +5,11 @@ DESCRIPTION=upload things to the CPAN
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/CPAN-Uploader
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=5b79d79860c2831c66cc75682d34fedc
+_md5_=d170c507f047e8604b653379436f1885
diff --git a/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0 b/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
index 26e5744114bf..8f4181e03d5d 100644
--- a/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
+++ b/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=Choose appropriate clone utility
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clone-Choose
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~hppa
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Runtime virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=f65417b5e864bf1e892fe33f7cfb4b17
+_md5_=fc51ae0f6ac1df35f0c7b6a9c11f108a
diff --git a/metadata/md5-cache/dev-perl/Clone-PP-1.80.0 b/metadata/md5-cache/dev-perl/Clone-PP-1.80.0
index 696b0541924f..b86f8f3bf680 100644
--- a/metadata/md5-cache/dev-perl/Clone-PP-1.80.0
+++ b/metadata/md5-cache/dev-perl/Clone-PP-1.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Recursively copy Perl datatypes
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clone-PP
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=a6b8d76370903f81a30898bad62dca9d
+_md5_=ce4ff8a5eccc1496147657d65bd74966
diff --git a/metadata/md5-cache/dev-perl/Config-INI-0.25.0 b/metadata/md5-cache/dev-perl/Config-INI-0.25.0
index d6d64c54617f..e61033614fa8 100644
--- a/metadata/md5-cache/dev-perl/Config-INI-0.25.0
+++ b/metadata/md5-cache/dev-perl/Config-INI-0.25.0
@@ -4,11 +4,11 @@ DESCRIPTION=simple .ini-file format
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Config-INI
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.105.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=aae6bf8a7aac33ff64e261aaf9c43908
+_md5_=6522b403eeb450a669c655675f62b167
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-2.200.12 b/metadata/md5-cache/dev-perl/Config-MVP-2.200.12
index 4dc8d6b9a88d..afa4e31104d0 100644
--- a/metadata/md5-cache/dev-perl/Config-MVP-2.200.12
+++ b/metadata/md5-cache/dev-perl/Config-MVP-2.200.12
@@ -5,11 +5,11 @@ DESCRIPTION=multivalue-property package-oriented configuration
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Config-MVP
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=e49f844d258c6f8c2300fc8fc2851262
+_md5_=16ff0538500413f2f9ff76f64a900600
diff --git a/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0 b/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
index 335a7ea6fc41..f25072c5d2ec 100644
--- a/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
+++ b/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
@@ -5,11 +5,11 @@ DESCRIPTION=Merges arbitrarily deep hashes into a single hash
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Hash-Merge
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~hppa
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Clone-Choose-0.8.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HE/HERMES/Hash-Merge-0.302.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=ecabc371efea09793c2c941ea66d5ffb
+_md5_=df77e8366d708f0f4e56339768cd949f
diff --git a/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0 b/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
index 1141f2344c11..d9f17218ba9d 100644
--- a/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
+++ b/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=produce tied (and other) separate but combined variables
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/IO-TieCombine
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=002066876bcd314fb866572e9e6a3471
+_md5_=4915386b46f418486974b2e2752121d5
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index c2333cc5d915..480d5300b9a6 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0 b/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
index 78eed8b980b8..9c5d88ef43eb 100644
--- a/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
+++ b/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
@@ -4,11 +4,11 @@ DESCRIPTION=write your linewise code for handles; this does the rest
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mixin-Linewise
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-IO dev-perl/PerlIO-utf8_strict dev-perl/Sub-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=a4a9bd4ff00b2201f260415e026b3a42
+_md5_=6ffb3d92d03eaf0fec6498d73a68c890
diff --git a/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0 b/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
index 88a889899989..8c71a5eb8110 100644
--- a/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
+++ b/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=teach ->new to accept single, non-hashref arguments
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MooseX-OneArgNew
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose >=dev-perl/MooseX-Role-Parameterized-1.10.0 dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=dc66a2bba1ad5b2a51666fdd8955e221
+_md5_=418e438f2df8175d430ef1ed0d67adc7
diff --git a/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0 b/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
index a901ed69569f..cdc5f12aea63 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
@@ -4,11 +4,11 @@ DESCRIPTION=Roles with composition parameters
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MooseX-Role-Parameterized
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/MooseX-Storage-0.460.0 virtual/perl-Carp dev-perl/Module-Runtime >=dev-perl/Moose-2.30.0 dev-perl/namespace-autoclean >=dev-perl/namespace-clean-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=e764b8c0b00b24f61137e519810ec072
+_md5_=e250982b8e41e2a6c537854600353ab2
diff --git a/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0 b/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
index d67b04292806..a29eb35e3577 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
@@ -4,11 +4,11 @@ DESCRIPTION=Roles which support overloading (DEPRECATED)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MooseX-Role-WithOverloading
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-0.940.0 dev-perl/aliased >=dev-perl/namespace-autoclean-0.160.0 >=dev-perl/namespace-clean-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=b251ad2cac0f3da8cde62bc25ca46950
+_md5_=b09f068d1953e5e92630f949277b4b3a
diff --git a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0 b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
index 5bba80b4007d..88ad7153ea66 100644
--- a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
+++ b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=a thing with a message method
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Role-HasMessage
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-perl/MooseX-Role-Parameterized dev-perl/String-Errf dev-perl/Try-Tiny dev-perl/namespace-clean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=5ab145147cc354946d84f675f4cfd44b
+_md5_=3b1c5e35f8dbee7e8abec1eb0efabcb2
diff --git a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0 b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
index 2e7704a7847a..f1a34198a925 100644
--- a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
+++ b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=a thing with a list of tags
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Role-Identifiable
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=e8ef27d41a042ebdb0878acf1410a3de
+_md5_=a6e0b27b8825ca8e2bc9dd674c3f37f8
diff --git a/metadata/md5-cache/dev-perl/String-Errf-0.8.0 b/metadata/md5-cache/dev-perl/String-Errf-0.8.0
index f40b3ced112b..d5e232311619 100644
--- a/metadata/md5-cache/dev-perl/String-Errf-0.8.0
+++ b/metadata/md5-cache/dev-perl/String-Errf-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=a simple sprintf-like dialect
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/String-Errf
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Params-Util virtual/perl-Scalar-List-Utils >=dev-perl/String-Formatter-0.102.81 dev-perl/Sub-Exporter virtual/perl-Time-Piece virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=8fb4a0061f843ad88d130c73a8a38572
+_md5_=a7f1ab03a25a3f14e25d241659ba4f97
diff --git a/metadata/md5-cache/dev-perl/String-Formatter-0.102.84 b/metadata/md5-cache/dev-perl/String-Formatter-0.102.84
index 307c5d22c63c..70a6e166c840 100644
--- a/metadata/md5-cache/dev-perl/String-Formatter-0.102.84
+++ b/metadata/md5-cache/dev-perl/String-Formatter-0.102.84
@@ -4,11 +4,11 @@ DESCRIPTION=build sprintf-like functions of your own
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/String-Formatter
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Params-Util dev-perl/Sub-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=aff9777d0ed434c9c9456202524327ab
+_md5_=535542dc6805a2c82beb5a0c15ebee20
diff --git a/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0 b/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
index f0b4f1576887..cf9f513558c3 100644
--- a/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
+++ b/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Rewrite strings based on a set of known prefixes
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/String-RewritePrefix
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=f14c514176beaae6dad7fd74ab4b7074
+_md5_=bb7812863f5e760bb6e9a5d98876973b
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b5545a26ddde..51c671baf8c2 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/anyio-3.1.0 b/metadata/md5-cache/dev-python/anyio-3.1.0
index de7defe03cc8..b43f541ca1ae 100644
--- a/metadata/md5-cache/dev-python/anyio-3.1.0
+++ b/metadata/md5-cache/dev-python/anyio-3.1.0
@@ -8,8 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyio/anyio-3.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5b83dcfcd2262a76d5fae0f696a34b13
+_md5_=9047c15c16ad323f54c3d1bd3b1775e9
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.78 b/metadata/md5-cache/dev-python/boto3-1.17.78
index 8f6c30058405..171fdbda36e1 100644
--- a/metadata/md5-cache/dev-python/boto3-1.17.78
+++ b/metadata/md5-cache/dev-python/boto3-1.17.78
@@ -4,7 +4,7 @@ DESCRIPTION=The AWS SDK for Python
 EAPI=7
 HOMEPAGE=https://github.com/boto/boto3
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.20.78[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.17.78.tar.gz -> boto3-1.17.78.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=46c8d0555e336ddb31d316e2c2240ba9
+_md5_=3d7acee0cf444278aad392f0f887544a
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.78 b/metadata/md5-cache/dev-python/botocore-1.20.78
index 41b1e44e2878..b225dd717ba5 100644
--- a/metadata/md5-cache/dev-python/botocore-1.20.78
+++ b/metadata/md5-cache/dev-python/botocore-1.20.78
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, data-driven core of boto 3
 EAPI=7
 HOMEPAGE=https://github.com/boto/botocore
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.20.78.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a619dff0518dfc72ec8f1b630729dade
+_md5_=47da559343e5be0a684ab6022d3766b4
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.23.1 b/metadata/md5-cache/dev-python/dbusmock-0.23.1
new file mode 100644
index 000000000000..7a8ff335979c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dbusmock-0.23.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easily create mock objects on D-Bus for software testing
+EAPI=7
+HOMEPAGE=https://github.com/martinpitt/python-dbusmock
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.23.1/python-dbusmock-0.23.1.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d05fa4488e299437b8246e0ca7b1095f
diff --git a/metadata/md5-cache/dev-python/diskcache-5.2.1-r1 b/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
index d0296c14b827..da2956eff180 100644
--- a/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
+++ b/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Disk and file backed cache
 EAPI=7
 HOMEPAGE=http://www.grantjenks.com/docs/diskcache/ https://github.com/grantjenks/python-diskcache/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-diskcache/archive/v5.2.1.tar.gz -> diskcache-5.2.1.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bd39d316e0f241f1f20b13995bbd3ee4
+_md5_=ecdf8bb5f202f78c3cd9ecc3c6e119fc
diff --git a/metadata/md5-cache/dev-python/fasteners-0.16.3 b/metadata/md5-cache/dev-python/fasteners-0.16.3
index 1f305935b910..c353ae4c8d1b 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.16.3
+++ b/metadata/md5-cache/dev-python/fasteners-0.16.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python package that provides useful locks
 EAPI=7
 HOMEPAGE=https://github.com/harlowja/fasteners/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/harlowja/fasteners/archive/0.16.3.tar.gz -> fasteners-0.16.3.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5ee825207239886c0020f553d36cceaa
+_md5_=a637ed9098bd765dea06f686ba90b71e
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.04.0 b/metadata/md5-cache/dev-python/fsspec-2021.04.0
deleted file mode 100644
index fac8dec99870..000000000000
--- a/metadata/md5-cache/dev-python/fsspec-2021.04.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A specification that python filesystems should adhere to
-EAPI=7
-HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.04.0.tar.gz -> filesystem_spec-2021.04.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f9fa9ab3550cd045d5fda3bcbd420123
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.05.0 b/metadata/md5-cache/dev-python/fsspec-2021.05.0
index 73f12d8b94d4..e633a9549ffb 100644
--- a/metadata/md5-cache/dev-python/fsspec-2021.05.0
+++ b/metadata/md5-cache/dev-python/fsspec-2021.05.0
@@ -4,7 +4,7 @@ DESCRIPTION=A specification that python filesystems should adhere to
 EAPI=7
 HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.05.0.tar.gz -> filesystem_spec-2021.05.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f972bc261f78c43953a9ff9331bf8968
+_md5_=f9fa9ab3550cd045d5fda3bcbd420123
diff --git a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1 b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
index 48c92a96faf0..98792260bbe3 100644
--- a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
+++ b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx theme used by Guzzle
 EAPI=7
 HOMEPAGE=https://github.com/guzzle/guzzle_sphinx_theme
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/sphinx-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=afd746b0f7ba6733412b91d789b3c571
+_md5_=1b0c42f6842f23f97ed93125460a939b
diff --git a/metadata/md5-cache/dev-python/jinja-3.0.1 b/metadata/md5-cache/dev-python/jinja-3.0.1
index 0da7acf8d159..ae0be64d3393 100644
--- a/metadata/md5-cache/dev-python/jinja-3.0.1
+++ b/metadata/md5-cache/dev-python/jinja-3.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A full-featured template engine for Python
 EAPI=7
 HOMEPAGE=https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=dev-python/markupsafe-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !dev-python/jinja:compat python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/3.0.1.tar.gz -> jinja-3.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=08b3ad385bf822cde44ff991c0f2c9ac
+_md5_=f8b2f33a893064f1e943984ea440f95b
diff --git a/metadata/md5-cache/dev-python/jmespath-0.10.0 b/metadata/md5-cache/dev-python/jmespath-0.10.0
index 7cd53211ea19..ae43b4e48672 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.10.0
+++ b/metadata/md5-cache/dev-python/jmespath-0.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=JSON Matching Expressions
 EAPI=7
 HOMEPAGE=https://github.com/jmespath/jmespath.py https://pypi.org/project/jmespath/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmespath/jmespath.py/archive/0.10.0.tar.gz -> jmespath.py-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2615849b21002f62ba32be78cf224013
+_md5_=a8986ff4dbc9efc40445377dd46200ec
diff --git a/metadata/md5-cache/dev-python/libtmux-0.9.0 b/metadata/md5-cache/dev-python/libtmux-0.9.0
new file mode 100644
index 000000000000..264a86cae6d4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libtmux-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-python/pathlib2[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/pathlib2[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=python api for tmux
+EAPI=7
+HOMEPAGE=https://libtmux.git-pull.com/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.9.0.tar.gz -> libtmux-v0.9.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=024e36247c12e970e91beab6d2c8bec4
diff --git a/metadata/md5-cache/dev-python/markupsafe-2.0.1 b/metadata/md5-cache/dev-python/markupsafe-2.0.1
index 9f6f1483556b..d15aba16ae74 100644
--- a/metadata/md5-cache/dev-python/markupsafe-2.0.1
+++ b/metadata/md5-cache/dev-python/markupsafe-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Implements a XML/HTML/XHTML Markup safe string for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/MarkupSafe/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-2.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c8ade0e2390e349f8cb31a2fd5b192d2
+_md5_=cd131e56ff8b07679cbaed90613f0564
diff --git a/metadata/md5-cache/dev-python/pymediainfo-5.0.4 b/metadata/md5-cache/dev-python/pymediainfo-5.0.4
deleted file mode 100644
index 21cf52b4f309..000000000000
--- a/metadata/md5-cache/dev-python/pymediainfo-5.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9[xml(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[xml(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[xml(+)] dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) media-libs/libmediainfo >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A wrapper around the mediainfo library
-EAPI=7
-HOMEPAGE=https://github.com/sbraz/pymediainfo
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) media-libs/libmediainfo python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-5.0.4.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6fed94824b4a9fdc4cfa7ea63c37980d
diff --git a/metadata/md5-cache/dev-python/pymediainfo-5.1.0 b/metadata/md5-cache/dev-python/pymediainfo-5.1.0
index d5233fb36932..25d5ff6d9a38 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-5.1.0
+++ b/metadata/md5-cache/dev-python/pymediainfo-5.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around the mediainfo library
 EAPI=7
 HOMEPAGE=https://github.com/sbraz/pymediainfo
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) media-libs/libmediainfo python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-5.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1094f831e3a2101e67aa405a1bd210de
+_md5_=1645ee344eff8a25f4beb1bff6362c60
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0 b/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
index 02bb664335f3..8143441b66ee 100644
--- a/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
+++ b/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-admin/ansible[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pywinrm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-admin/ansible app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pywinrm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Write unit tests in Python to test actual state of your servers
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-testinfra/pytest-testinfra-6.3.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=704ca1866fc0abad75daca0eaf9d4157
+_md5_=d5f4e0499ce31610bc6132a919e7dea5
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.5.4 b/metadata/md5-cache/dev-python/resolvelib-0.5.4
new file mode 100644
index 000000000000..b8d3583e2344
--- /dev/null
+++ b/metadata/md5-cache/dev-python/resolvelib-0.5.4
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=provides a Resolver class that includes dependency resolution logic
+EAPI=7
+HOMEPAGE=https://github.com/sarugaku/resolvelib
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=ISC
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/r/resolvelib/resolvelib-0.5.4.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=281d9342784754429aa28ee7cd07dc85
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.6.0 b/metadata/md5-cache/dev-python/resolvelib-0.6.0
new file mode 100644
index 000000000000..d899b49d5f4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/resolvelib-0.6.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=provides a Resolver class that includes dependency resolution logic
+EAPI=7
+HOMEPAGE=https://github.com/sarugaku/resolvelib
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=ISC
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/r/resolvelib/resolvelib-0.6.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=281d9342784754429aa28ee7cd07dc85
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.4.2 b/metadata/md5-cache/dev-python/s3transfer-0.4.2
index afb3af413087..18bdd3a4400e 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.4.2
+++ b/metadata/md5-cache/dev-python/s3transfer-0.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=An Amazon S3 Transfer Manager
 EAPI=7
 HOMEPAGE=https://github.com/boto/s3transfer
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.4.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=19e2fdc895bf8929b0fbec0a196fdb03
+_md5_=ae7475936f6002cbb596378a4a54a6df
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
index 7edb49b6d2cf..4521346a11ca 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings to the Tree-sitter parsing library
 EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/tree-sitter:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/py-tree-sitter/archive/b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz -> py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.19.0.tar.gz -> tree-sitter-javascript-0.19.0.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/v0.19.0.tar.gz -> tree-sitter-python-0.19.0.tar.gz )
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=65dff75426bc925e2d723895124ebdfb
+_md5_=5410d4aa2a4cbc1856f46667f29ac93b
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.2 b/metadata/md5-cache/dev-python/watchdog-2.1.2
index 881e9b32a666..88a33fbec655 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.2
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=7
 HOMEPAGE=https://github.com/gorakhargosh/watchdog
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/argh[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.2.tar.gz -> watchdog-2.1.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cf1675df7e5c11af66ce85b752194cc6
+_md5_=257d09ea2d71af8d9f21f22534d8e21d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d68d095f29f0..58c383687b9c 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cmake-3.20.2-r1 b/metadata/md5-cache/dev-util/cmake-3.20.4
similarity index 95%
rename from metadata/md5-cache/dev-util/cmake-3.20.2-r1
rename to metadata/md5-cache/dev-util/cmake-3.20.4
index 669bcd852874..7ae9b67ce747 100644
--- a/metadata/md5-cache/dev-util/cmake-3.20.2-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.20.4
@@ -10,6 +10,6 @@ LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.20/cmake-3.20.2.tar.gz
+SRC_URI=https://cmake.org/files/v3.20/cmake-3.20.4.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7ca60504b9601766183fe9afa9aa611
+_md5_=229a4c6efbbdb05bdf1c29c74d770397
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.9.1 b/metadata/md5-cache/dev-util/google-perftools-2.9.1
new file mode 100644
index 000000000000..8f79fc2b49f0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/google-perftools-2.9.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!ppc64? ( sys-libs/libunwind )
+DESCRIPTION=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=7
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages largepages64k +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!ppc64? ( sys-libs/libunwind )
+RESTRICT=!test? ( test )
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5b6ae3b509a3c2c6296e8be63fcb9a62
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 647da542b06e..7d6a15b23011 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/widelands-1.0 b/metadata/md5-cache/games-strategy/widelands-1.0
new file mode 100644
index 000000000000..b130f0a00d84
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/widelands-1.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:= media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf net-misc/curl sys-libs/zlib:= virtual/libintl dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Game similar to Settlers 2
+EAPI=7
+HOMEPAGE=https://www.widelands.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB
+RDEPEND=dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:= media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf net-misc/curl sys-libs/zlib:= virtual/libintl
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/widelands/widelands/archive/refs/tags/v1.0.tar.gz -> widelands-1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d408b44a0427ab63bc1f4d04e5a3f35
diff --git a/metadata/md5-cache/games-strategy/widelands-9999 b/metadata/md5-cache/games-strategy/widelands-9999
index 411eddfba28a..824d6368abcf 100644
--- a/metadata/md5-cache/games-strategy/widelands-9999
+++ b/metadata/md5-cache/games-strategy/widelands-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd288025887fa91d31efa07c73d65f43
+_md5_=7d408b44a0427ab63bc1f4d04e5a3f35
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index e81d82151156..7d92f048bf78 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5.11 b/metadata/md5-cache/mail-mta/postfix-3.5.11
new file mode 100644
index 000000000000..5ff540416be0
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.5.11
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.11.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7227b5555cdc4961335670c0b43ea7d6
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.1 b/metadata/md5-cache/mail-mta/postfix-3.6.1
new file mode 100644
index 000000000000..fd1d00a764d3
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=736ab4f146f91a911e59172b5b5cb550
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210605 b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210612
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.7_pre20210605
rename to metadata/md5-cache/mail-mta/postfix-3.7_pre20210612
index 25e793606fec..126621fd48f4 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210605
+++ b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210612
@@ -10,6 +10,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20210605.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20210612.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c5823c6433d181625bb752e8c3b90b3
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 01aa01eb7c26..786a703fbade 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.16 b/metadata/md5-cache/media-gfx/alembic-1.8.2
similarity index 61%
rename from metadata/md5-cache/media-gfx/alembic-1.7.16
rename to metadata/md5-cache/media-gfx/alembic-1.8.2
index 04261e10f237..7a0f3d336bd7 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.16
+++ b/metadata/md5-cache/media-gfx/alembic-1.8.2
@@ -1,16 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/openexr-2.5.0:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+DEPEND=|| ( >=dev-libs/imath-3.0.1 >=media-libs/ilmbase-2.5.5 ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
 DESCRIPTION=Open framework for storing and sharing scene data
 EAPI=7
 HOMEPAGE=https://www.alembic.io/
-IUSE=hdf5 test zlib
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+IUSE=examples hdf5 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=>=media-libs/openexr-2.5.0:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-REQUIRED_USE=hdf5? ( zlib )
+RDEPEND=|| ( >=dev-libs/imath-3.0.1 >=media-libs/ilmbase-2.5.5 ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/alembic/alembic/archive/1.7.16.tar.gz -> alembic-1.7.16.tar.gz
+SRC_URI=https://github.com/alembic/alembic/archive/1.8.2.tar.gz -> alembic-1.8.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab1d997ad262ded4ce512f567a39d568
+_md5_=4007269c45a436d804423d274c3b293b
diff --git a/metadata/md5-cache/media-gfx/darktable-2.6.2 b/metadata/md5-cache/media-gfx/darktable-2.6.2
deleted file mode 100644
index e783f53dd023..000000000000
--- a/metadata/md5-cache/media-gfx/darktable-2.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=7
-HOMEPAGE=https://www.darktable.org/
-IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr webp l10n_ca l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_hu l10n_ja l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ru l10n_sl
-KEYWORDS=amd64 x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-SLOT=0
-SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.6.2/darktable-2.6.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/darktable-2.6.2-gcc9.patch.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.6.0/darktable-usermanual.pdf -> darktable-usermanual-2.6.0.pdf )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=984a8fc6ddc408fff538c793f644f577
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.2 b/metadata/md5-cache/media-gfx/freecad-0.19.2
index e921f696d5b4..d53c8c10a983 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.2
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/swig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_8(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] <sci-libs/opencascade-7.5.2:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads,python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=7
 HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
-IUSE=debug headless pcl test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud plot ship +python_single_target_python3_8
+IUSE=debug headless pcl test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud plot ship python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=LGPL-2 CC-BY-SA-4.0
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_8(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 ) inspection? ( points ) path? ( robot ) ship? ( image plot )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] <sci-libs/opencascade-7.5.2:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads,python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads,python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) inspection? ( points ) path? ( robot ) ship? ( image plot )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.19.2.tar.gz -> freecad-0.19.2.tar.gz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2c7f3b1f342c7ec8a5cee8f0d9e668d
+_md5_=4318bae87ed94a0b0ff01bace9ffccdb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c9fa1960ad8b..9bab252231fc 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2-r2 b/metadata/md5-cache/media-libs/libao-1.2.2-r2
new file mode 100644
index 000000000000..54c4593e31cd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libao-1.2.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:= )
+DESCRIPTION=The Audio Output library
+EAPI=7
+HOMEPAGE=https://www.xiph.org/ao/
+IUSE=alsa nas mmap pulseaudio sndio abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:= )
+SLOT=0
+SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0c682804ce17590714289c5c7ea279f9
diff --git a/metadata/md5-cache/media-libs/liblscp-0.9.2 b/metadata/md5-cache/media-libs/liblscp-0.9.2
deleted file mode 100644
index 7cfef44d3bd2..000000000000
--- a/metadata/md5-cache/media-libs/liblscp-0.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install
-DESCRIPTION=C++ library for the Linux Sampler control protocol
-EAPI=7
-HOMEPAGE=https://www.linuxsampler.org
-IUSE=doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://www.rncbc.org/archive/liblscp-0.9.2.tar.gz https://download.linuxsampler.org/packages/liblscp-0.9.2.tar.gz
-_md5_=5b84142c79ef57a91713e81381c49c4d
diff --git a/metadata/md5-cache/media-libs/liblscp-0.9.3 b/metadata/md5-cache/media-libs/liblscp-0.9.3
index 97ee54bcd3df..3f8968025f15 100644
--- a/metadata/md5-cache/media-libs/liblscp-0.9.3
+++ b/metadata/md5-cache/media-libs/liblscp-0.9.3
@@ -4,8 +4,8 @@ DESCRIPTION=C++ library for the Linux Sampler control protocol
 EAPI=7
 HOMEPAGE=https://www.linuxsampler.org
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/liblscp-0.9.3.tar.gz https://download.linuxsampler.org/packages/liblscp-0.9.3.tar.gz
-_md5_=b4c925c84e874f2a07f047d0ad53dc55
+_md5_=5b84142c79ef57a91713e81381c49c4d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index cb3f971c94d3..19a7cb37dfb7 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/din-50.1 b/metadata/md5-cache/media-sound/din-50.1
deleted file mode 100644
index 2141d0325b44..000000000000
--- a/metadata/md5-cache/media-sound/din-50.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a software musical instrument and audio synthesizer
-EAPI=7
-HOMEPAGE=https://dinisnoise.org/
-IUSE=+alsa jack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-REQUIRED_USE=|| ( alsa jack )
-SLOT=0
-SRC_URI=https://archive.org/download/dinisnoise_source_code/din-50.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=339cbb02126bdffe6fe1397efe54e94c
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.21 b/metadata/md5-cache/media-sound/qtractor-0.9.21
deleted file mode 100644
index 93861da8fbd5..000000000000
--- a/metadata/md5-cache/media-sound/qtractor-0.9.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
-EAPI=7
-HOMEPAGE=https://qtractor.sourceforge.io
-IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=dssi? ( ladspa )
-SLOT=0
-SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.21.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40f7a12636afafc90db5673ccdf424d1
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.22 b/metadata/md5-cache/media-sound/qtractor-0.9.22
index 38f91915a399..07ce0452244c 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.22
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.22
@@ -5,11 +5,11 @@ DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framewor
 EAPI=7
 HOMEPAGE=https://qtractor.sourceforge.io
 IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dssi? ( ladspa )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.22.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cecf6fce5ec8b08cc5d07df8c9606f20
+_md5_=40f7a12636afafc90db5673ccdf424d1
diff --git a/metadata/md5-cache/media-sound/vmpk-0.8.0 b/metadata/md5-cache/media-sound/vmpk-0.8.0
deleted file mode 100644
index d3de5d2d165d..000000000000
--- a/metadata/md5-cache/media-sound/vmpk-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-2.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Virtual MIDI Piano Keyboard
-EAPI=7
-HOMEPAGE=https://vmpk.sourceforge.io/
-IUSE=dbus
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-2.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-qt/qtsvg:5
-SLOT=0
-SRC_URI=mirror://sourceforge/vmpk/vmpk-0.8.0.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e38e814b680a77cb1b3e16c89e0e1af4
diff --git a/metadata/md5-cache/media-sound/vmpk-0.8.3 b/metadata/md5-cache/media-sound/vmpk-0.8.3
index e845d32fffda..9d1b513d5e4c 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.8.3
+++ b/metadata/md5-cache/media-sound/vmpk-0.8.3
@@ -5,10 +5,10 @@ DESCRIPTION=Virtual MIDI Piano Keyboard
 EAPI=7
 HOMEPAGE=https://vmpk.sourceforge.io/
 IUSE=dbus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/drumstick x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-qt/qtsvg:5
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.8.3.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba79a94e292778611aa6de7b30ffaa25
+_md5_=f139154b5c0478978b8919a2189d1d05
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index c394abe5b2c8..bcb1fc2bb1d1 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.7b b/metadata/md5-cache/net-ftp/proftpd-1.3.7b
new file mode 100644
index 000000000000..1df87d5f9147
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.7b
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DESCRIPTION=An advanced and very configurable FTP server
+EAPI=7
+HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
+IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.7b.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b67802431595dff4a096a00d5a8500a6
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1 b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1
new file mode 100644
index 000000000000..e5e29841450e
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DESCRIPTION=An advanced and very configurable FTP server
+EAPI=7
+HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
+IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8rc1.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bf22d66bdb15b4453d966d629a7c67e7
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 8587ce4677ee..4c649065c9fe 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/weechat-3.2 b/metadata/md5-cache/net-irc/weechat-3.2
new file mode 100644
index 000000000000..99d5ac819bb3
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-3.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=7
+HOMEPAGE=https://weechat.org/
+IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
+RESTRICT=!test? ( test )
+SLOT=0/3.2
+SRC_URI=https://weechat.org/files/src/weechat-3.2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c07497f4d9249bb1aafb9ecb29439e34
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 9710ec8e2769..18a3d6e3bbfe 100644
Binary files a/metadata/md5-cache/net-voip/Manifest.gz and b/metadata/md5-cache/net-voip/Manifest.gz differ
diff --git a/metadata/md5-cache/net-voip/captagent-6.3.1 b/metadata/md5-cache/net-voip/captagent-6.3.1
new file mode 100644
index 000000000000..00bee48b864a
--- /dev/null
+++ b/metadata/md5-cache/net-voip/captagent-6.3.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/json-c net-libs/libpcap dev-libs/libuv mysql? ( dev-db/mysql-connector-c ) pcre? ( dev-libs/libpcre ) redis? ( dev-db/redis ) ssl? ( dev-libs/openssl:= )
+DESCRIPTION=100% Open-Source Packet Capture Agent for HEP
+EAPI=7
+HOMEPAGE=https://sipcapture.org/ https://github.com/sipcapture/captagent
+IUSE=ipv6 mysql pcre redis ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/json-c net-libs/libpcap dev-libs/libuv mysql? ( dev-db/mysql-connector-c ) pcre? ( dev-libs/libpcre ) redis? ( dev-db/redis ) ssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/sipcapture/captagent/archive/refs/tags/6.3.1.tar.gz -> captagent-6.3.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=de57c05ec4be7afa621b0313364bd505
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 620595da2012..2fa379684dec 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.38.0 b/metadata/md5-cache/net-vpn/i2pd-2.38.0-r1
similarity index 97%
rename from metadata/md5-cache/net-vpn/i2pd-2.38.0
rename to metadata/md5-cache/net-vpn/i2pd-2.38.0-r1
index 7173fca19f40..f132d4283835 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.38.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.38.0-r1
@@ -11,4 +11,4 @@ RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] dev-
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.38.0.tar.gz -> i2pd-2.38.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a65be08b33a1a016d44657b5f98cd8f9
+_md5_=958bbcaa7c052e4f82ebc8b0a82fd9ea
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index fd09e21af8a4..2492b95fd6c8 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.2 b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
index 91b231b4bdbb..7228250517ec 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda +custom-cflags +doc double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.2
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.2.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.2.tar.gz )
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17965844eb8279d10b1280ea5f0a96e4
+_md5_=16f0596bc46a0e02b008020b33587da6
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index 7b678ac2dcdc..b2c8c836df99 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda +custom-cflags +doc double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50f79a01ab987405d05875b098079933
+_md5_=1f26d579be47f0f2b37740d4f26605f4
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index b21a4b67cb9e..9cdbe4e71e1b 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda +custom-cflags +doc double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50f79a01ab987405d05875b098079933
+_md5_=1f26d579be47f0f2b37740d4f26605f4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b837c34a079f..e0d5ced3231b 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/vtk-8.2.0 b/metadata/md5-cache/sci-libs/vtk-8.2.0
deleted file mode 100644
index 3fcc895bd15e..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-8.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/pugixml >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=The Visualization Toolkit
-EAPI=7
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi odbc offscreen postgres python qt5 R rendering tbb tcl theora tk video_cards_nvidia views web +X xdmf2 elibc_FreeBSD java +python_single_target_python3_8 test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/pugixml >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( python_single_target_python3_8 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/8.2/VTK-8.2.0.tar.gz doc? ( https://www.vtk.org/files/release/8.2/vtkDocHtml-8.2.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.2/VTKData-8.2.0.tar.gz https://www.vtk.org/files/release/8.2/VTKLargeData-8.2.0.tar.gz )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	990ad6a000cf18d1ef87117e8c7b0a54	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e19e512c5a08885bd00870550048ec3e
diff --git a/metadata/md5-cache/sci-libs/vtk-8.2.0-r1 b/metadata/md5-cache/sci-libs/vtk-8.2.0-r1
deleted file mode 100644
index c50bf38b05ae..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-8.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt all-modules? ( dev-libs/pegtl ) boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sip[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] dev-python/constantly[python_targets_python3_9(-)] dev-python/hyperlink[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/txaio[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=The Visualization Toolkit
-EAPI=7
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi odbc offscreen postgres python qt5 R rendering tbb tcl theora tk video_cards_nvidia views web +X xdmf2 elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt all-modules? ( dev-libs/pegtl ) boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sip[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] dev-python/constantly[python_targets_python3_9(-)] dev-python/hyperlink[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/txaio[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/8.2/VTK-8.2.0.tar.gz doc? ( https://www.vtk.org/files/release/8.2/vtkDocHtml-8.2.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.2/VTKData-8.2.0.tar.gz https://www.vtk.org/files/release/8.2/VTKLargeData-8.2.0.tar.gz )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	990ad6a000cf18d1ef87117e8c7b0a54	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c118ae802b35ea4ff14c26c8db8d5ee6
diff --git a/metadata/md5-cache/sci-libs/vtk-8.2.0-r2 b/metadata/md5-cache/sci-libs/vtk-8.2.0-r3
similarity index 58%
rename from metadata/md5-cache/sci-libs/vtk-8.2.0-r2
rename to metadata/md5-cache/sci-libs/vtk-8.2.0-r3
index 631dcbf4d355..0a12b652cbd0 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.2.0-r2
+++ b/metadata/md5-cache/sci-libs/vtk-8.2.0-r3
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen ) mpi? ( app-admin/chrpath ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt all-modules? ( !sci-libs/xdmf2 <dev-libs/pegtl-3 sci-libs/kissfft ) boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sip[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] dev-python/constantly[python_targets_python3_9(-)] dev-python/hyperlink[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/txaio[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt all-modules? ( !sci-libs/xdmf2 <dev-libs/pegtl-3 sci-libs/kissfft ) boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/sip:5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sip:5[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] dev-python/constantly[python_targets_python3_9(-)] dev-python/hyperlink[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/txaio[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=The Visualization Toolkit
 EAPI=7
 HOMEPAGE=https://www.vtk.org/
 IUSE=all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi mysql odbc offscreen postgres python qt5 R rendering tbb tcl theora tk video_cards_nvidia views web +X elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt all-modules? ( !sci-libs/xdmf2 <dev-libs/pegtl-3 sci-libs/kissfft ) boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sip[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] dev-python/constantly[python_targets_python3_9(-)] dev-python/hyperlink[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/txaio[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt all-modules? ( !sci-libs/xdmf2 <dev-libs/pegtl-3 sci-libs/kissfft ) boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/sip:5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sip:5[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( python? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] dev-python/constantly[python_targets_python3_9(-)] dev-python/hyperlink[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/txaio[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( boost ffmpeg gdal mpi mysql odbc postgres python qt5 ) java? ( qt5 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/8.2/VTK-8.2.0.tar.gz doc? ( https://www.vtk.org/files/release/8.2/vtkDocHtml-8.2.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.2/VTKData-8.2.0.tar.gz https://www.vtk.org/files/release/8.2/VTKLargeData-8.2.0.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	990ad6a000cf18d1ef87117e8c7b0a54	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78d7af0dd89640afb937bbd01c627496
+_md5_=1263d017261f917d9da5f82a3b777933
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 54b362e62c6c..845d12c2e9b2 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/giac-1.7.0.5 b/metadata/md5-cache/sci-mathematics/giac-1.7.0.13
similarity index 95%
rename from metadata/md5-cache/sci-mathematics/giac-1.7.0.5
rename to metadata/md5-cache/sci-mathematics/giac-1.7.0.13
index d42976dc1a37..02c1a0a38ab4 100644
--- a/metadata/md5-cache/sci-mathematics/giac-1.7.0.5
+++ b/metadata/md5-cache/sci-mathematics/giac-1.7.0.13
@@ -11,6 +11,6 @@ RDEPEND=dev-libs/gmp:=[cxx] sys-libs/readline:= gui? ( x11-libs/fltk media-libs/
 REQUIRED_USE=test? ( gui )
 RESTRICT=!test? ( test ) mirror
 SLOT=0
-SRC_URI=https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_1.7.0-5.tar.gz
+SRC_URI=https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_1.7.0-13.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=433c390898dd9bca15d5e5223a2d347b
+_md5_=bf13924261bf765f5ba4197d026ba910
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index d10629124d5b..ad9579e08e77 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100 b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r101
similarity index 89%
rename from metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
rename to metadata/md5-cache/sci-visualization/fityk-1.3.1-r101
index ff79d54801bb..8a290e161ab2 100644
--- a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
+++ b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r101
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/swig
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/boost:= >=sci-libs/xylib-1 nlopt? ( sci-libs/nlopt ) readline? ( sys-libs/readline:0= ) wxwidgets? ( x11-libs/wxGTK:3.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/boost:= >=sci-libs/xylib-1 nlopt? ( sci-libs/nlopt ) readline? ( sys-libs/readline:0= ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=General-purpose nonlinear curve fitting and data analysis
 EAPI=7
 HOMEPAGE=https://fityk.nieto.pl/
 IUSE=gnuplot nlopt readline wxwidgets lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/boost:= >=sci-libs/xylib-1 nlopt? ( sci-libs/nlopt ) readline? ( sys-libs/readline:0= ) wxwidgets? ( x11-libs/wxGTK:3.0 ) gnuplot? ( sci-visualization/gnuplot )
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/boost:= >=sci-libs/xylib-1 nlopt? ( sci-libs/nlopt ) readline? ( sys-libs/readline:0= ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) gnuplot? ( sci-visualization/gnuplot )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.3.1/fityk-1.3.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28bfd92b7cf704abc40d6eada11844fc
+_md5_=1feb391997222104aff9eae6fa590d0f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e0064735c43b..dbcd310cf256 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/bleachbit-4.0.0 b/metadata/md5-cache/sys-apps/bleachbit-4.0.0
deleted file mode 100644
index e6def664d8d6..000000000000
--- a/metadata/md5-cache/sys-apps/bleachbit-4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext test? ( dev-python/mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Clean junk to free disk space and to maintain privacy
-EAPI=7
-HOMEPAGE=https://www.bleachbit.org
-IUSE=test python_targets_python3_8 test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.bleachbit.org/bleachbit-4.0.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=5ece5631b5263582165c91fdea669417
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.1 b/metadata/md5-cache/sys-apps/fwupd-1.6.1
index 95dba8707723..57a7c176eb59 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.6.1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.1.tar.gz -> fwupd-1.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d46a48b9bd23be89445c1a434aa7747
+_md5_=1043999f63ae94d6fbf78f0dc317e606
diff --git a/metadata/md5-cache/sys-apps/ripgrep-13.0.0 b/metadata/md5-cache/sys-apps/ripgrep-13.0.0
new file mode 100644
index 000000000000..4e7f927997ba
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ripgrep-13.0.0
@@ -0,0 +1,13 @@
+BDEPEND=pcre? ( dev-libs/libpcre2:= ) virtual/pkgconfig >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
+EAPI=7
+HOMEPAGE=https://github.com/BurntSushi/ripgrep
+IUSE=+pcre debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
+RDEPEND=pcre? ( dev-libs/libpcre2:= )
+SLOT=0
+SRC_URI=https://github.com/BurntSushi/ripgrep/archive/13.0.0.tar.gz -> ripgrep-13.0.0.tar.gz https://github.com/BurntSushi/ripgrep/releases/download/13.0.0/ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.2.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/libm/0.1.4/download -> libm-0.1.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap2/0.3.0/download -> memmap2-0.3.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/packed_simd_2/0.3.5/download -> packed_simd_2-0.3.5.crate https://crates.io/api/v1/crates/pcre2/0.2.3/download -> pcre2-0.2.3.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.5/download -> pcre2-sys-0.2.5.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	7a8c7ca59987a0dfb53f3c68656d2c3c	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fa4ed73760ed547c89b371242f42d936
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8d6d358e29e8..7cbb74c4e7e1 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
new file mode 100644
index 000000000000..653cf850837b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=7
+HOMEPAGE=https://www.open-mpi.org
+IUSE=cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.5.tar.bz2
+_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	ebdbaed22e873a5abe6205f41349b479	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8c864b98ad063363e3e236f2cbdfe2ac
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 95c9b2f69a37..550da0e78475 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/google-chrome-91.0.4472.101 b/metadata/md5-cache/www-client/google-chrome-91.0.4472.106
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-91.0.4472.101
rename to metadata/md5-cache/www-client/google-chrome-91.0.4472.106
index b2fdd4953e3a..43a88215d922 100644
--- a/metadata/md5-cache/www-client/google-chrome-91.0.4472.101
+++ b/metadata/md5-cache/www-client/google-chrome-91.0.4472.106
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.101-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.106-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	ebdbaed22e873a5abe6205f41349b479	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ee4a56f10b145d892581d5e32ef181c
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 4440db2da41f..41ead9ae0826 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.101 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.106
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.101
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.106
index b35ad9e7f185..fca77ffbcc45 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.101
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.106
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.101-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.106-1_amd64.deb
 _eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e7b11de7bb46..20aed09ee12e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 11861 BLAKE2B d964248c41b84f886b574b202797bf5ca4e4daab43a2ee89f91980217bef4cc4a2db4ba62bee9d776df1576310929094ba5de5d0d663333246e62b97cf9e80e9 SHA512 abeda169eddbea3816fe422e67f34fd8eb940bb77b9ef57b12823dcd839e1b9c8ad5acba22b2820d822a4d458310b63680bfda958293f405fe662e7a722b227c
-TIMESTAMP 2021-06-15T06:09:13Z
+TIMESTAMP 2021-06-15T19:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDIRAlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDI+tNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD+9w/9G6AKzsKTM72j0+Q3R3VtTsyICTJjWGjtQPA/y9Oj2m7vZKGs7FS4C3zh
-Je/wBg8tqEvUjWmLTVn3o+YVSiaYJQd3Ymrt6ABTM/pTHyUtaX1ZUD5QaJ84POvK
-OYlKP7Li4SGYS87+/ZkOEKFcsSJjtQNjB2t5p5KMYeT4qCzAAeyA1rfqKnC9l1hz
-niMpA9IIElRDBV9G25OE1iEgJ2VDyLu6gzJa3wVfwYGk1/snPA4oBChhzQ1SuXCB
-bU5DC4N+/do0+5pcQC3YyLX6flnIRm7Rc1ndUtmHq4i/2Lr7frpjSPe2T4B+DHeZ
-eVo8YchbHAWbc5tTWDhnQJiCk/xn3/TS9oP4IZKSAvPyKOMXjBiqJfjHEukoCW67
-vhxXbmIgp4q6FNfyptmI2/03oIcLSoNjfc92v0Rdxs8kOUl7+ZL/Q0PM1spiIet6
-pcL4JEFA8hrOb82V0pjZmwr8JYRyHmWdds2M/zoMlORrbj9EujYeYGXsfYSCZCyB
-hJ7OVQ51tSdB1wG9q+dM/fpy3eFYS790rtwaS2/Fv9eRTcXsrTL+yXJGx/A6wXhd
-CfjRK1+1dBArkLmdw6HoYhKqLgMYXWAhL+d9d6InQIAIfq6EWC8H1uWhTpK4tJEL
-aMhVypCg6O+8nFC3BO4uWeHgJG5bwp3Y1gUJlNS1QBfuUZACue4=
-=/RMD
+klD7GhAAnR9wEjLvcPR8J+KTOGz186riuCTcX5SF6eqmfq6epBTfyY/zLg86n+b+
+gbZenzGPCXk79RKnBniZQG/4FtwFc8qrNhw8SJN9m5vs8KZKTPszLffhkq5K5/A6
+G5b0wkEo9jqyodkP4ClL4a6N+Xfs2Ptt/7RBFCYJTSDh43wpR1iwNMagLAoNK3vJ
+Sq3GuuosLEeBEIfslo+8Oo1AyXfO3Co3qCQ/YkIBzYVOXFxG0kLZGDfWitDihsaA
+v1iPV5I9C+v+bzWf0/Z+if9OmmT2EGu/tpBXiJzKapw739ppUIwq5peqfpI0UCYI
+km37fhl6yeIX8+VLR92nJ30fiJyVkBo5l1n/7vGg6m0VZBJvApM16FXnXl2hGwlw
+sp/+ECaznPuP4vCc3oXt4g8k77Q8C84A9M8PWn/MUlTTsKiTKqFTWZTatq76QZPC
+6x/Md8RLHZk8dcITUWgAmAgiYTE0D5JFvtTR2xQr4lmeU8xnaoP1f0wHODezdp3E
+ix2IZunN+2AG8fCu8NPKQQoIfkIPA9wMYc/4Nemn/fO6NC1AgiEmc/FqcHPQZyPP
+pyZmRxCBuRjx3y+kC5/zvR4lslZ2OL2jVswWq0SH4rkyAy+qltcekiaFkQ5OUpEh
+6Z6OoTX6OKF1t7reZKFNyfRFBKlAbJmBl0drSKabvrJWIZnkyWw=
+=ZLyh
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 960a3e0ca1c5..1fc7a1839e21 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jun 2021 06:09:09 +0000
+Tue, 15 Jun 2021 19:09:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 869200acb30a..f6c430a4307a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jun 15 06:09:09 AM UTC 2021
+Tue Jun 15 07:09:02 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 2c6061c1377e..773b8c021d21 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -741,9 +741,8 @@
 2012221309 ./app-admin/ansible-cmdb/ansible-cmdb-1.30.ebuild
 2101310342 ./app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
 2106101309 ./app-admin/ansible-lint/ansible-lint-5.0.12.ebuild
-2104180639 ./app-admin/ansible/ansible-2.10.7.ebuild
-2106060639 ./app-admin/ansible/ansible-9999.ebuild
-2106141809 ./app-admin/ansible/ansible-2.11.1.ebuild
+2106151539 ./app-admin/ansible/ansible-2.10.7.ebuild
+2106151539 ./app-admin/ansible/ansible-4.1.0.ebuild
 2105131709 ./app-admin/apache-tools/apache-tools-2.4.46.ebuild
 2105131709 ./app-admin/apache-tools/apache-tools-2.4.47.ebuild
 2106140209 ./app-admin/apache-tools/apache-tools-2.4.48.ebuild
@@ -1019,6 +1018,7 @@
 2104301609 ./app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
 2104301609 ./app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
 2105180239 ./app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
+2106151709 ./app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
 2009231339 ./app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
 2003242139 ./app-admin/sysrqd/sysrqd-17-r1.ebuild
 2105260039 ./app-admin/sysstat/sysstat-12.5.3.ebuild
@@ -1065,6 +1065,8 @@
 2105282239 ./app-admin/graylog/graylog-4.0.7.ebuild
 2105140539 ./app-admin/ansible-base/ansible-base-2.10.9.ebuild
 2106060639 ./app-admin/ansible-base/ansible-base-2.10.10.ebuild
+2106151839 ./app-admin/ansible-base/ansible-base-2.11.1.ebuild
+2106151839 ./app-admin/ansible-base/ansible-base-9999.ebuild
 2105181809 ./app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild
 2105281739 ./app-admin/xkcdpass/xkcdpass-1.19.2.ebuild
 2010020009 ./app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
@@ -1711,6 +1713,7 @@
 2012311940 ./app-dicts/canna-2ch/canna-2ch-20040519.ebuild
 2002112051 ./app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
 2103052339 ./app-dicts/dictd-vera/dictd-vera-1.24.ebuild
+2106151039 ./app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
 1805212238 ./app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild
 2009031539 ./app-dicts/dikt/dikt-2s_p1.ebuild
 2009152309 ./app-dicts/eblook/eblook-1.6.1.ebuild
@@ -2450,6 +2453,7 @@
 2006182039 ./app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
 2104150839 ./app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
 2003081439 ./app-editors/gummi/gummi-0.8.1.ebuild
+2106151039 ./app-editors/gummi/gummi-0.8.2.ebuild
 2105242209 ./app-editors/gvim/gvim-8.2.0814-r100.ebuild
 2105242209 ./app-editors/gvim/gvim-9999.ebuild
 2104060140 ./app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -2484,9 +2488,9 @@
 2104111439 ./app-editors/mousepad/mousepad-0.5.3-r1.ebuild
 2105121314 ./app-editors/mousepad/mousepad-0.5.5.ebuild
 2103280209 ./app-editors/nano/nano-9999.ebuild
-2104060140 ./app-editors/nano/nano-5.3-r1.ebuild
 2104292109 ./app-editors/nano/nano-5.7.ebuild
 2105170639 ./app-editors/nano/nano-5.6.1.ebuild
+2106151539 ./app-editors/nano/nano-5.8.ebuild
 2103170639 ./app-editors/ne/ne-3.3.0.ebuild
 2105190309 ./app-editors/ne/ne-3.3.1.ebuild
 2104221539 ./app-editors/nedit/nedit-5.7.ebuild
@@ -2537,7 +2541,9 @@
 2102150509 ./app-editors/zile/zile-2.4.15.ebuild
 2105251909 ./app-editors/pyvim/pyvim-3.0.2.ebuild
 2105271139 ./app-editors/vscode/vscode-1.56.2.ebuild
+2106151609 ./app-editors/vscode/vscode-1.57.0.ebuild
 2106041109 ./app-editors/vscodium/vscodium-1.56.2.ebuild
+2106151609 ./app-editors/vscodium/vscodium-1.57.0.ebuild
 1908231509 ./app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
 1910171639 ./app-emacs/adaptive-wrap/adaptive-wrap-0.7.ebuild
 1908271439 ./app-emacs/analog/analog-1.9.99.ebuild
@@ -3740,6 +3746,7 @@
 2101310343 ./app-misc/tmuxp/tmuxp-1.5.4.ebuild
 2102040639 ./app-misc/tmuxp/tmuxp-1.6.5.ebuild
 2106011509 ./app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
+2106152109 ./app-misc/tmuxp/tmuxp-1.8.1.ebuild
 2003100009 ./app-misc/todo/todo-2.11.0.ebuild
 2010092309 ./app-misc/todo/todo-2.12.0-r1.ebuild
 1911171639 ./app-misc/toilet/toilet-0.3-r1.ebuild
@@ -3786,8 +3793,8 @@
 2104192239 ./app-misc/ytree/ytree-2.03.ebuild
 2104060140 ./app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
 2007151539 ./app-misc/zygrib/zygrib-8.0.1-r1.ebuild
-2104020139 ./app-misc/rpick/rpick-0.8.1.ebuild
 2105152109 ./app-misc/rpick/rpick-0.8.2.ebuild
+2106151039 ./app-misc/rpick/rpick-0.8.4.ebuild
 2010091139 ./app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
 2006291709 ./app-misc/transfolio/transfolio-1.0.1-r1.ebuild
 2001042109 ./app-misc/hodie/hodie-1.5.ebuild
@@ -3804,7 +3811,7 @@
 2106090939 ./app-misc/filebus/filebus-0.3.2.ebuild
 2106150909 ./app-misc/jp/jp-0.1.3.1.ebuild
 2106140709 ./app-misc/dasel/dasel-1.15.0.ebuild
-2106140539 ./app-misc/jpipe/jpipe-0.0.1.ebuild
+2106151409 ./app-misc/jpipe/jpipe-0.1.3.1.ebuild
 2101310343 ./app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild
 1702282250 ./app-mobilephone/anyremote/anyremote-6.5.ebuild
 1710020727 ./app-mobilephone/dfu-util/dfu-util-0.9.ebuild
@@ -5160,7 +5167,7 @@
 2101310343 ./dev-cpp/catch/catch-9999.ebuild
 2103150539 ./dev-cpp/catch/catch-2.13.4.ebuild
 2106141809 ./dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
-2105021839 ./dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+2106151409 ./dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
 2012202239 ./dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
 2106011539 ./dev-cpp/ctemplate/ctemplate-2.4.ebuild
 2104031909 ./dev-cpp/eigen/eigen-3.3.7-r1.ebuild
@@ -7498,6 +7505,7 @@
 2105180210 ./dev-libs/cdk/cdk-5.0.20160131.ebuild
 2105190639 ./dev-libs/cdk/cdk-5.0.20210324-r1.ebuild
 2006251709 ./dev-libs/cereal/cereal-1.3.0.ebuild
+2106152139 ./dev-libs/cereal/cereal-1.3.0-r1.ebuild
 2104060140 ./dev-libs/cgilib/cgilib-0.7-r1.ebuild
 2104060140 ./dev-libs/check/check-0.15.2-r1.ebuild
 2012311940 ./dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -7953,7 +7961,7 @@
 2104060140 ./dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
 2105152239 ./dev-libs/libxml2/libxml2-2.9.12.ebuild
 2106130909 ./dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
-2106141239 ./dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
+2106151909 ./dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
 2101310343 ./dev-libs/libxmlb/libxmlb-0.1.15.ebuild
 2105091139 ./dev-libs/libxmlb/libxmlb-0.3.1.ebuild
 2105252009 ./dev-libs/libxmlb/libxmlb-0.3.2.ebuild
@@ -8143,8 +8151,8 @@
 2105101009 ./dev-libs/tntnet/tntnet-3.0.ebuild
 2006080009 ./dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
 2012311940 ./dev-libs/tre/tre-0.8.0-r2.ebuild
-1712042339 ./dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
 2106141239 ./dev-libs/tvision/tvision-2.2.1.4.ebuild
+2106151809 ./dev-libs/tvision/tvision-2.2.3.ebuild
 2104200439 ./dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
 2104192239 ./dev-libs/ucl/ucl-1.03-r1.ebuild
 2105090239 ./dev-libs/ucommon/ucommon-7.0.0.ebuild
@@ -8200,7 +8208,9 @@
 2104060140 ./dev-libs/zziplib/zziplib-0.13.72.ebuild
 2104161439 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2106011509 ./dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+2106151809 ./dev-libs/criterion/criterion-2.4_pre20210114.ebuild
 2104011539 ./dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+2106151809 ./dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
 2010162109 ./dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
 2005211709 ./dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
 2101152139 ./dev-libs/avro-c/avro-c-1.9.1.ebuild
@@ -8252,7 +8262,7 @@
 2102260409 ./dev-libs/rocksdb/rocksdb-6.15.5.ebuild
 2103210639 ./dev-libs/rocksdb/rocksdb-6.17.3.ebuild
 2103300709 ./dev-libs/tree-sitter/tree-sitter-9999.ebuild
-2106141009 ./dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
+2106151909 ./dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
 2104212339 ./dev-libs/libmpack/libmpack-1.0.5.ebuild
 2103072339 ./dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
 2105170610 ./dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
@@ -8633,7 +8643,7 @@
 1804052138 ./dev-perl/Apache2-AuthenNTLM/Apache2-AuthenNTLM-0.20.0-r2.ebuild
 2101301809 ./dev-perl/App-CLI/App-CLI-0.520.0.ebuild
 1912110241 ./dev-perl/App-Cmd/App-Cmd-0.331.0.ebuild
-2104180209 ./dev-perl/App-Cmd/App-Cmd-0.333.0.ebuild
+2106152009 ./dev-perl/App-Cmd/App-Cmd-0.333.0.ebuild
 2004230039 ./dev-perl/App-Nopaste/App-Nopaste-1.13.0.ebuild
 2005031809 ./dev-perl/App-cpanminus/App-cpanminus-9999.ebuild
 2012171209 ./dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
@@ -8644,7 +8654,7 @@
 2008242239 ./dev-perl/Archive-Any/Archive-Any-0.94.600.ebuild
 2012311940 ./dev-perl/Archive-Extract/Archive-Extract-0.800.0.ebuild
 2105061309 ./dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
-2009161209 ./dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild
+2106152009 ./dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild
 2104060140 ./dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
 2101070139 ./dev-perl/Array-Compare/Array-Compare-3.0.3.ebuild
 2105010309 ./dev-perl/Array-Compare/Array-Compare-3.0.8.ebuild
@@ -8742,7 +8752,7 @@
 2008242239 ./dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.4.280.ebuild
 2105050039 ./dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.103.200.ebuild
 2105050039 ./dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.104.200.ebuild
-2008211209 ./dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.15.ebuild
+2106152009 ./dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.15.ebuild
 2005071709 ./dev-perl/CQL-Parser/CQL-Parser-1.130.0-r1.ebuild
 2008242239 ./dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild
 2105122339 ./dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.130.0.ebuild
@@ -8845,13 +8855,13 @@
 2101070139 ./dev-perl/Config-General/Config-General-2.630.0.ebuild
 1912110241 ./dev-perl/Config-Grammar/Config-Grammar-1.120.0.ebuild
 2105050139 ./dev-perl/Config-Grammar/Config-Grammar-1.130.0.ebuild
-1912110241 ./dev-perl/Config-INI/Config-INI-0.25.0.ebuild
+2106152009 ./dev-perl/Config-INI/Config-INI-0.25.0.ebuild
 1912110241 ./dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
 2105050139 ./dev-perl/Config-IniFiles/Config-IniFiles-3.0.3.ebuild
 2006271239 ./dev-perl/Config-JSON/Config-JSON-1.520.200-r1.ebuild
 1912110241 ./dev-perl/Config-MVP-Reader-INI/Config-MVP-Reader-INI-2.101.463.ebuild
 2006271309 ./dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild
-2105040239 ./dev-perl/Config-MVP/Config-MVP-2.200.12.ebuild
+2106152009 ./dev-perl/Config-MVP/Config-MVP-2.200.12.ebuild
 2006302009 ./dev-perl/Config-Properties/Config-Properties-1.800.0-r1.ebuild
 2105050009 ./dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
 2101070139 ./dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild
@@ -9445,7 +9455,7 @@
 2106130109 ./dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
 1912110241 ./dev-perl/Hash-Merge-Simple/Hash-Merge-Simple-0.51.0.ebuild
 2012271909 ./dev-perl/Hash-Merge/Hash-Merge-0.200.0.ebuild
-2106130109 ./dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
+2106151909 ./dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
 1912110241 ./dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild
 2106130109 ./dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
 2106130109 ./dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0-r1.ebuild
@@ -9480,7 +9490,7 @@
 2106020609 ./dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
 2104060140 ./dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
 2004032241 ./dev-perl/IO-Tee/IO-Tee-0.650.0.ebuild
-1912110241 ./dev-perl/IO-TieCombine/IO-TieCombine-1.5.0.ebuild
+2106152009 ./dev-perl/IO-TieCombine/IO-TieCombine-1.5.0.ebuild
 2104060140 ./dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
 1806102239 ./dev-perl/IO-Util/IO-Util-1.500.0-r2.ebuild
 2104060140 ./dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
@@ -9662,7 +9672,7 @@
 1912110241 ./dev-perl/Math-Vec/Math-Vec-1.10.0-r1.ebuild
 2004032241 ./dev-perl/Math-VecStat/Math-VecStat-0.80.0-r1.ebuild
 2008171209 ./dev-perl/MediaWiki-API/MediaWiki-API-0.410.0.ebuild
-1912110241 ./dev-perl/Mixin-Linewise/Mixin-Linewise-0.108.0.ebuild
+2106152009 ./dev-perl/Mixin-Linewise/Mixin-Linewise-0.108.0.ebuild
 1912110241 ./dev-perl/Mo/Mo-0.400.0.ebuild
 2101070139 ./dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild
 1807151909 ./dev-perl/Modem-Vgetty/Modem-Vgetty-0.30.0-r2.ebuild
@@ -9732,10 +9742,10 @@
 1912110241 ./dev-perl/MooseX-LazyRequire/MooseX-LazyRequire-0.110.0.ebuild
 1912110241 ./dev-perl/MooseX-MultiInitArg/MooseX-MultiInitArg-0.20.0.ebuild
 1912110241 ./dev-perl/MooseX-Object-Pluggable/MooseX-Object-Pluggable-0.1.400.ebuild
-1912110241 ./dev-perl/MooseX-OneArgNew/MooseX-OneArgNew-0.5.0.ebuild
+2106152009 ./dev-perl/MooseX-OneArgNew/MooseX-OneArgNew-0.5.0.ebuild
 1912110241 ./dev-perl/MooseX-Params-Validate/MooseX-Params-Validate-0.210.0.ebuild
-2101070139 ./dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.100.0.ebuild
-2101070139 ./dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild
+2106152009 ./dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.100.0.ebuild
+2106152009 ./dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild
 1912110241 ./dev-perl/MooseX-SetOnce/MooseX-SetOnce-0.200.2.ebuild
 1912110241 ./dev-perl/MooseX-SimpleConfig/MooseX-SimpleConfig-0.110.0.ebuild
 1912110241 ./dev-perl/MooseX-StrictConstructor/MooseX-StrictConstructor-0.210.0.ebuild
@@ -9997,8 +10007,8 @@
 2105250339 ./dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild
 1912110241 ./dev-perl/Return-Value/Return-Value-1.666.5.ebuild
 1912110241 ./dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild
-1912110241 ./dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
-1912110241 ./dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
+2106152009 ./dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
+2106152009 ./dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
 2101070139 ./dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
 1912110241 ./dev-perl/Roman/Roman-1.240.0.ebuild
 2004032241 ./dev-perl/Router-Simple/Router-Simple-0.170.0.ebuild
@@ -10072,14 +10082,14 @@
 1912110241 ./dev-perl/String-Approx/String-Approx-3.280.0.ebuild
 2104060140 ./dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
 2004032241 ./dev-perl/String-Ediff/String-Ediff-0.90.0-r1.ebuild
-1912110241 ./dev-perl/String-Errf/String-Errf-0.8.0.ebuild
+2106152009 ./dev-perl/String-Errf/String-Errf-0.8.0.ebuild
 1912110241 ./dev-perl/String-Escape/String-Escape-2010.2.0-r1.ebuild
 1912110241 ./dev-perl/String-Flogger/String-Flogger-1.101.245.ebuild
 2101070139 ./dev-perl/String-Format/String-Format-1.170.0-r1.ebuild
 2105081639 ./dev-perl/String-Format/String-Format-1.180.0.ebuild
-1912110241 ./dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild
+2106152009 ./dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild
 1912110241 ./dev-perl/String-Print/String-Print-0.930.0.ebuild
-1912110241 ./dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
+2106152009 ./dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
 2012311940 ./dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild
 1912110241 ./dev-perl/String-Tokenizer/String-Tokenizer-0.60.0.ebuild
 1912110241 ./dev-perl/String-Truncate/String-Truncate-1.100.602.ebuild
@@ -10514,7 +10524,7 @@
 2101070139 ./dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild
 2002041409 ./dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.4.1.ebuild
 2002050409 ./dev-perl/Clone-PP/Clone-PP-1.70.0.ebuild
-2105030009 ./dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
+2106151909 ./dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
 2002050409 ./dev-perl/Data-IEEE754/Data-IEEE754-0.20.0.ebuild
 2002050409 ./dev-perl/Data-Printer/Data-Printer-0.400.0.ebuild
 2105151609 ./dev-perl/Data-Printer/Data-Printer-1.0.4.ebuild
@@ -10605,7 +10615,7 @@
 2105150609 ./dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
 2106141009 ./dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
 2106111209 ./dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
-2106130109 ./dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
+2106151909 ./dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
 2012150539 ./dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
@@ -11135,7 +11145,6 @@
 2103020509 ./dev-python/boto/boto-2.49.0-r4.ebuild
 2105070139 ./dev-python/boto3/boto3-1.17.54.ebuild
 2105182039 ./dev-python/boto3/boto3-1.17.74.ebuild
-2105221109 ./dev-python/boto3/boto3-1.17.78.ebuild
 2105250839 ./dev-python/boto3/boto3-1.17.79.ebuild
 2105261139 ./dev-python/boto3/boto3-1.17.80.ebuild
 2105271009 ./dev-python/boto3/boto3-1.17.82.ebuild
@@ -11152,9 +11161,9 @@
 2106110239 ./dev-python/boto3/boto3-1.17.92.ebuild
 2106121009 ./dev-python/boto3/boto3-1.17.93.ebuild
 2106150909 ./dev-python/boto3/boto3-1.17.94.ebuild
+2106151039 ./dev-python/boto3/boto3-1.17.78.ebuild
 2105182039 ./dev-python/botocore/botocore-1.20.74.ebuild
 2105222139 ./dev-python/botocore/botocore-1.20.54.ebuild
-2105221109 ./dev-python/botocore/botocore-1.20.78.ebuild
 2105250839 ./dev-python/botocore/botocore-1.20.79.ebuild
 2105261139 ./dev-python/botocore/botocore-1.20.80.ebuild
 2105271009 ./dev-python/botocore/botocore-1.20.82.ebuild
@@ -11171,6 +11180,7 @@
 2106110239 ./dev-python/botocore/botocore-1.20.92.ebuild
 2106121009 ./dev-python/botocore/botocore-1.20.93.ebuild
 2106150909 ./dev-python/botocore/botocore-1.20.94.ebuild
+2106151039 ./dev-python/botocore/botocore-1.20.78.ebuild
 2105071439 ./dev-python/bottle/bottle-0.12.19.ebuild
 2101310343 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2105221739 ./dev-python/bpython/bpython-0.21.ebuild
@@ -11283,6 +11293,7 @@
 2106150839 ./dev-python/dask/dask-2021.5.0.ebuild
 2106012039 ./dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
 2104272139 ./dev-python/dbusmock/dbusmock-0.23.0.ebuild
+2106151209 ./dev-python/dbusmock/dbusmock-0.23.1.ebuild
 2105261009 ./dev-python/ddt/ddt-1.4.2.ebuild
 2105161609 ./dev-python/debtcollector/debtcollector-2.2.0.ebuild
 2104060140 ./dev-python/decorator/decorator-4.4.2-r1.ebuild
@@ -11302,8 +11313,8 @@
 2106141009 ./dev-python/dill/dill-0.3.4.ebuild
 2106010409 ./dev-python/discogs-client/discogs-client-2.3.12.ebuild
 2106010339 ./dev-python/discogs-client/discogs-client-9999.ebuild
-2106141409 ./dev-python/diskcache/diskcache-5.2.1-r1.ebuild
 2106141339 ./dev-python/diskcache/diskcache-5.2.1.ebuild
+2106151909 ./dev-python/diskcache/diskcache-5.2.1-r1.ebuild
 2101310343 ./dev-python/dissononce/dissononce-0.34.3-r1.ebuild
 2106051639 ./dev-python/distro/distro-1.5.0-r1.ebuild
 2106141009 ./dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -11387,7 +11398,7 @@
 2105132239 ./dev-python/falcon/falcon-3.0.1-r1.ebuild
 2104101109 ./dev-python/fasteners/fasteners-0.16-r1.ebuild
 2106140939 ./dev-python/fasteners/fasteners-0.16.2.ebuild
-2106150009 ./dev-python/fasteners/fasteners-0.16.3.ebuild
+2106151909 ./dev-python/fasteners/fasteners-0.16.3.ebuild
 2106051639 ./dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
 2104060140 ./dev-python/feedparser/feedparser-5.2.1-r1.ebuild
 2104060140 ./dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -11509,7 +11520,7 @@
 2104150939 ./dev-python/gsd/gsd-2.4.2.ebuild
 2103040339 ./dev-python/gst-python/gst-python-1.16.3.ebuild
 2106052209 ./dev-python/guessit/guessit-3.3.1.ebuild
-2105182039 ./dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+2106151039 ./dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
 2105182039 ./dev-python/h11/h11-0.12.0.ebuild
 2101310343 ./dev-python/h5py/h5py-2.10.0-r1.ebuild
 2106091839 ./dev-python/h5py/h5py-3.2.1.ebuild
@@ -11620,10 +11631,10 @@
 2104200039 ./dev-python/jikanpy/jikanpy-4.3.2.ebuild
 2104060140 ./dev-python/jinja/jinja-2.11.3.ebuild
 2105121209 ./dev-python/jinja/jinja-3.0.0.ebuild
-2105190109 ./dev-python/jinja/jinja-3.0.1.ebuild
+2106151039 ./dev-python/jinja/jinja-3.0.1.ebuild
 2106052209 ./dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
 2106051739 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
-2106041809 ./dev-python/jmespath/jmespath-0.10.0.ebuild
+2106151039 ./dev-python/jmespath/jmespath-0.10.0.ebuild
 2103150539 ./dev-python/joblib/joblib-1.0.1.ebuild
 2106051739 ./dev-python/josepy/josepy-1.8.0.ebuild
 2106051739 ./dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -11669,6 +11680,7 @@
 2106051739 ./dev-python/libnacl/libnacl-1.7.2-r1.ebuild
 2101310343 ./dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
 2101310343 ./dev-python/libtmux/libtmux-0.8.5.ebuild
+2106152109 ./dev-python/libtmux/libtmux-0.9.0.ebuild
 2104042109 ./dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
 2104042109 ./dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
 2104042109 ./dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
@@ -11715,7 +11727,7 @@
 2103072309 ./dev-python/markups/markups-3.1.0.ebuild
 2105052239 ./dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
 2105121209 ./dev-python/markupsafe/markupsafe-2.0.0.ebuild
-2106150839 ./dev-python/markupsafe/markupsafe-2.0.1.ebuild
+2106152009 ./dev-python/markupsafe/markupsafe-2.0.1.ebuild
 2103301039 ./dev-python/marshmallow/marshmallow-3.11.1.ebuild
 2105101039 ./dev-python/marshmallow/marshmallow-3.12.0.ebuild
 2105111109 ./dev-python/marshmallow/marshmallow-3.12.1.ebuild
@@ -12081,8 +12093,7 @@
 2106061609 ./dev-python/pylint/pylint-2.8.2.ebuild
 2101310343 ./dev-python/pymad/pymad-0.10.ebuild
 2105231509 ./dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
-2105032009 ./dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
-2106150839 ./dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
+2106151039 ./dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
 2101310343 ./dev-python/pymetar/pymetar-1.1-r1.ebuild
 2101310343 ./dev-python/pymetar/pymetar-1.2.ebuild
 2103071309 ./dev-python/pymetar/pymetar-1.2-r1.ebuild
@@ -12362,7 +12373,7 @@
 2106100009 ./dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild
 2106110239 ./dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
 2101310343 ./dev-python/ryu/ryu-4.34.ebuild
-2106041939 ./dev-python/s3transfer/s3transfer-0.4.2.ebuild
+2106151039 ./dev-python/s3transfer/s3transfer-0.4.2.ebuild
 2105152239 ./dev-python/sabyenc/sabyenc-4.0.2.ebuild
 2106052139 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
 2105240609 ./dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -12592,7 +12603,7 @@
 2101310343 ./dev-python/watchdog/watchdog-1.0.2.ebuild
 2105192139 ./dev-python/watchdog/watchdog-2.1.1.ebuild
 2105261009 ./dev-python/watchdog/watchdog-2.0.3.ebuild
-2106150839 ./dev-python/watchdog/watchdog-2.1.2.ebuild
+2106151639 ./dev-python/watchdog/watchdog-2.1.2.ebuild
 2105071339 ./dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
 2101310343 ./dev-python/weasyprint/weasyprint-51.ebuild
 2103031139 ./dev-python/weasyprint/weasyprint-52.3.ebuild
@@ -12861,8 +12872,7 @@
 2101310343 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
 2104060140 ./dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
 2106052139 ./dev-python/spur/spur-0.3.22.ebuild
-2105091239 ./dev-python/fsspec/fsspec-2021.04.0.ebuild
-2105151209 ./dev-python/fsspec/fsspec-2021.05.0.ebuild
+2106151039 ./dev-python/fsspec/fsspec-2021.05.0.ebuild
 2103081539 ./dev-python/loky/loky-2.9.0.ebuild
 2105061039 ./dev-python/text-unidecode/text-unidecode-1.3.ebuild
 2101310343 ./dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
@@ -13000,7 +13010,7 @@
 2103100009 ./dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
 2105310239 ./dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
 2106041109 ./dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild
-2106141009 ./dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+2106151909 ./dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
 2106150839 ./dev-python/stomp-py/stomp-py-7.0.0.ebuild
 2105102239 ./dev-python/whatever/whatever-0.6.ebuild
 2103052209 ./dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild
@@ -13150,7 +13160,7 @@
 2106010339 ./dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
 2106141009 ./dev-python/dj-search-url/dj-search-url-0.1.ebuild
 2106141009 ./dev-python/django-configurations/django-configurations-2.2.ebuild
-2106101309 ./dev-python/anyio/anyio-3.1.0.ebuild
+2106151109 ./dev-python/anyio/anyio-3.1.0.ebuild
 2106101309 ./dev-python/jupyter_packaging/jupyter_packaging-0.10.2.ebuild
 2106101309 ./dev-python/jupyter_server/jupyter_server-1.8.0.ebuild
 2106101309 ./dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.3.ebuild
@@ -13160,7 +13170,7 @@
 2106111709 ./dev-python/ghp-import/ghp-import-2.0.1.ebuild
 2106111709 ./dev-python/mergedeep/mergedeep-1.3.4.ebuild
 2106111709 ./dev-python/pytest-plus/pytest-plus-0.2.ebuild
-2106111939 ./dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
+2106151639 ./dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
 2106111809 ./dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
 2106141409 ./dev-python/python-lsp-black/python-lsp-black-1.0.0.ebuild
 2106131539 ./dev-python/pywinrm/pywinrm-0.4.2.ebuild
@@ -13169,6 +13179,8 @@
 2106132139 ./dev-python/fritzconnection/fritzconnection-1.5.0.ebuild
 2106141609 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.6.0.ebuild
 2106141809 ./dev-python/resolvelib/resolvelib-0.7.0.ebuild
+2106151839 ./dev-python/resolvelib/resolvelib-0.5.4.ebuild
+2106151839 ./dev-python/resolvelib/resolvelib-0.6.0.ebuild
 2101101239 ./dev-qt/assistant/assistant-5.15.2.ebuild
 2101101239 ./dev-qt/designer/designer-5.15.2.ebuild
 2101101239 ./dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
@@ -16016,8 +16028,8 @@
 2101070210 ./dev-util/cmake/cmake-3.13.5.ebuild
 2103160009 ./dev-util/cmake/cmake-3.19.7.ebuild
 2104060140 ./dev-util/cmake/cmake-3.18.5.ebuild
-2105261439 ./dev-util/cmake/cmake-3.20.2-r1.ebuild
 2105282209 ./dev-util/cmake/cmake-3.20.3.ebuild
+2106151539 ./dev-util/cmake/cmake-3.20.4.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
 2004080939 ./dev-util/codeblocks/codeblocks-9999.ebuild
 2007061039 ./dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -16161,6 +16173,7 @@
 2106132039 ./dev-util/goland/goland-2021.1.3.ebuild
 2008210639 ./dev-util/google-perftools/google-perftools-2.8.ebuild
 2008210939 ./dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+2106152209 ./dev-util/google-perftools/google-perftools-2.9.1.ebuild
 2001211409 ./dev-util/gource/gource-0.51.ebuild
 2104060140 ./dev-util/gperf/gperf-3.1.ebuild
 2101310343 ./dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -17534,7 +17547,8 @@
 2105031009 ./games-strategy/wesnoth/wesnoth-1.14.14.ebuild
 2105031009 ./games-strategy/wesnoth/wesnoth-1.15.12.ebuild
 2106031939 ./games-strategy/widelands/widelands-0.21.ebuild
-2106031939 ./games-strategy/widelands/widelands-9999.ebuild
+2106151509 ./games-strategy/widelands/widelands-1.0.ebuild
+2106151509 ./games-strategy/widelands/widelands-9999.ebuild
 2104121909 ./games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
 2004241239 ./games-strategy/settlers-2-gold-data/settlers-2-gold-data-0.ebuild
 2011230339 ./games-strategy/war1gus/war1gus-2.4.3.ebuild
@@ -18835,7 +18849,9 @@
 2105021209 ./mail-mta/postfix/postfix-3.5.10.ebuild
 2105021209 ./mail-mta/postfix/postfix-3.5.8-r1.ebuild
 2105021209 ./mail-mta/postfix/postfix-3.5.9-r1.ebuild
-2106081409 ./mail-mta/postfix/postfix-3.7_pre20210605.ebuild
+2106151209 ./mail-mta/postfix/postfix-3.5.11.ebuild
+2106151209 ./mail-mta/postfix/postfix-3.6.1.ebuild
+2106151209 ./mail-mta/postfix/postfix-3.7_pre20210612.ebuild
 2104120016 ./mail-mta/qpsmtpd/qpsmtpd-0.95-r1.ebuild
 2104120016 ./mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
 2105021209 ./mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -19137,9 +19153,9 @@
 2106021139 ./media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild
 2004261339 ./media-gfx/album/album-4.13-r2.ebuild
 2103020509 ./media-gfx/album/album-4.15-r1.ebuild
-2103052209 ./media-gfx/alembic/alembic-1.7.16.ebuild
 2106100039 ./media-gfx/alembic/alembic-1.8.0.ebuild
 2106090939 ./media-gfx/alembic/alembic-1.8.1.ebuild
+2106151809 ./media-gfx/alembic/alembic-1.8.2.ebuild
 1708180709 ./media-gfx/apng2gif/apng2gif-1.8.ebuild
 1906051109 ./media-gfx/apngasm/apngasm-2.91.ebuild
 1708180721 ./media-gfx/apngdis/apngdis-2.9.ebuild
@@ -19165,7 +19181,6 @@
 2012311940 ./media-gfx/crwinfo/crwinfo-0.2.ebuild
 2106102109 ./media-gfx/cura/cura-4.9.1.ebuild
 2106102109 ./media-gfx/curaengine/curaengine-4.9.1.ebuild
-2105231809 ./media-gfx/darktable/darktable-2.6.2.ebuild
 2105231809 ./media-gfx/darktable/darktable-3.4.1.ebuild
 2105231809 ./media-gfx/darktable/darktable-9999.ebuild
 1805191409 ./media-gfx/dawn/dawn-3.90b-r1.ebuild
@@ -19430,8 +19445,8 @@
 2106150139 ./media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild
 2103052109 ./media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
 2106051509 ./media-gfx/freecad/freecad-0.19.1.ebuild
-2106051739 ./media-gfx/freecad/freecad-0.19.2.ebuild
 2106051739 ./media-gfx/freecad/freecad-9999.ebuild
+2106151809 ./media-gfx/freecad/freecad-0.19.2.ebuild
 2105121509 ./media-gfx/brscan4/brscan4-0.4.10.1.ebuild
 2105241209 ./media-gfx/libredwg/libredwg-0.12.4.ebuild
 2106051609 ./media-gfx/hydrus/hydrus-441-r1.ebuild
@@ -19600,6 +19615,7 @@
 2012311940 ./media-libs/libafterimage/libafterimage-1.20-r3.ebuild
 2105200239 ./media-libs/libafterimage/libafterimage-1.20-r4.ebuild
 2104031909 ./media-libs/libao/libao-1.2.2-r1.ebuild
+2106151039 ./media-libs/libao/libao-1.2.2-r2.ebuild
 2004032241 ./media-libs/libaom/libaom-1.0.0-r2.ebuild
 2010131309 ./media-libs/libaom/libaom-2.0.0.ebuild
 2101191409 ./media-libs/libaom/libaom-2.0.1.ebuild
@@ -19705,8 +19721,7 @@
 2101240039 ./media-libs/liblqr/liblqr-0.4.2-r1.ebuild
 1811080309 ./media-libs/liblrdf/liblrdf-0.6.1.ebuild
 2008221939 ./media-libs/liblscp/liblscp-9999.ebuild
-2105151239 ./media-libs/liblscp/liblscp-0.9.3.ebuild
-2105291839 ./media-libs/liblscp/liblscp-0.9.2.ebuild
+2106151639 ./media-libs/liblscp/liblscp-0.9.3.ebuild
 2101061739 ./media-libs/libmad/libmad-0.15.1b-r10.ebuild
 2008070639 ./media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild
 2009252339 ./media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
@@ -20657,7 +20672,6 @@
 1803052238 ./media-sound/deinvert/deinvert-9999.ebuild
 2104111439 ./media-sound/denemo/denemo-2.3.0-r1.ebuild
 2105192039 ./media-sound/denemo/denemo-2.5.0.ebuild
-2105010239 ./media-sound/din/din-50.1.ebuild
 2106150839 ./media-sound/din/din-50.2.ebuild
 2105231309 ./media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
 2106011039 ./media-sound/drumstick/drumstick-2.2.1.ebuild
@@ -20885,8 +20899,7 @@
 2106120639 ./media-sound/qsynth/qsynth-0.9.3.ebuild
 2005210139 ./media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
 2005201639 ./media-sound/qtgain/qtgain-1.0.0.ebuild
-2104261339 ./media-sound/qtractor/qtractor-0.9.21.ebuild
-2105151239 ./media-sound/qtractor/qtractor-0.9.22.ebuild
+2106151639 ./media-sound/qtractor/qtractor-0.9.22.ebuild
 2005210139 ./media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
 2010131239 ./media-sound/quimup/quimup-1.4.4.ebuild
 2104160409 ./media-sound/quodlibet/quodlibet-4.4.0.ebuild
@@ -20979,8 +20992,7 @@
 1904082009 ./media-sound/vkeybd/vkeybd-0.1.18d.ebuild
 1912121909 ./media-sound/vlevel/vlevel-0.5-r1.ebuild
 1910180209 ./media-sound/vlorb/vlorb-1.2.ebuild
-2101301739 ./media-sound/vmpk/vmpk-0.8.0.ebuild
-2105151239 ./media-sound/vmpk/vmpk-0.8.3.ebuild
+2106151639 ./media-sound/vmpk/vmpk-0.8.3.ebuild
 2102130309 ./media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
 2011141839 ./media-sound/volwheel/volwheel-0.2.8-r1.ebuild
 2102252109 ./media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
@@ -21911,6 +21923,8 @@
 2101070009 ./net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
 2104130239 ./net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
 2105020009 ./net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+2106151039 ./net-ftp/proftpd/proftpd-1.3.7b.ebuild
+2106151139 ./net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
 1805212239 ./net-ftp/profxp/profxp-3_pre2-r2.ebuild
 2105021809 ./net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
 2105021809 ./net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
@@ -22075,6 +22089,7 @@
 2106130709 ./net-irc/unrealircd/unrealircd-5.0.8.ebuild
 2104202139 ./net-irc/weechat/weechat-9999.ebuild
 2104221939 ./net-irc/weechat/weechat-3.1.ebuild
+2106152209 ./net-irc/weechat/weechat-3.2.ebuild
 2104301309 ./net-irc/znc/znc-1.8.1.ebuild
 2106012139 ./net-irc/znc/znc-1.8.2.ebuild
 2106012139 ./net-irc/znc/znc-9999.ebuild
@@ -23301,6 +23316,7 @@
 2104021709 ./net-voip/yate/yate-9999.ebuild
 2101042039 ./net-voip/sipvicious/sipvicious-0.3.0.ebuild
 2103291909 ./net-voip/sipvicious/sipvicious-0.3.3.ebuild
+2106151039 ./net-voip/captagent/captagent-6.3.1.ebuild
 2104031539 ./net-vpn/6tunnel/6tunnel-0.13.ebuild
 2104180939 ./net-vpn/badvpn/badvpn-1.999.127.ebuild
 2104180939 ./net-vpn/badvpn/badvpn-1.999.129.ebuild
@@ -23308,7 +23324,7 @@
 2104161439 ./net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
 2101101639 ./net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
 2012111109 ./net-vpn/i2p/i2p-0.9.48.ebuild
-2105280539 ./net-vpn/i2pd/i2pd-2.38.0.ebuild
+2106151809 ./net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
 2104161439 ./net-vpn/iodine/iodine-0.7.0-r2.ebuild
 2105022309 ./net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
 1902241409 ./net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
@@ -23975,10 +23991,10 @@
 2106022009 ./sci-chemistry/gromacs/gromacs-2020.6.ebuild
 2106022009 ./sci-chemistry/gromacs/gromacs-2020.9999.ebuild
 2106022009 ./sci-chemistry/gromacs/gromacs-2021.1.ebuild
-2106022009 ./sci-chemistry/gromacs/gromacs-2021.2.ebuild
-2106022009 ./sci-chemistry/gromacs/gromacs-2021.9999.ebuild
 2106022009 ./sci-chemistry/gromacs/gromacs-2021.ebuild
-2106022009 ./sci-chemistry/gromacs/gromacs-9999.ebuild
+2106151239 ./sci-chemistry/gromacs/gromacs-2021.2.ebuild
+2106151239 ./sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+2106151239 ./sci-chemistry/gromacs/gromacs-9999.ebuild
 2009162339 ./sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
 2009162339 ./sci-chemistry/mars/mars-1.2.ebuild
 2101310343 ./sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
@@ -24492,10 +24508,8 @@
 2103192309 ./sci-libs/votca-tools/votca-tools-9999.ebuild
 2103281309 ./sci-libs/votca-tools/votca-tools-1.6.4.ebuild
 2104161439 ./sci-libs/votca-tools/votca-tools-1.5.1.ebuild
-2103260409 ./sci-libs/vtk/vtk-8.2.0.ebuild
 2106020439 ./sci-libs/vtk/vtk-9.0.1.ebuild
-2106100709 ./sci-libs/vtk/vtk-8.2.0-r1.ebuild
-2106100709 ./sci-libs/vtk/vtk-8.2.0-r2.ebuild
+2106151809 ./sci-libs/vtk/vtk-8.2.0-r3.ebuild
 2102222209 ./sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
 2101060939 ./sci-libs/xdrfile/xdrfile-1.1.4.ebuild
 1912132109 ./sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
@@ -24664,7 +24678,7 @@
 2101220209 ./sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
 2101220209 ./sci-mathematics/mathematica/mathematica-12.1.0.ebuild
 2009210510 ./sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
-2105101609 ./sci-mathematics/giac/giac-1.7.0.5.ebuild
+2106151739 ./sci-mathematics/giac/giac-1.7.0.13.ebuild
 2104080539 ./sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild
 2104180939 ./sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild
 2103071809 ./sci-misc/apertium/apertium-3.2.0.ebuild
@@ -24732,7 +24746,7 @@
 2104180939 ./sci-visualization/epix/epix-1.2.11-r3.ebuild
 2106101609 ./sci-visualization/epix/epix-1.2.19.ebuild
 1702282250 ./sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild
-2011291839 ./sci-visualization/fityk/fityk-1.3.1-r100.ebuild
+2106151309 ./sci-visualization/fityk/fityk-1.3.1-r101.ebuild
 2103132139 ./sci-visualization/g3data/g3data-1.5.4.ebuild
 2105041239 ./sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
 2105091809 ./sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -25560,7 +25574,6 @@
 2101170109 ./sys-apps/bat/bat-0.17.1-r1.ebuild
 2101111109 ./sys-apps/biosdevname/biosdevname-0.7.3.ebuild
 2104161439 ./sys-apps/biosdisk/biosdisk-1.01.ebuild
-2101310343 ./sys-apps/bleachbit/bleachbit-4.0.0.ebuild
 2102241939 ./sys-apps/bleachbit/bleachbit-4.2.0.ebuild
 2101192109 ./sys-apps/bolt/bolt-0.9-r2.ebuild
 2104122109 ./sys-apps/bolt/bolt-0.9-r3.ebuild
@@ -25654,7 +25667,7 @@
 2012021839 ./sys-apps/fwts/fwts-20.11.00.ebuild
 2105240139 ./sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
 2105240139 ./sys-apps/fwupd/fwupd-1.6.0-r1.ebuild
-2106150309 ./sys-apps/fwupd/fwupd-1.6.1.ebuild
+2106151539 ./sys-apps/fwupd/fwupd-1.6.1.ebuild
 2104180939 ./sys-apps/fxload/fxload-20081013-r1.ebuild
 2105131709 ./sys-apps/gawk/gawk-5.1.0.ebuild
 2101310343 ./sys-apps/gcp/gcp-0.2.1.ebuild
@@ -25872,6 +25885,7 @@
 2104030739 ./sys-apps/restorecond/restorecond-3.2.ebuild
 2104030739 ./sys-apps/restorecond/restorecond-9999.ebuild
 2006070509 ./sys-apps/ripgrep/ripgrep-12.1.1.ebuild
+2106152209 ./sys-apps/ripgrep/ripgrep-13.0.0.ebuild
 2002230040 ./sys-apps/rkflashtool/rkflashtool-6.1.ebuild
 2105140039 ./sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
 2106131209 ./sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -26392,6 +26406,7 @@
 2105100139 ./sys-cluster/openmpi/openmpi-2.1.6.ebuild
 2105100139 ./sys-cluster/openmpi/openmpi-3.0.4.ebuild
 2105100139 ./sys-cluster/openmpi/openmpi-3.1.4.ebuild
+2106151609 ./sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
 2005170039 ./sys-cluster/openstack-meta/openstack-meta-2020.1.9999.ebuild
 2010190239 ./sys-cluster/openstack-meta/openstack-meta-2020.2.0.ebuild
 2010190239 ./sys-cluster/openstack-meta/openstack-meta-2020.2.9999.ebuild
@@ -27845,7 +27860,7 @@
 2106071939 ./www-client/firefox/firefox-78.11.0.ebuild
 2106110009 ./www-client/google-chrome-beta/google-chrome-beta-92.0.4515.51.ebuild
 2106090039 ./www-client/google-chrome-unstable/google-chrome-unstable-93.0.4535.3.ebuild
-2106100039 ./www-client/google-chrome/google-chrome-91.0.4472.101.ebuild
+2106152009 ./www-client/google-chrome/google-chrome-91.0.4472.106.ebuild
 2104302139 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 2104180939 ./www-client/jd/jd-2.8.5_p120826.ebuild
 2104180939 ./www-client/jd/jd-2.8.9_p150226.ebuild
@@ -27925,8 +27940,8 @@
 2106032239 ./www-misc/xxv/xxv-1.6.1-r2.ebuild
 2008250009 ./www-plugins/browserpass/browserpass-3.0.7.ebuild
 2106090039 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4535.3_alpha.ebuild
-2106100039 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.101.ebuild
 2106110009 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.51_beta.ebuild
+2106152009 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.106.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
 2012261209 ./www-plugins/lightspark/lightspark-0.8.3.ebuild
 2102081839 ./www-plugins/lightspark/lightspark-0.8.4.ebuild
@@ -30125,8 +30140,6 @@
 2106082355 metadata/md5-cache/app-admin/abrt-2.14.2
 2106082355 metadata/md5-cache/app-admin/abrt-2.14.5
 2106082355 metadata/md5-cache/app-admin/analog-6.0.13
-2106082355 metadata/md5-cache/app-admin/ansible-2.10.7
-2106082355 metadata/md5-cache/app-admin/ansible-9999
 2106082355 metadata/md5-cache/app-admin/ansible-base-2.10.10
 2106082355 metadata/md5-cache/app-admin/ansible-base-2.10.9
 2106082355 metadata/md5-cache/app-admin/ansible-cmdb-1.28
@@ -30378,10 +30391,14 @@
 2106130939 metadata/md5-cache/app-admin/sysklogd-2.2.3
 2106140209 metadata/md5-cache/app-admin/apache-tools-2.4.48
 2106141609 metadata/md5-cache/app-admin/ansible-molecule-3.3.4
-2106141809 metadata/md5-cache/app-admin/ansible-2.11.1
-2106150909 metadata/md5-cache/app-admin/Manifest.gz
 2106150909 metadata/md5-cache/app-admin/awscli-1.19.94
 2106150809 metadata/md5-cache/app-admin/tripwire-2.4.3.7
+2106151839 metadata/md5-cache/app-admin/Manifest.gz
+2106151539 metadata/md5-cache/app-admin/ansible-2.10.7
+2106151539 metadata/md5-cache/app-admin/ansible-4.1.0
+2106151839 metadata/md5-cache/app-admin/ansible-base-2.11.1
+2106151839 metadata/md5-cache/app-admin/ansible-base-9999
+2106151709 metadata/md5-cache/app-admin/syslog-ng-3.32.1
 2106082355 metadata/md5-cache/app-antivirus/Manifest.gz
 2106082355 metadata/md5-cache/app-antivirus/clamav-0.103.2
 2106082355 metadata/md5-cache/app-antivirus/clamtk-6.11
@@ -31569,9 +31586,10 @@
 2106082355 metadata/md5-cache/app-dicts/wordnet-3.0-r5
 2106082355 metadata/md5-cache/app-dicts/wordnet-3.1
 2106082355 metadata/md5-cache/app-dicts/ydpdict-1.0.3
-2106101009 metadata/md5-cache/app-dicts/Manifest.gz
 2106101009 metadata/md5-cache/app-dicts/myspell-en-20210601-r1
 2106101009 metadata/md5-cache/app-dicts/myspell-fr-5.7-r1
+2106151039 metadata/md5-cache/app-dicts/Manifest.gz
+2106151039 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2002112051 metadata/md5-cache/app-doc/selfhtml-8.1.2
 2003261841 metadata/md5-cache/app-doc/devmanual-0_pre20200207
 2004032241 metadata/md5-cache/app-doc/jargon-4.4.7-r1
@@ -31783,7 +31801,6 @@
 2106082355 metadata/md5-cache/app-editors/mousepad-0.5.3-r1
 2106082355 metadata/md5-cache/app-editors/mousepad-0.5.4
 2106082355 metadata/md5-cache/app-editors/mousepad-0.5.5
-2106082355 metadata/md5-cache/app-editors/nano-5.3-r1
 2106082355 metadata/md5-cache/app-editors/nano-5.6.1
 2106082355 metadata/md5-cache/app-editors/nano-5.7
 2106082355 metadata/md5-cache/app-editors/nano-9999
@@ -31828,7 +31845,11 @@
 2106082355 metadata/md5-cache/app-editors/zile-2.4.15
 2106110139 metadata/md5-cache/app-editors/pluma-1.24.1
 2106121339 metadata/md5-cache/app-editors/vim-8.2.0814-r100
-2106141139 metadata/md5-cache/app-editors/Manifest.gz
+2106151609 metadata/md5-cache/app-editors/Manifest.gz
+2106151039 metadata/md5-cache/app-editors/gummi-0.8.2
+2106151539 metadata/md5-cache/app-editors/nano-5.8
+2106151609 metadata/md5-cache/app-editors/vscode-1.57.0
+2106151609 metadata/md5-cache/app-editors/vscodium-1.57.0
 2104192339 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2104192339 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2104192339 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -33003,7 +33024,6 @@
 2106082355 metadata/md5-cache/app-misc/resolve-march-native-1.0.0
 2106082355 metadata/md5-cache/app-misc/rioutil-1.5.4
 2106082355 metadata/md5-cache/app-misc/rl-0.2.7-r1
-2106082355 metadata/md5-cache/app-misc/rpick-0.8.1
 2106082355 metadata/md5-cache/app-misc/rpick-0.8.2
 2106082355 metadata/md5-cache/app-misc/rq-1.0.2
 2106082355 metadata/md5-cache/app-misc/rundeck-bin-2.6.8
@@ -33100,10 +33120,12 @@
 2106130339 metadata/md5-cache/app-misc/tracker-3.1.2
 2106130339 metadata/md5-cache/app-misc/tracker-miners-3.1.2
 2106140709 metadata/md5-cache/app-misc/dasel-1.15.0
-2106140539 metadata/md5-cache/app-misc/jpipe-0.0.1
 2106141909 metadata/md5-cache/app-misc/go-jira-1.0.28
-2106150909 metadata/md5-cache/app-misc/Manifest.gz
 2106150909 metadata/md5-cache/app-misc/jp-0.1.3.1
+2106152109 metadata/md5-cache/app-misc/Manifest.gz
+2106151409 metadata/md5-cache/app-misc/jpipe-0.1.3.1
+2106151039 metadata/md5-cache/app-misc/rpick-0.8.4
+2106152109 metadata/md5-cache/app-misc/tmuxp-1.8.1
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
@@ -34479,7 +34501,6 @@
 2106082355 metadata/md5-cache/dev-cpp/catch-1.9999
 2106082355 metadata/md5-cache/dev-cpp/catch-2.13.4
 2106082355 metadata/md5-cache/dev-cpp/catch-9999
-2106082355 metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r4
 2106082355 metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
 2106082355 metadata/md5-cache/dev-cpp/cpp-taskflow-3.0.0
 2106082355 metadata/md5-cache/dev-cpp/ctemplate-2.4
@@ -34549,8 +34570,9 @@
 2106120839 metadata/md5-cache/dev-cpp/asio-1.18.2
 2106130109 metadata/md5-cache/dev-cpp/benchmark-1.5.5
 2106121609 metadata/md5-cache/dev-cpp/pystring-1.1.3-r1
-2106141809 metadata/md5-cache/dev-cpp/Manifest.gz
 2106141809 metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
+2106151409 metadata/md5-cache/dev-cpp/Manifest.gz
+2106151409 metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r4
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1902091309 metadata/md5-cache/dev-db/ocp-0.3
 1902141809 metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13
@@ -36771,7 +36793,6 @@
 1702282313 metadata/md5-cache/dev-libs/libusbhp-1.0.2
 1810090339 metadata/md5-cache/dev-libs/skalibs-2.7.0.0
 1906221109 metadata/md5-cache/dev-libs/skalibs-2.8.1.0
-1712042339 metadata/md5-cache/dev-libs/tvision-2.1.0_pre2-r4
 1810142309 metadata/md5-cache/dev-libs/xbyak-5.73
 1911180309 metadata/md5-cache/dev-libs/replicant-0.8.1
 1911180139 metadata/md5-cache/dev-libs/rremove-1.0.5
@@ -37590,16 +37611,20 @@
 2106132339 metadata/md5-cache/dev-libs/gjs-1.68.1-r1
 2106132339 metadata/md5-cache/dev-libs/glib-2.68.2-r1
 2106132339 metadata/md5-cache/dev-libs/glib-2.68.3-r1
-2106141009 metadata/md5-cache/dev-libs/tree-sitter-0.19.5
 2106141509 metadata/md5-cache/dev-libs/ell-0.41
 2106141409 metadata/md5-cache/dev-libs/icu-layoutex-69.1
 2106141709 metadata/md5-cache/dev-libs/leatherman-1.12.5
-2106141239 metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
 2106141239 metadata/md5-cache/dev-libs/tvision-2.2.1.4
-2106150639 metadata/md5-cache/dev-libs/Manifest.gz
 2106150510 metadata/md5-cache/dev-libs/pegtl-3.2.0
 2106150639 metadata/md5-cache/dev-libs/xapian-1.2.25
 2106150139 metadata/md5-cache/dev-libs/xapian-1.4.17
+2106152139 metadata/md5-cache/dev-libs/Manifest.gz
+2106151809 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902-r1
+2106152139 metadata/md5-cache/dev-libs/cereal-1.3.0-r1
+2106151809 metadata/md5-cache/dev-libs/criterion-2.4_pre20210114
+2106151909 metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
+2106151909 metadata/md5-cache/dev-libs/tree-sitter-0.19.5
+2106151809 metadata/md5-cache/dev-libs/tvision-2.2.3
 2012231444 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2104180939 metadata/md5-cache/dev-lisp/asdf-3.1.5
 2106082355 metadata/md5-cache/dev-lisp/Manifest.gz
@@ -37952,7 +37977,6 @@
 2105180040 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
 2105180040 metadata/md5-cache/dev-perl/App-CLI-0.520.0
 2105180040 metadata/md5-cache/dev-perl/App-Cmd-0.331.0
-2105180040 metadata/md5-cache/dev-perl/App-Cmd-0.333.0
 2105180040 metadata/md5-cache/dev-perl/App-FatPacker-0.10.8
 2105180040 metadata/md5-cache/dev-perl/App-Nopaste-1.13.0
 2105180040 metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
@@ -37964,7 +37988,6 @@
 2105180040 metadata/md5-cache/dev-perl/Archive-Extract-0.800.0
 2105180040 metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
 2105180040 metadata/md5-cache/dev-perl/Archive-Tar-Stream-0.30.0-r1
-2105180040 metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.380.0
 2105180040 metadata/md5-cache/dev-perl/Archive-Zip-1.680.0
 2105180040 metadata/md5-cache/dev-perl/Array-Compare-3.0.3
 2105180040 metadata/md5-cache/dev-perl/Array-Compare-3.0.8
@@ -38055,7 +38078,6 @@
 2105180040 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.103.200
 2105180040 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.104.200
 2105180040 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.4.280
-2105180040 metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15
 2105180040 metadata/md5-cache/dev-perl/CQL-Parser-1.130.0-r1
 2105180040 metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r2
 2105180040 metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.130.0
@@ -38140,7 +38162,6 @@
 2105180040 metadata/md5-cache/dev-perl/Clone-0.390.0
 2105180040 metadata/md5-cache/dev-perl/Clone-0.450.0
 2105180040 metadata/md5-cache/dev-perl/Clone-PP-1.70.0
-2105180040 metadata/md5-cache/dev-perl/Clone-PP-1.80.0
 2105180040 metadata/md5-cache/dev-perl/Color-Calc-1.74.0
 2105180040 metadata/md5-cache/dev-perl/Color-Library-0.21.0-r2
 2105180040 metadata/md5-cache/dev-perl/Compiler-Lexer-0.230.0
@@ -38156,12 +38177,10 @@
 2105180040 metadata/md5-cache/dev-perl/Config-General-2.630.0
 2105180040 metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
 2105180040 metadata/md5-cache/dev-perl/Config-Grammar-1.130.0
-2105180040 metadata/md5-cache/dev-perl/Config-INI-0.25.0
 2105180040 metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
 2105180040 metadata/md5-cache/dev-perl/Config-IniFiles-3.0.3
 2105180040 metadata/md5-cache/dev-perl/Config-JSON-1.520.200-r1
 2105180040 metadata/md5-cache/dev-perl/Config-MVP-2.200.11
-2105180040 metadata/md5-cache/dev-perl/Config-MVP-2.200.12
 2105180040 metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.463
 2105180040 metadata/md5-cache/dev-perl/Config-MVP-Slicer-0.303.0
 2105180040 metadata/md5-cache/dev-perl/Config-Properties-1.800.0-r1
@@ -38596,7 +38615,6 @@
 2105180040 metadata/md5-cache/dev-perl/IO-Socket-SSL-2.66.0
 2105180040 metadata/md5-cache/dev-perl/IO-Socket-Timeout-0.320.0
 2105180040 metadata/md5-cache/dev-perl/IO-Tee-0.650.0
-2105180040 metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
 2105180040 metadata/md5-cache/dev-perl/IO-Util-1.500.0-r2
 2105180040 metadata/md5-cache/dev-perl/IPC-Run-0.960.0
 2105180040 metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
@@ -38725,7 +38743,6 @@
 2105180040 metadata/md5-cache/dev-perl/MaxMind-DB-Reader-1.0.14
 2105180040 metadata/md5-cache/dev-perl/MaxMind-DB-Reader-XS-1.0.8
 2105180040 metadata/md5-cache/dev-perl/MediaWiki-API-0.410.0
-2105180040 metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
 2105180040 metadata/md5-cache/dev-perl/Mock-Config-0.30.0
 2105180040 metadata/md5-cache/dev-perl/Modem-Vgetty-0.30.0-r2
 2105180040 metadata/md5-cache/dev-perl/Modern-Perl-1.201.907.270
@@ -38785,10 +38802,7 @@
 2105180040 metadata/md5-cache/dev-perl/MooseX-Has-Sugar-1.0.6
 2105180040 metadata/md5-cache/dev-perl/MooseX-LazyRequire-0.110.0
 2105180040 metadata/md5-cache/dev-perl/MooseX-Object-Pluggable-0.1.400
-2105180040 metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
 2105180040 metadata/md5-cache/dev-perl/MooseX-Params-Validate-0.210.0
-2105180040 metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
-2105180040 metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
 2105180040 metadata/md5-cache/dev-perl/MooseX-SetOnce-0.200.2
 2105180040 metadata/md5-cache/dev-perl/MooseX-SimpleConfig-0.110.0
 2105180040 metadata/md5-cache/dev-perl/MooseX-StrictConstructor-0.210.0
@@ -38996,8 +39010,6 @@
 2105180040 metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0
 2105180040 metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0
 2105180040 metadata/md5-cache/dev-perl/Return-Value-1.666.5
-2105180040 metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
-2105180040 metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
 2105180040 metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
 2105180040 metadata/md5-cache/dev-perl/Router-Simple-0.170.0
 2105180040 metadata/md5-cache/dev-perl/SGMLSpm-1.1-r1
@@ -39043,13 +39055,10 @@
 2105180040 metadata/md5-cache/dev-perl/Stream-Buffered-0.30.0
 2105180040 metadata/md5-cache/dev-perl/String-Approx-3.280.0
 2105180040 metadata/md5-cache/dev-perl/String-CRC32-1.600.0
-2105180040 metadata/md5-cache/dev-perl/String-Errf-0.8.0
 2105180040 metadata/md5-cache/dev-perl/String-Escape-2010.2.0-r1
 2105180040 metadata/md5-cache/dev-perl/String-Flogger-1.101.245
 2105180040 metadata/md5-cache/dev-perl/String-Format-1.180.0
-2105180040 metadata/md5-cache/dev-perl/String-Formatter-0.102.84
 2105180040 metadata/md5-cache/dev-perl/String-Print-0.930.0
-2105180040 metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
 2105180040 metadata/md5-cache/dev-perl/String-Tokenizer-0.60.0
 2105180040 metadata/md5-cache/dev-perl/String-Truncate-1.100.602
 2105180040 metadata/md5-cache/dev-perl/Struct-Compare-1.0.1
@@ -39894,7 +39903,6 @@
 2106110239 metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.120.0
 2106111209 metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
 2106111209 metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
-2106130109 metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
 2106130209 metadata/md5-cache/dev-perl/Frontier-RPC-0.07_beta4-r4
 2106130109 metadata/md5-cache/dev-perl/Gtk2-Unique-0.70.0
 2106130109 metadata/md5-cache/dev-perl/Gtk3-0.38.0
@@ -39912,7 +39920,6 @@
 2106131809 metadata/md5-cache/dev-perl/HTML-Packer-2.100.0
 2106131809 metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
 2106130109 metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0-r1
-2106130109 metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
 2106130109 metadata/md5-cache/dev-perl/Hash-MoreUtils-0.60.0
 2106130109 metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0-r1
 2106130139 metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
@@ -39929,7 +39936,25 @@
 2106150239 metadata/md5-cache/dev-perl/HTTP-Body-1.220.0-r1
 2106150239 metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
 2106150239 metadata/md5-cache/dev-perl/HTTP-CookieJar-0.10.0
-2106150239 metadata/md5-cache/dev-perl/Manifest.gz
+2106152009 metadata/md5-cache/dev-perl/App-Cmd-0.333.0
+2106152009 metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.380.0
+2106152009 metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15
+2106151909 metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
+2106151909 metadata/md5-cache/dev-perl/Clone-PP-1.80.0
+2106152009 metadata/md5-cache/dev-perl/Config-INI-0.25.0
+2106152009 metadata/md5-cache/dev-perl/Config-MVP-2.200.12
+2106151909 metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
+2106152009 metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
+2106152009 metadata/md5-cache/dev-perl/Manifest.gz
+2106152009 metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
+2106152009 metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
+2106152009 metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
+2106152009 metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
+2106152009 metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
+2106152009 metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
+2106152009 metadata/md5-cache/dev-perl/String-Errf-0.8.0
+2106152009 metadata/md5-cache/dev-perl/String-Formatter-0.102.84
+2106152009 metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
 1903202339 metadata/md5-cache/dev-php/PEAR-HTTP_Header-1.2.1-r2
 1702282315 metadata/md5-cache/dev-php/cli-prompt-1.0.0
 1812180409 metadata/md5-cache/dev-php/cli-prompt-1.0.3
@@ -40509,7 +40534,6 @@
 2106082355 metadata/md5-cache/dev-python/boto-2.49.0-r4
 2106082355 metadata/md5-cache/dev-python/boto3-1.17.54
 2106082355 metadata/md5-cache/dev-python/boto3-1.17.74
-2106082355 metadata/md5-cache/dev-python/boto3-1.17.78
 2106082355 metadata/md5-cache/dev-python/boto3-1.17.79
 2106082355 metadata/md5-cache/dev-python/boto3-1.17.80
 2106082355 metadata/md5-cache/dev-python/boto3-1.17.82
@@ -40523,7 +40547,6 @@
 2106082355 metadata/md5-cache/dev-python/boto3-9999
 2106082355 metadata/md5-cache/dev-python/botocore-1.20.54
 2106082355 metadata/md5-cache/dev-python/botocore-1.20.74
-2106082355 metadata/md5-cache/dev-python/botocore-1.20.78
 2106082355 metadata/md5-cache/dev-python/botocore-1.20.79
 2106082355 metadata/md5-cache/dev-python/botocore-1.20.80
 2106082355 metadata/md5-cache/dev-python/botocore-1.20.82
@@ -40865,8 +40888,6 @@
 2106082355 metadata/md5-cache/dev-python/frozen-flask-0.17
 2106082355 metadata/md5-cache/dev-python/frozendict-1.2
 2106082355 metadata/md5-cache/dev-python/fs-2.4.13
-2106082355 metadata/md5-cache/dev-python/fsspec-2021.04.0
-2106082355 metadata/md5-cache/dev-python/fsspec-2021.05.0
 2106082355 metadata/md5-cache/dev-python/fudge-1.1.1
 2106082355 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
 2106082355 metadata/md5-cache/dev-python/fuse-python-1.0.0
@@ -40924,7 +40945,6 @@
 2106082355 metadata/md5-cache/dev-python/gssapi-1.6.12
 2106082355 metadata/md5-cache/dev-python/gst-python-1.16.3
 2106082355 metadata/md5-cache/dev-python/guessit-3.3.1
-2106082355 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
 2106082355 metadata/md5-cache/dev-python/h11-0.12.0
 2106082355 metadata/md5-cache/dev-python/h5py-2.10.0-r1
 2106082355 metadata/md5-cache/dev-python/hacking-4.1.0
@@ -41059,10 +41079,8 @@
 2106082355 metadata/md5-cache/dev-python/jikanpy-4.3.2
 2106082355 metadata/md5-cache/dev-python/jinja-2.11.3
 2106082355 metadata/md5-cache/dev-python/jinja-3.0.0
-2106082355 metadata/md5-cache/dev-python/jinja-3.0.1
 2106082355 metadata/md5-cache/dev-python/jinja2-time-0.2.0
 2106082355 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
-2106082355 metadata/md5-cache/dev-python/jmespath-0.10.0
 2106082355 metadata/md5-cache/dev-python/joblib-1.0.1
 2106082355 metadata/md5-cache/dev-python/josepy-1.8.0
 2106082355 metadata/md5-cache/dev-python/jq-1.1.2
@@ -41589,7 +41607,6 @@
 2106082355 metadata/md5-cache/dev-python/pymdown-extensions-8.2
 2106082355 metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
 2106082355 metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
-2106082355 metadata/md5-cache/dev-python/pymediainfo-5.0.4
 2106082355 metadata/md5-cache/dev-python/pymetar-1.1-r1
 2106082355 metadata/md5-cache/dev-python/pymetar-1.2
 2106082355 metadata/md5-cache/dev-python/pymetar-1.2-r1
@@ -41950,7 +41967,6 @@
 2106082355 metadata/md5-cache/dev-python/ruamel-yaml-0.17.7
 2106082355 metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
 2106082355 metadata/md5-cache/dev-python/ryu-4.34
-2106082355 metadata/md5-cache/dev-python/s3transfer-0.4.2
 2106082355 metadata/md5-cache/dev-python/sabyenc-4.0.2
 2106082355 metadata/md5-cache/dev-python/sarge-0.1.5
 2106082355 metadata/md5-cache/dev-python/scandir-1.10.0-r2
@@ -42337,7 +42353,6 @@
 2106091839 metadata/md5-cache/dev-python/virtualenv-20.4.7
 2106100009 metadata/md5-cache/dev-python/xmlschema-1.6.4
 2106091809 metadata/md5-cache/dev-python/zope-interface-5.4.0
-2106101309 metadata/md5-cache/dev-python/anyio-3.1.0
 2106101709 metadata/md5-cache/dev-python/argh-0.26.2-r2
 2106101709 metadata/md5-cache/dev-python/asgiref-3.3.4
 2106101009 metadata/md5-cache/dev-python/boto3-1.17.91
@@ -42399,7 +42414,6 @@
 2106111409 metadata/md5-cache/dev-python/pytest-html-3.1.1
 2106111709 metadata/md5-cache/dev-python/pytest-plus-0.2
 2106111739 metadata/md5-cache/dev-python/pytest-qt-4.0.1
-2106111939 metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
 2106111809 metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
 2106111739 metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
 2106111709 metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
@@ -42438,11 +42452,9 @@
 2106141009 metadata/md5-cache/dev-python/feedparser-6.0.4
 2106132139 metadata/md5-cache/dev-python/fritzconnection-1.5.0
 2106141009 metadata/md5-cache/dev-python/pytest-django-4.4.0
-2106141009 metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
 2106141009 metadata/md5-cache/dev-python/vdirsyncer-0.18.0
 2106141009 metadata/md5-cache/dev-python/xdg-5.1.0
 2106141339 metadata/md5-cache/dev-python/diskcache-5.2.1
-2106141409 metadata/md5-cache/dev-python/diskcache-5.2.1-r1
 2106141409 metadata/md5-cache/dev-python/pyls-spyder-0.4.0
 2106141409 metadata/md5-cache/dev-python/python-lsp-black-1.0.0
 2106141409 metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
@@ -42452,7 +42464,6 @@
 2106141809 metadata/md5-cache/dev-python/resolvelib-0.7.0
 2106142009 metadata/md5-cache/dev-python/uranium-4.9.1
 2106150009 metadata/md5-cache/dev-python/Faker-8.8.0
-2106150909 metadata/md5-cache/dev-python/Manifest.gz
 2106150739 metadata/md5-cache/dev-python/aesara-2.0.8
 2106150009 metadata/md5-cache/dev-python/apispec-4.6.0
 2106150109 metadata/md5-cache/dev-python/blessed-1.18.1
@@ -42465,7 +42476,6 @@
 2106150739 metadata/md5-cache/dev-python/colorlog-5.0.1
 2106150739 metadata/md5-cache/dev-python/configargparse-1.4.1
 2106150839 metadata/md5-cache/dev-python/dask-2021.5.0
-2106150009 metadata/md5-cache/dev-python/fasteners-0.16.3
 2106150009 metadata/md5-cache/dev-python/feedparser-6.0.5
 2106150139 metadata/md5-cache/dev-python/flake8-3.9.2
 2106150139 metadata/md5-cache/dev-python/flask-1.1.4
@@ -42478,13 +42488,11 @@
 2106150139 metadata/md5-cache/dev-python/itsdangerous-2.0.1
 2106142309 metadata/md5-cache/dev-python/jq-1.1.3
 2106150909 metadata/md5-cache/dev-python/m2crypto-0.38.0
-2106150839 metadata/md5-cache/dev-python/markupsafe-2.0.1
 2106150839 metadata/md5-cache/dev-python/nbsphinx-0.8.5
 2106150139 metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.1
 2106150839 metadata/md5-cache/dev-python/phonenumbers-8.12.24
 2106150839 metadata/md5-cache/dev-python/pikepdf-2.12.0
 2106150839 metadata/md5-cache/dev-python/pycares-4.0.0
-2106150839 metadata/md5-cache/dev-python/pymediainfo-5.1.0
 2106150139 metadata/md5-cache/dev-python/pytest-cov-2.12.1
 2106150709 metadata/md5-cache/dev-python/sentry-sdk-1.1.0
 2106150139 metadata/md5-cache/dev-python/serpent-1.40
@@ -42493,8 +42501,27 @@
 2106150510 metadata/md5-cache/dev-python/sip-5.5.0-r1
 2106150510 metadata/md5-cache/dev-python/sip-6.1.0
 2106150839 metadata/md5-cache/dev-python/stomp-py-7.0.0
-2106150839 metadata/md5-cache/dev-python/watchdog-2.1.2
 2106150839 metadata/md5-cache/dev-python/xlsxwriter-1.4.3
+2106152109 metadata/md5-cache/dev-python/Manifest.gz
+2106151109 metadata/md5-cache/dev-python/anyio-3.1.0
+2106151039 metadata/md5-cache/dev-python/boto3-1.17.78
+2106151039 metadata/md5-cache/dev-python/botocore-1.20.78
+2106151209 metadata/md5-cache/dev-python/dbusmock-0.23.1
+2106151909 metadata/md5-cache/dev-python/diskcache-5.2.1-r1
+2106151909 metadata/md5-cache/dev-python/fasteners-0.16.3
+2106151039 metadata/md5-cache/dev-python/fsspec-2021.05.0
+2106151039 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
+2106151039 metadata/md5-cache/dev-python/jinja-3.0.1
+2106151039 metadata/md5-cache/dev-python/jmespath-0.10.0
+2106152109 metadata/md5-cache/dev-python/libtmux-0.9.0
+2106152009 metadata/md5-cache/dev-python/markupsafe-2.0.1
+2106151039 metadata/md5-cache/dev-python/pymediainfo-5.1.0
+2106151639 metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
+2106151839 metadata/md5-cache/dev-python/resolvelib-0.5.4
+2106151839 metadata/md5-cache/dev-python/resolvelib-0.6.0
+2106151039 metadata/md5-cache/dev-python/s3transfer-0.4.2
+2106151909 metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
+2106151639 metadata/md5-cache/dev-python/watchdog-2.1.2
 2101101239 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2106082355 metadata/md5-cache/dev-qt/assistant-5.15.2
 2106082355 metadata/md5-cache/dev-qt/designer-5.15.2
@@ -45493,7 +45520,6 @@
 2106082355 metadata/md5-cache/dev-util/cmake-3.13.5
 2106082355 metadata/md5-cache/dev-util/cmake-3.18.5
 2106082355 metadata/md5-cache/dev-util/cmake-3.19.7
-2106082355 metadata/md5-cache/dev-util/cmake-3.20.2-r1
 2106082355 metadata/md5-cache/dev-util/cmake-3.20.3
 2106082355 metadata/md5-cache/dev-util/cmake-fedora-2.7.1
 2106082355 metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -45927,12 +45953,14 @@
 2106132339 metadata/md5-cache/dev-util/sysprof-3.38.1-r1
 2106132339 metadata/md5-cache/dev-util/sysprof-3.40.1-r1
 2106132339 metadata/md5-cache/dev-util/sysprof-capture-3.40.1
-2106150339 metadata/md5-cache/dev-util/Manifest.gz
 2106150139 metadata/md5-cache/dev-util/conan-1.36.0
 2106150339 metadata/md5-cache/dev-util/jenkins-bin-2.297
 2106150109 metadata/md5-cache/dev-util/pkgcheck-0.10.1
 2106150109 metadata/md5-cache/dev-util/rustup-1.24.3
 2106150109 metadata/md5-cache/dev-util/rustup-9999
+2106152209 metadata/md5-cache/dev-util/Manifest.gz
+2106151539 metadata/md5-cache/dev-util/cmake-3.20.4
+2106152209 metadata/md5-cache/dev-util/google-perftools-2.9.1
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1807302309 metadata/md5-cache/dev-vcs/easygit-1.7.5.2
 1702282322 metadata/md5-cache/dev-vcs/git-merge-changelog-20170131
@@ -46842,7 +46870,6 @@
 2104120539 metadata/md5-cache/games-strategy/satellite-reign-1.13.06
 2106082355 metadata/md5-cache/games-strategy/0ad-0.0.24_alpha_pre20210116040036-r2
 2106082355 metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha
-2106082355 metadata/md5-cache/games-strategy/Manifest.gz
 2106082355 metadata/md5-cache/games-strategy/colobot-0.1.12
 2106082355 metadata/md5-cache/games-strategy/colobot-9999
 2106082355 metadata/md5-cache/games-strategy/colobot-data-0.1.12
@@ -46889,8 +46916,10 @@
 2106082355 metadata/md5-cache/games-strategy/wesnoth-1.14.14
 2106082355 metadata/md5-cache/games-strategy/wesnoth-1.15.12
 2106082355 metadata/md5-cache/games-strategy/widelands-0.21
-2106082355 metadata/md5-cache/games-strategy/widelands-9999
 2106082355 metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
+2106151509 metadata/md5-cache/games-strategy/Manifest.gz
+2106151509 metadata/md5-cache/games-strategy/widelands-1.0
+2106151509 metadata/md5-cache/games-strategy/widelands-9999
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1707090139 metadata/md5-cache/games-util/xgame-gtk2-2.0.2-r1
 2011222009 metadata/md5-cache/games-util/etswitch-0.1.14-r1
@@ -48207,14 +48236,16 @@
 2106082355 metadata/md5-cache/mail-mta/postfix-3.5.8-r1
 2106082355 metadata/md5-cache/mail-mta/postfix-3.5.9-r1
 2106082355 metadata/md5-cache/mail-mta/postfix-3.6.0
-2106082355 metadata/md5-cache/mail-mta/postfix-3.7_pre20210605
 2106082355 metadata/md5-cache/mail-mta/protonmail-bridge-1.8.1
 2106082355 metadata/md5-cache/mail-mta/protonmail-bridge-1.8.3
 2106082355 metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
 2106082355 metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
 2106082355 metadata/md5-cache/mail-mta/ssmtp-2.64-r4
-2106150909 metadata/md5-cache/mail-mta/Manifest.gz
 2106150909 metadata/md5-cache/mail-mta/nullmailer-2.2-r1
+2106151209 metadata/md5-cache/mail-mta/Manifest.gz
+2106151209 metadata/md5-cache/mail-mta/postfix-3.5.11
+2106151209 metadata/md5-cache/mail-mta/postfix-3.6.1
+2106151209 metadata/md5-cache/mail-mta/postfix-3.7_pre20210612
 2008070639 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2104031909 metadata/md5-cache/mate-base/mate-common-1.24.1
 2104031909 metadata/md5-cache/mate-base/mate-common-1.24.2
@@ -48563,7 +48594,6 @@
 2106082355 metadata/md5-cache/media-gfx/aewan-1.0.01-r1
 2106082355 metadata/md5-cache/media-gfx/ahoviewer-1.6.5-r3
 2106082355 metadata/md5-cache/media-gfx/ahoviewer-2.0.0_beta
-2106082355 metadata/md5-cache/media-gfx/alembic-1.7.16
 2106082355 metadata/md5-cache/media-gfx/apng2gif-1.8
 2106082355 metadata/md5-cache/media-gfx/apngasm-2.91
 2106082355 metadata/md5-cache/media-gfx/apngdis-2.9
@@ -48582,7 +48612,6 @@
 2106082355 metadata/md5-cache/media-gfx/cropgui-0.4.1
 2106082355 metadata/md5-cache/media-gfx/cropgui-0.5
 2106082355 metadata/md5-cache/media-gfx/crwinfo-0.2
-2106082355 metadata/md5-cache/media-gfx/darktable-2.6.2
 2106082355 metadata/md5-cache/media-gfx/darktable-3.4.1
 2106082355 metadata/md5-cache/media-gfx/darktable-9999
 2106082355 metadata/md5-cache/media-gfx/dawn-3.90b-r1
@@ -48622,7 +48651,6 @@
 2106082355 metadata/md5-cache/media-gfx/fontforge-20201107
 2106082355 metadata/md5-cache/media-gfx/fotowall-1.0
 2106082355 metadata/md5-cache/media-gfx/freecad-0.19.1
-2106082355 metadata/md5-cache/media-gfx/freecad-0.19.2
 2106082355 metadata/md5-cache/media-gfx/freecad-9999
 2106082355 metadata/md5-cache/media-gfx/freepv-0.3.0-r5
 2106082355 metadata/md5-cache/media-gfx/frogr-1.3
@@ -48810,8 +48838,10 @@
 2106141809 metadata/md5-cache/media-gfx/imagemagick-6.9.12.15
 2106141809 metadata/md5-cache/media-gfx/imagemagick-7.1.0.0
 2106141809 metadata/md5-cache/media-gfx/imagemagick-9999
-2106150139 metadata/md5-cache/media-gfx/Manifest.gz
 2106150139 metadata/md5-cache/media-gfx/prusaslicer-2.3.1
+2106151809 metadata/md5-cache/media-gfx/Manifest.gz
+2106151809 metadata/md5-cache/media-gfx/alembic-1.8.2
+2106151809 metadata/md5-cache/media-gfx/freecad-0.19.2
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1702282326 metadata/md5-cache/media-libs/libxtract-0.6.6
@@ -48854,11 +48884,9 @@
 2105022109 metadata/md5-cache/media-libs/opusfile-0.12
 2105061309 metadata/md5-cache/media-libs/libuninameslist-20200413-r1
 2105090909 metadata/md5-cache/media-libs/libpano13-2.9.20
-2105151239 metadata/md5-cache/media-libs/liblscp-0.9.3
 2105182039 metadata/md5-cache/media-libs/libltc-1.3.1-r1
 2105272239 metadata/md5-cache/media-libs/exiftool-12.26
 2105291539 metadata/md5-cache/media-libs/libxspf-1.2.1
-2105291839 metadata/md5-cache/media-libs/liblscp-0.9.2
 2105291939 metadata/md5-cache/media-libs/libsidplayfp-2.2.0
 2105311239 metadata/md5-cache/media-libs/gmtk-1.0.9
 2105311239 metadata/md5-cache/media-libs/quesoglc-0.7.2
@@ -49401,8 +49429,10 @@
 2106121909 metadata/md5-cache/media-libs/libvpx-1.10.0
 2106130939 metadata/md5-cache/media-libs/opus-1.3.1-r2
 2106141239 metadata/md5-cache/media-libs/SoXt-1.4.0
-2106150109 metadata/md5-cache/media-libs/Manifest.gz
 2106150109 metadata/md5-cache/media-libs/leptonica-1.81.1
+2106151639 metadata/md5-cache/media-libs/Manifest.gz
+2106151039 metadata/md5-cache/media-libs/libao-1.2.2-r2
+2106151639 metadata/md5-cache/media-libs/liblscp-0.9.3
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -50101,7 +50131,6 @@
 2106082355 metadata/md5-cache/media-sound/deinvert-9999
 2106082355 metadata/md5-cache/media-sound/denemo-2.3.0-r1
 2106082355 metadata/md5-cache/media-sound/denemo-2.5.0
-2106082355 metadata/md5-cache/media-sound/din-50.1
 2106082355 metadata/md5-cache/media-sound/dir2ogg-0.13-r1
 2106082355 metadata/md5-cache/media-sound/drumstick-2.2.1
 2106082355 metadata/md5-cache/media-sound/dvda-author-10.06-r1
@@ -50279,8 +50308,6 @@
 2106082355 metadata/md5-cache/media-sound/qsynth-9999
 2106082355 metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
 2106082355 metadata/md5-cache/media-sound/qtgain-1.0.0
-2106082355 metadata/md5-cache/media-sound/qtractor-0.9.21
-2106082355 metadata/md5-cache/media-sound/qtractor-0.9.22
 2106082355 metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
 2106082355 metadata/md5-cache/media-sound/quimup-1.4.4
 2106082355 metadata/md5-cache/media-sound/quodlibet-4.4.0
@@ -50358,8 +50385,6 @@
 2106082355 metadata/md5-cache/media-sound/vimpc-9999
 2106082355 metadata/md5-cache/media-sound/vkeybd-0.1.18d
 2106082355 metadata/md5-cache/media-sound/vlevel-0.5-r1
-2106082355 metadata/md5-cache/media-sound/vmpk-0.8.0
-2106082355 metadata/md5-cache/media-sound/vmpk-0.8.3
 2106082355 metadata/md5-cache/media-sound/volumeicon-0.5.1-r2
 2106082355 metadata/md5-cache/media-sound/vsound-0.6-r1
 2106082355 metadata/md5-cache/media-sound/wav2json-0.4
@@ -50403,9 +50428,11 @@
 2106130939 metadata/md5-cache/media-sound/qmmp-1.4.6
 2106141009 metadata/md5-cache/media-sound/gigedit-1.2.0-r1
 2106141009 metadata/md5-cache/media-sound/gigedit-9999
-2106150839 metadata/md5-cache/media-sound/Manifest.gz
 2106150839 metadata/md5-cache/media-sound/din-50.2
 2106142139 metadata/md5-cache/media-sound/sc2mpd-1.1.8
+2106151639 metadata/md5-cache/media-sound/Manifest.gz
+2106151639 metadata/md5-cache/media-sound/qtractor-0.9.22
+2106151639 metadata/md5-cache/media-sound/vmpk-0.8.3
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -51287,7 +51314,6 @@
 2012231444 metadata/md5-cache/net-ftp/tnftp-20151004
 2102241843 metadata/md5-cache/net-ftp/pureadmin-0.4-r2
 2104200439 metadata/md5-cache/net-ftp/cmdftp-0.9.8
-2106082355 metadata/md5-cache/net-ftp/Manifest.gz
 2106082355 metadata/md5-cache/net-ftp/atftp-0.7.4
 2106082355 metadata/md5-cache/net-ftp/filezilla-3.53.1-r1
 2106082355 metadata/md5-cache/net-ftp/filezilla-3.54.1
@@ -51308,6 +51334,9 @@
 2106082355 metadata/md5-cache/net-ftp/vsftpd-3.0.3-r3
 2106082355 metadata/md5-cache/net-ftp/vsftpd-3.0.4
 2106082355 metadata/md5-cache/net-ftp/yafc-1.3.7
+2106151139 metadata/md5-cache/net-ftp/Manifest.gz
+2106151039 metadata/md5-cache/net-ftp/proftpd-1.3.7b
+2106151139 metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
 1907282009 metadata/md5-cache/net-im/telepathy-connection-managers-2-r2
 1912201239 metadata/md5-cache/net-im/tkabber-1.1.2
@@ -51476,8 +51505,9 @@
 2106082355 metadata/md5-cache/net-irc/znc-palaver-1.2.1
 2106101839 metadata/md5-cache/net-irc/konversation-21.04.2
 2106110409 metadata/md5-cache/net-irc/unrealircd-5.0.9.1
-2106130709 metadata/md5-cache/net-irc/Manifest.gz
 2106130709 metadata/md5-cache/net-irc/unrealircd-5.0.8
+2106152209 metadata/md5-cache/net-irc/Manifest.gz
+2106152209 metadata/md5-cache/net-irc/weechat-3.2
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1907151840 metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
 2004032241 metadata/md5-cache/net-libs/rpc2-2.14
@@ -52691,7 +52721,6 @@
 2106082355 metadata/md5-cache/net-proxy/torsocks-2.3.0
 2106082355 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
 2106082355 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
-2106082355 metadata/md5-cache/net-voip/Manifest.gz
 2106082355 metadata/md5-cache/net-voip/sipvicious-0.3.0
 2106082355 metadata/md5-cache/net-voip/sipvicious-0.3.3
 2106082355 metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r2
@@ -52699,6 +52728,8 @@
 2106082355 metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r3
 2106082355 metadata/md5-cache/net-voip/yate-6.2.0
 2106082355 metadata/md5-cache/net-voip/yate-9999
+2106151039 metadata/md5-cache/net-voip/Manifest.gz
+2106151039 metadata/md5-cache/net-voip/captagent-6.3.1
 2004170509 metadata/md5-cache/net-vpn/mullvad-netns-0.2
 2004261409 metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
 2103310739 metadata/md5-cache/net-vpn/mullvad-netns-0.3
@@ -52713,7 +52744,6 @@
 2106082355 metadata/md5-cache/net-vpn/frp-0.36.2
 2106082355 metadata/md5-cache/net-vpn/httptunnel-3.3_p20180119
 2106082355 metadata/md5-cache/net-vpn/i2p-0.9.48
-2106082355 metadata/md5-cache/net-vpn/i2pd-2.38.0
 2106082355 metadata/md5-cache/net-vpn/iodine-0.7.0-r2
 2106082355 metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
 2106082355 metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
@@ -52768,10 +52798,11 @@
 2106082355 metadata/md5-cache/net-vpn/vtun-3.0.3-r2
 2106082355 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
 2106082355 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
-2106141939 metadata/md5-cache/net-vpn/Manifest.gz
 2106141939 metadata/md5-cache/net-vpn/tor-0.4.4.9
 2106141939 metadata/md5-cache/net-vpn/tor-0.4.5.9
 2106141939 metadata/md5-cache/net-vpn/tor-0.4.6.5
+2106151809 metadata/md5-cache/net-vpn/Manifest.gz
+2106151809 metadata/md5-cache/net-vpn/i2pd-2.38.0-r1
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -53365,7 +53396,6 @@
 2104180939 metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20
 2106082355 metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1
 2106082355 metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
-2106082355 metadata/md5-cache/sci-chemistry/Manifest.gz
 2106082355 metadata/md5-cache/sci-chemistry/aqua-3.2-r3
 2106082355 metadata/md5-cache/sci-chemistry/autodock-4.2.6
 2106082355 metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
@@ -53388,9 +53418,6 @@
 2106082355 metadata/md5-cache/sci-chemistry/gromacs-2020.9999
 2106082355 metadata/md5-cache/sci-chemistry/gromacs-2021
 2106082355 metadata/md5-cache/sci-chemistry/gromacs-2021.1
-2106082355 metadata/md5-cache/sci-chemistry/gromacs-2021.2
-2106082355 metadata/md5-cache/sci-chemistry/gromacs-2021.9999
-2106082355 metadata/md5-cache/sci-chemistry/gromacs-9999
 2106082355 metadata/md5-cache/sci-chemistry/ksdssp-040728-r1
 2106082355 metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
 2106082355 metadata/md5-cache/sci-chemistry/mm-align-20120321
@@ -53439,6 +53466,10 @@
 2106082355 metadata/md5-cache/sci-chemistry/votca-xtp-9999
 2106082355 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
 2106082355 metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
+2106151239 metadata/md5-cache/sci-chemistry/Manifest.gz
+2106151239 metadata/md5-cache/sci-chemistry/gromacs-2021.2
+2106151239 metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+2106151239 metadata/md5-cache/sci-chemistry/gromacs-9999
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
 1804171239 metadata/md5-cache/sci-electronics/vbs-1.4.0
@@ -53931,15 +53962,12 @@
 2106082355 metadata/md5-cache/sci-libs/votca-tools-1.6.4
 2106082355 metadata/md5-cache/sci-libs/votca-tools-2021
 2106082355 metadata/md5-cache/sci-libs/votca-tools-9999
-2106082355 metadata/md5-cache/sci-libs/vtk-8.2.0
 2106082355 metadata/md5-cache/sci-libs/vtk-9.0.1
 2106082355 metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
 2106082355 metadata/md5-cache/sci-libs/xdrfile-1.1.4
 2106082355 metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
 2106082355 metadata/md5-cache/sci-libs/xylib-1.6
 2106100709 metadata/md5-cache/sci-libs/oce-0.18.3-r2
-2106100709 metadata/md5-cache/sci-libs/vtk-8.2.0-r1
-2106100709 metadata/md5-cache/sci-libs/vtk-8.2.0-r2
 2106101809 metadata/md5-cache/sci-libs/hdf-4.2.15
 2106101439 metadata/md5-cache/sci-libs/io_lib-1.14.14
 2106101539 metadata/md5-cache/sci-libs/scotch-6.1.0
@@ -53947,8 +53975,9 @@
 2106110339 metadata/md5-cache/sci-libs/libcmatrix-3.11.0-r1
 2106111609 metadata/md5-cache/sci-libs/amd-2.4.6
 2106111609 metadata/md5-cache/sci-libs/amd-2.4.6-r1
-2106150809 metadata/md5-cache/sci-libs/Manifest.gz
 2106150809 metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
+2106151809 metadata/md5-cache/sci-libs/Manifest.gz
+2106151809 metadata/md5-cache/sci-libs/vtk-8.2.0-r3
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
 1912080309 metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -54004,7 +54033,6 @@
 2106082355 metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
 2106082355 metadata/md5-cache/sci-mathematics/gfan-0.6.2
 2106082355 metadata/md5-cache/sci-mathematics/gfan-0.6.2-r1
-2106082355 metadata/md5-cache/sci-mathematics/giac-1.7.0.5
 2106082355 metadata/md5-cache/sci-mathematics/gimps-30.3.6
 2106082355 metadata/md5-cache/sci-mathematics/gimps-30.5.2
 2106082355 metadata/md5-cache/sci-mathematics/gimps-30.6.4
@@ -54074,8 +54102,9 @@
 2106110339 metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
 2106112139 metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
 2106122209 metadata/md5-cache/sci-mathematics/why3-for-spark-2021
-2106150409 metadata/md5-cache/sci-mathematics/Manifest.gz
 2106150409 metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
+2106151739 metadata/md5-cache/sci-mathematics/Manifest.gz
+2106151739 metadata/md5-cache/sci-mathematics/giac-1.7.0.13
 2007260509 metadata/md5-cache/sci-misc/tango-9.2.5a
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2104282209 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
@@ -54150,7 +54179,6 @@
 2106082355 metadata/md5-cache/sci-visualization/dash-table-4.11.3
 2106082355 metadata/md5-cache/sci-visualization/epix-1.2.11-r3
 2106082355 metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
-2106082355 metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
 2106082355 metadata/md5-cache/sci-visualization/ggobi-2.1.11
 2106082355 metadata/md5-cache/sci-visualization/gle-4.2.5-r2
 2106082355 metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
@@ -54184,8 +54212,9 @@
 2106082355 metadata/md5-cache/sci-visualization/xgraph-12.1-r4
 2106082355 metadata/md5-cache/sci-visualization/xyscan-4.3.0
 2106082355 metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
-2106101609 metadata/md5-cache/sci-visualization/Manifest.gz
 2106101609 metadata/md5-cache/sci-visualization/epix-1.2.19
+2106151309 metadata/md5-cache/sci-visualization/Manifest.gz
+2106151309 metadata/md5-cache/sci-visualization/fityk-1.3.1-r101
 2012030639 metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
 2012030639 metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
 2012030639 metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
@@ -55086,7 +55115,6 @@
 2106082355 metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
 2106082355 metadata/md5-cache/sys-apps/bat-0.17.1-r1
 2106082355 metadata/md5-cache/sys-apps/biosdevname-0.7.3
-2106082355 metadata/md5-cache/sys-apps/bleachbit-4.0.0
 2106082355 metadata/md5-cache/sys-apps/bleachbit-4.2.0
 2106082355 metadata/md5-cache/sys-apps/bolt-0.9-r2
 2106082355 metadata/md5-cache/sys-apps/bolt-0.9-r3
@@ -55425,13 +55453,14 @@
 2106131809 metadata/md5-cache/sys-apps/hwids-20210613
 2106130939 metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
 2106131209 metadata/md5-cache/sys-apps/rng-tools-6.13
-2106150839 metadata/md5-cache/sys-apps/Manifest.gz
-2106150309 metadata/md5-cache/sys-apps/fwupd-1.6.1
 2106150839 metadata/md5-cache/sys-apps/hwloc-1.11.13
 2106150839 metadata/md5-cache/sys-apps/hwloc-2.3.0
 2106150839 metadata/md5-cache/sys-apps/hwloc-2.5.0
 2106150109 metadata/md5-cache/sys-apps/pkgcore-0.12.1-r1
 2106150109 metadata/md5-cache/sys-apps/portage-3.0.20-r2
+2106152209 metadata/md5-cache/sys-apps/Manifest.gz
+2106151539 metadata/md5-cache/sys-apps/fwupd-1.6.1
+2106152209 metadata/md5-cache/sys-apps/ripgrep-13.0.0
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
 2103040339 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
@@ -55877,8 +55906,9 @@
 2106100039 metadata/md5-cache/sys-cluster/galera-26.4.8
 2106110339 metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
 2106110339 metadata/md5-cache/sys-cluster/sanlock-3.8.2
-2106150511 metadata/md5-cache/sys-cluster/Manifest.gz
 2106150511 metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5
+2106151609 metadata/md5-cache/sys-cluster/Manifest.gz
+2106151609 metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 2002112051 metadata/md5-cache/sys-devel/ct-ng-1.24.0
 2008010139 metadata/md5-cache/sys-devel/llvmgold-10
@@ -57318,17 +57348,17 @@
 2106082355 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
 2106090039 metadata/md5-cache/www-client/google-chrome-unstable-93.0.4535.3
 2106100039 metadata/md5-cache/www-client/chromium-93.0.4535.3
-2106100039 metadata/md5-cache/www-client/google-chrome-91.0.4472.101
 2106100009 metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.9
 2106092339 metadata/md5-cache/www-client/microsoft-edge-dev-93.0.910.5
 2106100009 metadata/md5-cache/www-client/opera-77.0.4054.60
 2106110009 metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.51
 2106121109 metadata/md5-cache/www-client/chromium-91.0.4472.101
 2106121109 metadata/md5-cache/www-client/chromium-92.0.4515.51
-2106132139 metadata/md5-cache/www-client/Manifest.gz
 2106131939 metadata/md5-cache/www-client/vivaldi-3.7.2218.58
 2106131939 metadata/md5-cache/www-client/vivaldi-3.8.2259.42
 2106131939 metadata/md5-cache/www-client/vivaldi-4.0.2312.27
+2106152009 metadata/md5-cache/www-client/Manifest.gz
+2106152009 metadata/md5-cache/www-client/google-chrome-91.0.4472.106
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -57364,9 +57394,9 @@
 2106082355 metadata/md5-cache/www-plugins/lightspark-0.8.4
 2106082355 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
 2106090039 metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4535.3_alpha
-2106100039 metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.101
-2106110009 metadata/md5-cache/www-plugins/Manifest.gz
 2106110009 metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.51_beta
+2106152009 metadata/md5-cache/www-plugins/Manifest.gz
+2106152009 metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.106
 2012311940 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2105260410 metadata/md5-cache/www-servers/caddy-2.0.0
 2106082355 metadata/md5-cache/www-servers/adsf-1.4.3
@@ -58721,4 +58751,4 @@
 2106082355 metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.1
 2106082355 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r7
 2106082355 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.5.3
-2106150909 metadata/md5-cache/Manifest.gz
+2106152209 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4f785aa8d8f8..205bc7087c16 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jun 2021 06:30:01 +0000
+Tue, 15 Jun 2021 19:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 87c3e4502c35..5361c2d43cc3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-40216dd1dc2eb11e166cad01f544c601ef166234 1623736926 2021-06-15T06:02:06+00:00
+c301e758da1a986404cf621b5c8ee259c785358f 1623783187 2021-06-15T18:53:07+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ed7e48edbae1..2e704f167cf1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1623737101 Tue 15 Jun 2021 06:05:01 AM UTC
+1623783901 Tue 15 Jun 2021 07:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 960a3e0ca1c5..1fc7a1839e21 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jun 2021 06:09:09 +0000
+Tue, 15 Jun 2021 19:09:02 +0000
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e94e487ac2d7..ec3bd661d84e 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index fcb1731848a4..f63ee6f1fc5a 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -17,9 +17,13 @@ AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c
 DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
+DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
+DIST proftpd-1.3.8rc1.tar.gz 20469318 BLAKE2B 5385c013ecc123802163cd632eb1c87b0feb9bfac278f9d419ff4fc76380f415bee1726e6ac37929aff804bf4bdf0f9b525a250b9ac8e8679f772672c78a639a SHA512 9c0fda5c870a7e84227d5ee6e1b331e0150c4cad297d6bd640e9ccfa838bd98e8620e542c40fc80d0f1c5f82ed3e2e2b5af7d3a7c371d96fb4e37d5472e24032
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 EBUILD proftpd-1.3.7a-r1.ebuild 8666 BLAKE2B 2167f808774a56c25a4330fb269360c54f14a5611625da1751419f25369a614f200c42cccce093644dbecc38f4212593ecec6d82b80e59678ef12a2955932f1d SHA512 5c89e2effc77566f6605b520b5454711c2bce5569a4493e039ba265f84795dcf4d8a28b4bd562408dda28d9827889c97e0ce7fae8777ae1d0b89c65fdb7e7729
+EBUILD proftpd-1.3.7b.ebuild 8605 BLAKE2B bc990bd615cccaf3d981dde97c8f67dae72ed05e345520ecf5add88418186727b4467750288183b04f7b601f46860579609f374b3c6c04cd51455fff1205c90a SHA512 e702e2db5192443787b9308324a9aef8d6554a1c718dbfdfb624b361ee3fbe9c59ec9ae9030aa0d7fc14f99b110f7003fb48c3117286e40d460809a98a9895ee
+EBUILD proftpd-1.3.8_rc1.ebuild 8562 BLAKE2B 2be82c206d67ab425cfabe04b9520b890f41b3a82f79ef7c98ee84660a28f5a9185637a69c2469ebd90d231fcba55d6d079ef06917f19e6184d6bc5350b1243c SHA512 ed2dd014eaded7f0d794222a4bf7257638392993313bcb5a71d75d479124ab5de4a80b1d4f026af75af1f18150c8c4a0b321ea96454fa41e8bb83de16a9d1a6d
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/proftpd-1.3.7b.ebuild b/net-ftp/proftpd/proftpd-1.3.7b.ebuild
new file mode 100644
index 000000000000..14f41fdcfdd0
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7b.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles toolchain-funcs
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="http://www.proftpd.org/
+	http://www.castaglia.org/proftpd/
+	https://github.com/jbenden/mod_clamav
+	http://gssmod.sourceforge.net/"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+	clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
+	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nls? ( virtual/libiconv )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? ( dev-libs/openssl:0= )
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+	"${FILESDIR}"/${PN}-1.3.7a-slibtool.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+in_dir() {
+	pushd "${WORKDIR}/${1}" || die
+	shift
+	"$@"
+	popd
+}
+
+src_prepare() {
+	# Skip 'install-conf' / Support LINGUAS
+	sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
+	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
+
+	# Prepare external modules
+	if use case; then
+		cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
+		cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
+	fi
+
+	if use clamav ; then
+		cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
+		eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
+	fi
+
+	if use diskuse; then
+		in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+	fi
+
+	if use msg; then
+		in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
+
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
+	fi
+
+	if use vroot; then
+		in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
+
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
+	fi
+
+	if use kerberos ; then
+		# in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+
+		# Support app-crypt/heimdal / Gentoo Bug #284853
+		sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
+
+		# Remove obsolete DES / Gentoo Bug #324903
+		# Replace 'rpm' lookups / Gentoo Bug #391021
+		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac}  || die
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
+
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
+	fi
+
+	default
+
+	tc-export CC
+}
+
+src_configure() {
+	local c m
+
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
+	use ctrls && m="${m}:mod_ctrls_admin"
+	use deflate && m="${m}:mod_deflate"
+	if use diskuse ; then
+		in_dir mod_diskuse econf
+		m="${m}:mod_diskuse"
+	fi
+	use dynmasq && m="${m}:mod_dynmasq"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
+	if use kerberos ; then
+		in_dir mod_gss-${MOD_GSS} econf
+		m="${m}:mod_gss:mod_auth_gss"
+	fi
+	use ldap && m="${m}:mod_ldap"
+	use log-forensic && m="${m}:mod_log_forensic"
+	use msg && m="${m}:mod_msg"
+	if use mysql || use postgres || use sqlite ; then
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
+	fi
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	if use sftp ; then
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+	fi
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
+	use snmp && m="${m}:mod_snmp"
+	if use softquota ; then
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+	fi
+	use unique-id && m="${m}:mod_unique_id"
+	use vroot && m="${m}:mod_vroot"
+
+	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+		m="${m}:${PROFTP_CUSTOM_MODULES}"
+	fi
+
+	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+
+	econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable caps cap) \
+		$(use_enable ctrls) \
+		$(use_enable dso) \
+		$(use_enable ident) \
+		$(use_enable ipv6) \
+		$(use_enable memcache) \
+		$(use_enable ncurses) \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
+		$(use_enable sodium) \
+		$(use_enable test tests) \
+		--enable-trace \
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
+}
+
+src_install() {
+	default
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/run "${ED}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/proftpd.xinetd proftpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
+
+	docinto html
+	dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	systemd_dounit       "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
new file mode 100644
index 000000000000..51a27cb1b329
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles toolchain-funcs
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="http://www.proftpd.org/
+	http://www.castaglia.org/proftpd/
+	https://github.com/jbenden/mod_clamav
+	http://gssmod.sourceforge.net/"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+	clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
+	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nls? ( virtual/libiconv )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? ( dev-libs/openssl:0= )
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+in_dir() {
+	pushd "${WORKDIR}/${1}" || die
+	shift
+	"$@"
+	popd
+}
+
+src_prepare() {
+	# Skip 'install-conf' / Support LINGUAS
+	sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
+	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
+
+	# Prepare external modules
+	if use case; then
+		cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
+		cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
+	fi
+
+	if use clamav ; then
+		cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
+		eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
+	fi
+
+	if use diskuse; then
+		in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+	fi
+
+	if use msg; then
+		in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
+
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
+	fi
+
+	if use vroot; then
+		in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
+
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
+	fi
+
+	if use kerberos ; then
+		# in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+
+		# Support app-crypt/heimdal / Gentoo Bug #284853
+		sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
+
+		# Remove obsolete DES / Gentoo Bug #324903
+		# Replace 'rpm' lookups / Gentoo Bug #391021
+		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac}  || die
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
+
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
+	fi
+
+	default
+
+	tc-export CC
+}
+
+src_configure() {
+	local c m
+
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
+	use ctrls && m="${m}:mod_ctrls_admin"
+	use deflate && m="${m}:mod_deflate"
+	if use diskuse ; then
+		in_dir mod_diskuse econf
+		m="${m}:mod_diskuse"
+	fi
+	use dynmasq && m="${m}:mod_dynmasq"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
+	if use kerberos ; then
+		in_dir mod_gss-${MOD_GSS} econf
+		m="${m}:mod_gss:mod_auth_gss"
+	fi
+	use ldap && m="${m}:mod_ldap"
+	use log-forensic && m="${m}:mod_log_forensic"
+	use msg && m="${m}:mod_msg"
+	if use mysql || use postgres || use sqlite ; then
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
+	fi
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	if use sftp ; then
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+	fi
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
+	use snmp && m="${m}:mod_snmp"
+	if use softquota ; then
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+	fi
+	use unique-id && m="${m}:mod_unique_id"
+	use vroot && m="${m}:mod_vroot"
+
+	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+		m="${m}:${PROFTP_CUSTOM_MODULES}"
+	fi
+
+	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+
+	econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable caps cap) \
+		$(use_enable ctrls) \
+		$(use_enable dso) \
+		$(use_enable ident) \
+		$(use_enable ipv6) \
+		$(use_enable memcache) \
+		$(use_enable ncurses) \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
+		$(use_enable sodium) \
+		$(use_enable test tests) \
+		--enable-trace \
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
+}
+
+src_install() {
+	default
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/run "${ED}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/proftpd.xinetd proftpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
+
+	docinto html
+	dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	systemd_dounit       "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index f6ed91b8bf75..342d42474692 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index f20e1c42e46c..682d6879ebc0 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,5 +1,7 @@
 AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 DIST weechat-3.1.tar.xz 2230316 BLAKE2B 95ce8c6107351676b64c368484baf2245bd17093c90552339d35d058a3caff7a0c4bb8e7692757bcf8c2d7617621961b5bc118806c5084cc212283d6982bd896 SHA512 1eb3f5a0e4d3f6777970fc60c816e7bc9be5e5cf91b9e072f6c77003f284c7bdbabfae7058cb5083915a2adf7f4c651a9afb8cc8ae17cac950e7f2ef9608ed78
+DIST weechat-3.2.tar.xz 2261376 BLAKE2B 6f9fcc72b4b36275e056f824a46d8640a45b1d78b9b6f0eaa5327fc2a965f891698982fade86c6d4e96d1f5c472ac4a82d036d478f37989f738f2ccd6e2f7002 SHA512 b4ad5cd6e678795d9093ddfa5aac0d396a7dbf994d04a6b9b083460b1639c851f1b9539cf7b97bd300154871d5df2c29f82fae387c42da840a1c3eb35c4a3660
 EBUILD weechat-3.1.ebuild 4237 BLAKE2B cdb17a439e33b21358dbd508d0d88a18ff69bd4fb5095d81d47b46bf95565292ad8fe0f0cbcdc8ff77656137cc9670fe9daaaeb1438b635d028c5aedcaa0ed4d SHA512 fb17f287d2e9beb5e729f455d9bb01dc5e3a958646c6f423e4740a47279d63074ff03671f2f23412986d79f60092c05f355100b7018747ec108637ff054a519f
+EBUILD weechat-3.2.ebuild 4240 BLAKE2B 294104218725588965c2b480020d323b13d39e6788f90741e1bc926c7303239de67d983833f1043077aa85f367a522d292c1d5c52ee5eec3aee08971d6534fb1 SHA512 9dfdd91bf01be335f58a76026d6f0458bd745c08263023d2ec4e89d899b01a8fecad35947a2e719437b0f699546ee2d41db99f2f49660fbab5a41f7ac0b050c5
 EBUILD weechat-9999.ebuild 4240 BLAKE2B 294104218725588965c2b480020d323b13d39e6788f90741e1bc926c7303239de67d983833f1043077aa85f367a522d292c1d5c52ee5eec3aee08971d6534fb1 SHA512 9dfdd91bf01be335f58a76026d6f0458bd745c08263023d2ec4e89d899b01a8fecad35947a2e719437b0f699546ee2d41db99f2f49660fbab5a41f7ac0b050c5
 MISC metadata.xml 934 BLAKE2B a848491f3855ff1d5911c1e5d2f875cacb1bf1f6df9fa31a3ba9fce80012d33f21992faf6a4748a2f134fd532cf99d58909fa1b0da06d6d7d09982438032324f SHA512 eec6d712307496df84f6294158fddfbe0865dfdbaeedef08231bfeaf0ce9a1b25fc7c163add36c1cdfc24fffdfbbf90063771693bf0d829c82b5886eb6899197
diff --git a/net-irc/weechat/weechat-3.2.ebuild b/net-irc/weechat/weechat-3.2.ebuild
new file mode 100644
index 000000000000..86f3f2d17ba4
--- /dev/null
+++ b/net-irc/weechat/weechat-3.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake lua-single python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	selinux? ( sec-policy/selinux-irc )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 880c10e78cfe..15cc65a1ec7e 100644
Binary files a/net-voip/Manifest.gz and b/net-voip/Manifest.gz differ
diff --git a/net-voip/captagent/Manifest b/net-voip/captagent/Manifest
new file mode 100644
index 000000000000..3d932185e121
--- /dev/null
+++ b/net-voip/captagent/Manifest
@@ -0,0 +1,5 @@
+AUX captagent-6.3.1-configure.patch 5583 BLAKE2B a7e7847cc5809b5964358c758e3ae620b4d1f503b33219b57acfabf119472422b1e324685b2cb9dd53286ff7fc98f531501b2ceacc14586692702367ed473221 SHA512 f343c32ef4bee8bf9ca6136442ac0998db6366bdab36da1da20d0bde6db838f47cf70ff2cc853190437a06ec87b0a506e29c215c6103f48b5b19958dbf8d2d18
+AUX captagent-6.3.1-gcc10.patch 5557 BLAKE2B a896a85f231b72676dd594cd82e5cce38d81bead6113351ec263bc1379e810a1e9ba32a04bf17d30179b7f6a8a8d47f3b75eb42016b7a156768dbf7831670038 SHA512 35ffd35de93c72ba763ac8da63fe08d06b8535d34647f6111e8c00e07565980ef6c0ff056ce47d570296b1a37e6cc7d0d1f4c3099fbea5385a2fb6e3c56c8d3c
+DIST captagent-6.3.1.tar.gz 1488741 BLAKE2B c59c5a4633f18b4eed07cc216ba939712140a244504e4263f10dec27f5937bbd54103f32a4c2a350c2560b56da18c98b6137d005010d5bb93e712d2d6fc86d0d SHA512 e4043ddb92a1228fb9e4e220e503e3bd0bf9009c893e9c153fc90d15f91902ff7b86ca4b01bf2ef40056bc16647a3838fcfb88f76503f41f4bea88d054e4d7de
+EBUILD captagent-6.3.1.ebuild 1091 BLAKE2B 36b465c462f7e33764a8b37fb212266e92cd850eba025e5f595b87479d7bc86bb1b8e79d10f6d2ab13f08d22e91e1e86a07be52de7da9c9138dfcef51b82645a SHA512 228d949fcaeb3c28b94cc7782a3180d9edafafbf99261ef5a0eddb5f4672d9add26a2ca454b2f19ca305ecb88086248fb6535f4b085a0a90f05aaaef55edd9d0
+MISC metadata.xml 451 BLAKE2B f0e5d30623ce9175f374440d4f6d8a0a6f212f84e8c711476e6164b237b7e9458c5a2d34b041fa27f3ae2345377463fd2e406d95faff0261ba41f2f538459f1c SHA512 e06335c99046f12d9aebf3c408b0573fc8a8e5b1515b236d45a5c27edcc401413f67a42373986e496acf61560052d61af0d4ba8d3b29a3eb87f365fae53324eb
diff --git a/net-voip/captagent/captagent-6.3.1.ebuild b/net-voip/captagent/captagent-6.3.1.ebuild
new file mode 100644
index 000000000000..7addb19c0e0d
--- /dev/null
+++ b/net-voip/captagent/captagent-6.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="100% Open-Source Packet Capture Agent for HEP"
+HOMEPAGE="https://sipcapture.org/ https://github.com/sipcapture/captagent"
+SRC_URI="https://github.com/sipcapture/captagent/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 mysql pcre redis ssl"
+
+PATCHES=(
+	# https://github.com/sipcapture/captagent/pull/239 (should be accepted).
+	"${FILESDIR}/${P}-gcc10.patch"
+	# Already upstreamed for next version.
+	"${FILESDIR}/${P}-configure.patch"
+)
+
+DEPEND="dev-libs/json-c
+	net-libs/libpcap
+	dev-libs/libuv
+	mysql? ( dev-db/mysql-connector-c )
+	pcre? ( dev-libs/libpcre )
+	redis? ( dev-db/redis )
+	ssl? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-compression \
+		--disable-epan \
+		$(use_enable ipv6) \
+		$(use_enable mysql) \
+		$(use_enable pcre) \
+		$(use_enable redis) \
+		$(use_enable ssl tls) \
+		$(use_enable ssl)
+}
diff --git a/net-voip/captagent/files/captagent-6.3.1-configure.patch b/net-voip/captagent/files/captagent-6.3.1-configure.patch
new file mode 100644
index 000000000000..c50c6c6c0ffe
--- /dev/null
+++ b/net-voip/captagent/files/captagent-6.3.1-configure.patch
@@ -0,0 +1,189 @@
+From a27139cd27aae3392c7b8e8bdeed0db50f0f2503 Mon Sep 17 00:00:00 2001
+From: Alexandr Dubovikov <alexandr.dubovikov@gmail.com>
+Date: Mon, 17 May 2021 14:34:23 +0200
+Subject: [PATCH] fixed disable/enable conditions
+
+---
+ configure.ac | 112 +++++++++++++++++++++++----------------------------
+ 1 file changed, 50 insertions(+), 62 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67be26c..85789bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ(2.61)
+-AC_INIT(captagent,6.3.0,support@sipcapture.org,,[http://www.sipcapture.org])
++AC_INIT(captagent,6.3.1,support@sipcapture.org,,[http://www.sipcapture.org])
+ AC_COPYRIGHT("SIP Capture Solution")
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE(foreign tar-ustar)
+@@ -28,67 +28,63 @@ AC_DEFINE_UNQUOTED(AGENT_PLAN_DIR, ["$agent_plan_dir"], [capture plans dir])
+ AC_DEFINE_UNQUOTED(MODULE_DIR, ["$module_dir"], [directory that modules will be installed to])
+ 
+ enableCompression=no
+-AC_ARG_ENABLE(compression,
+-   [  --enable-compression	Enable compression support)],
+-   [ZLIB="$enableval"]
+-   enableCompression=yes,
+-   [ZLIB="no"]
+-)
++AC_ARG_ENABLE([compression], AS_HELP_STRING([--enable-compression],[Enable compression support]))
++AS_IF([test "x$enable_compression" = "xyes"], [
++        enableCompression=yes
++        AC_DEFINE([ZLIB], [1], [Enable compression support])
++])
+ AC_MSG_RESULT([$ZLIB])
+ AC_SUBST([ZLIB])
+ 
+ AC_MSG_CHECKING([whether to use ssl])
++
+ enableSSL=no
+-AC_ARG_ENABLE(ssl,
+-   [  --enable-ssl	Enable SSL support],
+-   [SSL="$enableval"]
+-   enableSSL=yes,
+-   [SSL="no"]
+-)
++AC_ARG_ENABLE([ssl], AS_HELP_STRING([--enable-ssl],[Enable SSL support]))
++AS_IF([test "x$enable_ssl" = "xyes"], [
++        enableSSL=yes
++        AC_DEFINE([SSL], [1], [Enable SSL support])
++])
+ AC_MSG_RESULT([$SSL])
+ AC_SUBST([SSL])
+ 
+ useMysql=no
+ AC_MSG_CHECKING([whether to use mysql])
+-AC_ARG_ENABLE(mysql,
+-   [  --enable-mysql    Enable mysql support],
+-   [MYSQL="$enableval"]
+-   useMysql=yes,
+-   [MYSQL="no"]
+-)
++AC_ARG_ENABLE([mysql], AS_HELP_STRING([--enable-mysql],[Enable MySQL support]))
++AS_IF([test "x$enable_mysql" = "xyes"], [
++        useMysql=yes
++        AC_DEFINE([MYSQL], [1], [Enable MySQL support])
++])
+ AC_MSG_RESULT([$MYSQL])
+ AC_SUBST([MYSQL])
+ 
+ useEpan=no
+-AC_ARG_ENABLE(epan,
+-   [  --enable-epan	Enable EPAN support / Wireshark dissectors)],
+-   [EPAN="$enableval"]
+-   useEpan=yes,
+-   [EPAN="no"]
+-)
++AC_ARG_ENABLE([epan], AS_HELP_STRING([--enable-epan],[Enable EPAN support / Wireshark dissectors]))
++AS_IF([test "x$enable_epan" = "xyes"], [
++        useEpan=yes
++        AC_DEFINE([EPAN], [1], [Enable epan support])
++])
+ AC_MSG_RESULT([$EPAN])
+ AC_SUBST([EPAN])
+ 
+ 
+ usePCRE=no
+ AC_MSG_CHECKING([whether to use pcre])
+-AC_ARG_ENABLE(pcre,
+-   [  --enable-pcre    Enable pcre support],
+-   [PCRE="$enableval"]
+-   usePCRE=yes,
+-   [PCRE="no"]
+-)
++AC_ARG_ENABLE([pcre], AS_HELP_STRING([--enable-pcre],[Enable pcre support]))
++AS_IF([test "x$enable_pcre" = "xyes"], [
++        usePCRE=yes
++	AC_DEFINE([PCRE], [1], [Enable pcre support])
++])
+ AC_MSG_RESULT([$PCRE])
+ AC_SUBST([PCRE])
+ 
+ useRedis=no
+ AC_MSG_CHECKING([whether to use redis])
+-AC_ARG_ENABLE(redis,
+-   [  --enable-redis    Enable redis support],
+-   [REDIS="$enableval"]
+-   useRedis=yes,
+-   [REDIS="no"]
+-)
++AC_ARG_ENABLE([redis], AS_HELP_STRING([--enable-redis],[Enable redis support]))
++AS_IF([test "x$enable_redis" = "xyes"], [
++        useRedis=yes
++	AC_DEFINE([REDIS], [1], [Enable redis])
++])
++
+ AC_MSG_RESULT([$REDIS])
+ AC_SUBST([REDIS])
+ 
+@@ -98,22 +94,20 @@ AC_SUBST([LIBUV])
+ 
+ useTLS=no
+ AC_MSG_CHECKING([whether to use TLS])
+-AC_ARG_ENABLE(tls,
+-   [  --enable-tls    Enable TLS support],
+-   [TLS="$enableval"]
+-   useTLS=yes,
+-   [TLS="no"]
+-)
++AC_ARG_ENABLE([tls], AS_HELP_STRING([--enable-tls],[Enable TLS support]))
++AS_IF([test "x$enable_tls" = "xyes"], [
++        useTLS=yes
++	AC_DEFINE([TLS], [1], [Enable tls])
++])
+ AC_MSG_RESULT([$TLS])
+ AC_SUBST([TLS])
+ 
+ enableExtraModules=no
+-AC_ARG_ENABLE(extramodules,
+-   [  --enable-extramodules	Enable extra modules],
+-   [EXTRAMODULES="$enableval"]
+-   enableExtraModules=yes,
+-   [EXTRAMODULES="no"]
+-)
++AC_ARG_ENABLE([extramodules], AS_HELP_STRING([--enable-extramodules],[Enable extra modules]))
++AS_IF([test "x$enable_extramodules" = "xyes"], [
++        enableExtraModules=yes
++        AC_DEFINE([EXTRAMODULES], [1], [Enable extra modules support])
++])
+ AC_MSG_RESULT([$EXTRAMODULES])
+ AC_SUBST([EXTRAMODULES])
+ 
+@@ -330,20 +324,14 @@ dnl
+ dnl IPv6 (and ICMPv6) support
+ dnl
+ 
+-AC_ARG_ENABLE(ipv6,
+-[  --enable-ipv6                enable IPv6 (and ICMPv6) support],
+-[
+-  use_ipv6="$enableval"
+-],
+-[
+-  use_ipv6="no"
++useIPv6=no
++AC_ARG_ENABLE([ipv6], AS_HELP_STRING([--enable-ipv6],[Enable IPv6 support]))
++AS_IF([test "x$enable_ipv6" = "xyes"], [
++        useIPv6=yes
++        AC_DEFINE([USE_IPv6], [1], [IPv6 (and ICMPv6) support])
++        AC_SUBST(USE_IPv6, yes)
+ ])
+ 
+-if test $use_ipv6 = yes; then
+-   AC_DEFINE(USE_IPv6, [1], [IPv6 (and ICMPv6) support])
+-   AC_SUBST(USE_IPv6, yes)
+-fi
+-
+ 
+ # Checks for header files.
+ AC_CHECK_HEADER(pcap.h,,[AC_MSG_ERROR([$PACKAGE_NAME cannot find pcap.h])])
+@@ -388,7 +376,7 @@ echo
+ echo Build directory............. : $captagent_builddir
+ echo Installation prefix......... : $prefix
+ echo HEP Compression............. : $enableCompression
+-echo IPv6 support.................: $use_ipv6
++echo IPv6 support.................: $useIPv6
+ echo HEP SSL/TLS................. : $enableSSL
+ echo Flex........................ : ${LEX:-NONE}
+ echo Bison....................... : ${YACC:-NONE}
diff --git a/net-voip/captagent/files/captagent-6.3.1-gcc10.patch b/net-voip/captagent/files/captagent-6.3.1-gcc10.patch
new file mode 100644
index 000000000000..a03dd72dfea7
--- /dev/null
+++ b/net-voip/captagent/files/captagent-6.3.1-gcc10.patch
@@ -0,0 +1,207 @@
+From 61ea167f9b4ab34a1437736cbda20d21efd06e30 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Tue, 11 May 2021 16:44:55 +0200
+Subject: [PATCH] Minimum set of changes to make gcc10 compatible.
+
+This does not fix any of the other bugs I spotted along the way
+(module_path being assigned a static string and then later free()d for
+example).
+---
+ .gitignore                            |  2 ++
+ include/captagent/api.h               | 10 ++++++++--
+ include/captagent/modules.h           |  2 +-
+ src/captagent.c                       |  2 --
+ src/conf_function.c                   |  3 +++
+ src/conf_function.h                   |  2 --
+ src/modules.c                         |  3 +++
+ src/modules/protocol/tls/decryption.h |  6 +-----
+ src/modules/protocol/tls/parser_tls.h | 12 ++++++------
+ 9 files changed, 24 insertions(+), 18 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index d2ed328..a7cd5a3 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -2,6 +2,7 @@ INSTALL
+ Makefile
+ Makefile.in
+ aclocal.m4
++compile
+ config.guess
+ src/config.h
+ src/config.h.in
+@@ -45,5 +46,6 @@ pkg/debian/files
+ pkg/debian/captagent/
+ pkg/debian/captagent.init
+ src/captagent
++src/capplan.tab.c
+ *.dh-orig
+ 
+diff --git a/include/captagent/api.h b/include/captagent/api.h
+index 4ec62de..d550875 100644
+--- a/include/captagent/api.h
++++ b/include/captagent/api.h
+@@ -43,6 +43,13 @@
+ 
+ #include "config.h"
+ 
++#ifdef __GNUC__
++/* GNU C */
++#define PACK_OFF __attribute__ ((__packed__));
++#else
++#define PACK_OFF
++#endif
++
+ #ifndef AGENT_CONFIG_DIR
+ #define AGENT_CONFIG_DIR "/usr/local/etc/captagent/"
+ #endif //DEF_CONF
+@@ -120,9 +127,8 @@ typedef struct stats_object {
+ 
+ extern struct stats_object stats_obj;
+ 
+-struct hep_module *hepmod;
+ extern int get_basestat(char *module, char *stats, size_t len);
+-struct module *module_list;
++extern struct module *module_list;
+ 
+ #ifndef TRUE
+ #define TRUE  1
+diff --git a/include/captagent/modules.h b/include/captagent/modules.h
+index 1eedabe..ec0676b 100644
+--- a/include/captagent/modules.h
++++ b/include/captagent/modules.h
+@@ -27,7 +27,7 @@
+ #ifndef MODULES_H_
+ #define MODULES_H_
+ 
+-char *module_path;
++extern char *module_path;
+ 
+ #define VAR_PARAM_NO  -128
+ 
+diff --git a/src/captagent.c b/src/captagent.c
+index b5c3081..6f5f533 100644
+--- a/src/captagent.c
++++ b/src/captagent.c
+@@ -321,8 +321,6 @@ int main(int argc, char *argv[]) {
+ 	/* PATH */
+ 	module_path = MODULE_DIR;
+ 
+-	hepmod = malloc(sizeof(hep_module_t));
+-
+ 	load_xml_config();
+ 
+ 	/*CORE CONFIG */
+diff --git a/src/conf_function.c b/src/conf_function.c
+index 478ce73..9f4648f 100644
+--- a/src/conf_function.c
++++ b/src/conf_function.c
+@@ -57,6 +57,9 @@
+ #define ROUTE_MAX_REC_LEV 10 /* maximum number of recursive calls
+                                                            for capture()*/
+ 
++struct sr_module* modules; /* global module list */
++
++
+ /* ret= 0! if action -> end of list(e.g DROP),
+       > 0 to continue processing next actions
+    and <0 on error */
+diff --git a/src/conf_function.h b/src/conf_function.h
+index 3ee82ba..ff532d9 100644
+--- a/src/conf_function.h
++++ b/src/conf_function.h
+@@ -79,8 +79,6 @@ struct sr_module{
+         struct sr_module* next;
+ };
+ 
+-struct sr_module* modules; /* global module list */
+-
+ int register_builtin_modules();
+ int load_module(char* path);
+ cmd_function find_export2(char* name, int param_no);
+diff --git a/src/modules.c b/src/modules.c
+index 0ad00b5..c0397e1 100644
+--- a/src/modules.c
++++ b/src/modules.c
+@@ -40,6 +40,9 @@
+ #include <captagent/modules_api.h>
+ #include <captagent/modules.h>
+ 
++struct module *module_list;
++char *module_path;
++
+ int register_module(char *resource_name, xml_node *config, bool global) {
+ 	const char *error;
+ 	module_exports_t *exp;
+diff --git a/src/modules/protocol/tls/decryption.h b/src/modules/protocol/tls/decryption.h
+index fd5e0d7..b553195 100644
+--- a/src/modules/protocol/tls/decryption.h
++++ b/src/modules/protocol/tls/decryption.h
+@@ -35,6 +35,7 @@
+ #include <gcrypt.h>
+ #include "define.h"
+ #include "uthash.h"
++#include "captagent/api.h"
+ 
+ #define SHA384 0x009d
+ #define SHA256 0x009c
+@@ -68,11 +69,6 @@ int private_decrypt(unsigned char * enc_data, int data_len, unsigned char * key,
+ 
+ /* **************************** */
+ 
+-#ifdef __GNUC__
+-/* GNU C */
+-#define PACK_OFF __attribute__ ((__packed__));
+-#endif
+-
+ 
+ /* ++++++++++++++++++++++++ CISCO HDLC +++++++++++++++++++++++++ */
+ struct chdlc_hdr
+diff --git a/src/modules/protocol/tls/parser_tls.h b/src/modules/protocol/tls/parser_tls.h
+index e6d6aec..c24076b 100644
+--- a/src/modules/protocol/tls/parser_tls.h
++++ b/src/modules/protocol/tls/parser_tls.h
+@@ -45,15 +45,15 @@
+ #define TLS12   0x0303
+ 
+ // Record Type values
+-enum {
++enum Record_Type {
+   CHANGE_CIPHER_SPEC = 20,
+   ALERT              = 21,
+   HANDSHAKE          = 22,
+   APPLICATION_DATA   = 23
+-} Record_Type;
++};
+ 
+ // Handshake Type values
+-enum {
++enum Handshake_Type {
+   HELLO_REQUEST       = 0,
+   CLIENT_HELLO        = 1,
+   SERVER_HELLO        = 2,
+@@ -66,10 +66,10 @@ enum {
+   CERTIFICATE_VERIFY  = 15,
+   CLIENT_KEY_EXCHANGE = 16,
+   FINISHED            = 20
+-} Handshake_Type;
++};
+ 
+ // Client Certificate types for Certificate Request
+-enum {
++enum Client_Certificate_Type {
+   RSA_SIGN                  = 1,
+   DSS_SIGN                  = 2,
+   RSA_FIXED_DH              = 3,
+@@ -77,7 +77,7 @@ enum {
+   RSA_EPHEMERAL_DH_RESERVED = 5,
+   DSS_EPHEMERAL_DH_RESERVED = 6,
+   FORTEZZA_DMS_RESERVED     = 20
+-} Client_Certificate_Type;
++};
+ 
+ 
+ // Chipher Suite availlable for decription
+-- 
+2.26.3
+
diff --git a/net-voip/captagent/metadata.xml b/net-voip/captagent/metadata.xml
new file mode 100644
index 000000000000..88e45e34f7ce
--- /dev/null
+++ b/net-voip/captagent/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="redis">Enable redis support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 3945dbec2642..8d89c560c31e 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 6b8690a4123b..70031ed5a36a 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,9 +1,9 @@
 AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f3950e63f8f827ec3697ec52f60e29c3e01f232d6c12cf776883672203f01645e5e2d5d994 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f
 AUX i2pd-2.25.0-lib-path.patch 725 BLAKE2B ad87fbfae2cb78945d0e0f62ea9d0ab45e1676908ebb11d6c4844a6160e0eb2714fa1221e886d158454a7ba3c19af7d1bb672035195993fb4633162a761e3bcb SHA512 1e1942c8c424ecefb0b62ee96973b2b238553a887a42cb5d9206cbea31e3136b7b3ad0b8ff1f290cbb507f1cc404e8a6e3c1a52551ac0aa719fbadbcf5ccc43b
+AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2bad43a1858b55fb6b502bf0c7fc975958e7a88fe9cf2bb331330e7aa70f13a3d9ce64fb525060bd84e965af5f2 SHA512 d2460d1d1b65222a0e3b89e464e75b2fd94fc65a49afe78a26c19e7a3c097b2334c02d58faad5f4ff06e3e4847425ed383f1963be2dbb9282a77c5b287a30fe2
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
-AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 DIST i2pd-2.38.0.tar.gz 555543 BLAKE2B a47c4b77e3a1d4c88cfd18b288b53592a8096509e0bed01bbf57f8d81b715699f822059cd9eecc0deb8fc82d98c23a8c0f6a67ac71654da528f81785338bfe54 SHA512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f
-EBUILD i2pd-2.38.0.ebuild 2214 BLAKE2B bb70fe86af18f70cd99fe0447ecdf1409787a2b756312164daa9c71b4e3d1fb4cf70cc57ceb97697d572b89e5219aa67fe7b18fe7cf06f69e4feff756ef0c5c8 SHA512 866c8ba29e4191e8ae7d3174763efbb81653d2505275e132fd78071d943a25660a8d4bf91d7f1e278cc49788a2e4835907cb97c5a756b7ce3b9394faa0c8506d
+EBUILD i2pd-2.38.0-r1.ebuild 2215 BLAKE2B 573602917de4a854582de366a8d00e6f7ac9e3cbe9aacc262acb3697ef351e20a50a495a3857f1ebf1789276462211edcaf13194d4dab50cfe80a6fb613ca26d SHA512 550ea1400297f7c44142504c2635af1e9f98acceab266f0604e4271b37291db8d747f54dc304136d8b4b1dc7d9bbab479e0ebb43688e628d31f317370f389fea
 MISC metadata.xml 727 BLAKE2B 2956a473062444342fb7436a09686b9774210105445288152df0e024fdf81b93b86782a1e3e5348ce8d4a2d71383db3ed63dd51dde00abadcfdce5f84819b37f SHA512 0362e22d09aa7735d12b66da01cc717704429750a57dc2cc625c2907525c935764ede0a83ef4908417542bc0afe24cb21ada71ee3100dffdb3d3b2ab3999da38
diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
similarity index 53%
rename from net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
rename to net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
index 251128b7be78..9245bca8c48e 100644
--- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
+++ b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
@@ -5,7 +5,9 @@
         notifempty
         create 640 i2pd i2pd
         postrotate
-                /bin/kill -HUP $(cat /run/i2pd/i2pd.pid)
+                if [ -f /run/i2pd/i2pd.pid ]; then
+                    /bin/kill -HUP $(/bin/cat /run/i2pd/i2pd.pid)
+                fi
         endscript
 }
 
diff --git a/net-vpn/i2pd/i2pd-2.38.0.ebuild b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
similarity index 97%
rename from net-vpn/i2pd/i2pd-2.38.0.ebuild
rename to net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
index 847dab8ce292..b77a5dab495a 100644
--- a/net-vpn/i2pd/i2pd-2.38.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
@@ -79,7 +79,7 @@ src_install() {
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+	newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
 }
 
 pkg_postinst() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f16a73d94cf6..3d1c735febc6 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 35da5fb33b05..a9342f00f37c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -37,6 +37,7 @@ media-video/ffmpeg sndio
 media-sound/moc sndio
 media-sound/mpd sndio
 media-libs/libsdl2 sndio
+media-libs/libao sndio
 
 # Sam James <sam@gentoo.org> (2021-01-19)
 # Avoid pulling in a large unkeyworded dep
diff --git a/profiles/package.mask b/profiles/package.mask
index 2427865ff314..7dd3ee492fcd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,12 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2021-06-15)
+# New versions >=1.6.0 are broken at runtime because
+# of a missing new dependency.
+# bug #791835, bug #791307.
+>=sys-apps/fwupd-1.6.0
+
 # Davide Pesavento <pesa@gentoo.org> (2021-06-15)
 # Masked for revdep testing.
 >=dev-python/sip-6
@@ -40,7 +46,7 @@
 # Fails to build with GCC 11. Strange build system that needs more
 # work to function properly (and integrate better). Several open bugs.
 # bug #795999, bug #787902, bug #766033, bug #724674, bug #713206.
-# Removal on 15-07-2021.
+# Removal on 2021-07-15.
 media-sound/sc2mpd
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-06-14)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7887607cbeff..878e9d9c0cbf 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -808,6 +808,7 @@ app-misc/irtrans-irserver:mono - Enable mono support
 app-misc/jp:jp - Install jp which is the official jp CLI for JMESPath
 app-misc/jp:jpp - Install jpp which is an extended superset of the jp CLI for JMESPath
 app-misc/jpipe:jp-symlink - Install a jp symlink that points to jpipe.
+app-misc/jpipe:jpp - Install jpp which is an extended superset of the jp CLI for JMESPath.
 app-misc/jq:oniguruma - Use dev-libs/oniguruma for regular expression support
 app-misc/kryoflux-dtc:demos - Install example floppy game files.
 app-misc/kryoflux-dtc:fast-firmware - Install fast firmware instead of slow firmware.
@@ -2205,7 +2206,6 @@ dev-libs/tntnet:server - Enable tntnet server daemon
 dev-libs/totem-pl-parser:archive - Enables ISO detection with app-arch/libarchive
 dev-libs/totem-pl-parser:crypt - Support AmazonAMZ decoding with dev-libs/libgcrypt
 dev-libs/totem-pl-parser:quvi - Use media-libs/libquvi for parsing video links
-dev-libs/tvision:gpm - Support text mode mouse through sys-libs/gpm
 dev-libs/userspace-rcu:regression-test - Run regression tests (requires FEATURES=test)
 dev-libs/weston:desktop - Enable the desktop shell
 dev-libs/weston:drm - Enable drm compositor support
@@ -3883,7 +3883,6 @@ media-gfx/album:plugins - Install optional plugins
 media-gfx/album:themes - Install optional themes
 media-gfx/alembic:hdf5 - Add support sci-libs/hdf5
 media-gfx/alembic:test - Build and run the test-suite
-media-gfx/alembic:zlib - Use sys-libs/zlib for compressions
 media-gfx/apngasm:7z - Enable support for 7zip compression
 media-gfx/apngasm:zopfli - Enable support for Zopfli compression
 media-gfx/asymptote:boehm-gc - Enables using the Boehm-Demers-Weiser conservative garbage collector
@@ -4161,6 +4160,7 @@ media-libs/leptonica:utils - Install command-line utilities
 media-libs/lib3mf:system-act - Use system-provided dev-go/act as code generator instead of package provided binaries. This flag will be removed after some time used for testing!
 media-libs/libafterimage:shaping - Use MIT shaped X windows extention.
 media-libs/libafterimage:shm - Use MIT shared memory extention for X image transfer.
+media-libs/libao:sndio - Add support for media-sound/sndio
 media-libs/libavif:aom - Enable support for the AOM codec encoding and decoding
 media-libs/libavif:dav1d - Enable support for the dav1d codec decoding
 media-libs/libavif:extras - Build extra apps (avifenc, avifdec) and test files
@@ -6827,6 +6827,7 @@ net-proxy/tsocks:dns - Force DNS queries to use SOCKS server via tcp
 net-proxy/tsocks:envconf - Allow TSOCKS_CONF_FILE to specify configuration file
 net-proxy/tsocks:server-lookups - Allow hostname resolution _for_ SOCKS servers
 net-proxy/tsocks:tordns - Apply tordns patch which allows transparent TORification of the DNS queries
+net-voip/captagent:redis - Enable redis support
 net-voip/telepathy-gabble:jingle - Enable voice calls for jabber
 net-voip/telepathy-gabble:plugins - Enable plugin loader
 net-voip/yate:amrnb - use AMR-NB
@@ -7419,7 +7420,6 @@ sci-libs/vtk:rendering - Building Redering modules
 sci-libs/vtk:tbb - Use dev-cpp/tbb to handle smp support
 sci-libs/vtk:views - Building Views modules
 sci-libs/vtk:web - Install web component
-sci-libs/vtk:xdmf2 - Support for xdmf2 formatted data
 sci-mathematics/agda:cpphs - Use cpphs instead of cpp.
 sci-mathematics/agda:debug - Enable debugging features that may slow Agda down.
 sci-mathematics/agda:enable-cluster-counting - Enable the --count-clusters flag. (If enable-cluster-counting is False, then the --count-clusters flag triggers an error message.)
@@ -8053,9 +8053,11 @@ sys-cluster/nova:rabbitmq - Installs the rabbitmq server
 sys-cluster/openmpi:cma - Enable the CMA (Cross Memory Attach) MCA
 sys-cluster/openmpi:cuda - Add GPU direct support
 sys-cluster/openmpi:heterogeneous - Enable features required for heterogeneous platform support
+sys-cluster/openmpi:libompitrace - Enable support for contributed package libompitrace
 sys-cluster/openmpi:mpi-threads - Enable MPI_THREAD_MULTIPLE
 sys-cluster/openmpi:numa - Enable numactl to allow binding processes to CPUs
 sys-cluster/openmpi:pbs - Add support for the Portable Batch System (PBS)
+sys-cluster/openmpi:peruse - Enable PERUSE interface
 sys-cluster/openmpi:romio - Build the ROMIO MPI-IO component
 sys-cluster/openmpi:vt - Enable bundled VampirTrace support
 sys-cluster/openstack-meta:cinder - Installs Openstack Cinder
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index b475d967f233..a53aabe15254 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 8f479bf51898..15f4d8cc1d82 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -25,8 +25,8 @@ EBUILD gromacs-2020.5.ebuild 9800 BLAKE2B 334e9b961d3d704f95dd9aba5caa1c323e95aa
 EBUILD gromacs-2020.6.ebuild 9800 BLAKE2B 334e9b961d3d704f95dd9aba5caa1c323e95aa4e79ff1e9c95dda998dd54e0cbda632feef930a57187f9e16a9260765eb4341aa33c8d3f7224522eb4168ae3b7 SHA512 954bad1826b6706af821e497bb0a4abbcd4013e3056e74ee74e9efe6ac1820e287b696621d66a53381fb21f3f49a629d17321b2c719ef48b347a8058d826fa36
 EBUILD gromacs-2020.9999.ebuild 9800 BLAKE2B 334e9b961d3d704f95dd9aba5caa1c323e95aa4e79ff1e9c95dda998dd54e0cbda632feef930a57187f9e16a9260765eb4341aa33c8d3f7224522eb4168ae3b7 SHA512 954bad1826b6706af821e497bb0a4abbcd4013e3056e74ee74e9efe6ac1820e287b696621d66a53381fb21f3f49a629d17321b2c719ef48b347a8058d826fa36
 EBUILD gromacs-2021.1.ebuild 10012 BLAKE2B 31de6cde38931315e9316a315f868d9571314d50b208e9ca8b46931fcfa17cbd2391ee0e0d635777f9ad2599161e15983bdf23419be83b810462984a0705156b SHA512 fce1e83a45c280085358d666f62c1eb1180129ce5a19c2f1bc61d63801195622774e453b7511e55e432dfd7d1c6d4a0e8f4dc0de6314a4a63b20a6eaa159914a
-EBUILD gromacs-2021.2.ebuild 10012 BLAKE2B 31de6cde38931315e9316a315f868d9571314d50b208e9ca8b46931fcfa17cbd2391ee0e0d635777f9ad2599161e15983bdf23419be83b810462984a0705156b SHA512 fce1e83a45c280085358d666f62c1eb1180129ce5a19c2f1bc61d63801195622774e453b7511e55e432dfd7d1c6d4a0e8f4dc0de6314a4a63b20a6eaa159914a
-EBUILD gromacs-2021.9999.ebuild 9922 BLAKE2B 18f61f3e4fae95eab4dc2de0ad5176c41ce184b3f41967b3f41024f3d783e95180c49450ee82d1d3800ac90fd2687db17fc998b0bc0c41945995e2139dd6997a SHA512 d1769d09da13fe12e05d083bd30d95cf5656a7b72b4e8e1916952387283c7b22e6e74dff395cdc9704f04e5a2365a5e31d41ec17c2ef0211d7c7e75638dac9a7
+EBUILD gromacs-2021.2.ebuild 10022 BLAKE2B 90dc43e1aafe220870c86471e8a13564f2022e2a5ec8df0c9abc8e029da1f78e037d7e61a3d25dcefe8484945a6595c2a8ade0622651c2a71e0ee5a159b3a47d SHA512 e5c8f7e14ae5cfdf7845d592e48df7355a5faa38521d24ec16e815140442749f4429e5cb781ba4e54aede3c28b24cb886b52ac2422f12258abac07a321513d75
+EBUILD gromacs-2021.9999.ebuild 9932 BLAKE2B 45040b96ec2454338a1085048ef3b9c22a18b20167993de547b0f0226124bdb4be9b8b6acc19a998373d8438ea10a4e1e364c46f10def7e84b2d0542807b7e30 SHA512 a926a895411c07f18262f8f4a785028551ad5d1b1644429b112be5c1d9f14a830f07de7a0acff11582093fb0ee33c4122b67ce96e568736f76d11f20f7b6665a
 EBUILD gromacs-2021.ebuild 9973 BLAKE2B 7c2db369fb2bf900cc30a2f4b8b35d3c193581a1db0885a46a43f81414c9abf057e3a3f9b88560ee51a903188ce1d4e90c9418dcc3692092a17d55596f5a09ad SHA512 79512ad0e28e079e0b76e14f0a01e9f54daf3516d0b51a5ee8e9406362e8c6099d90439bdf8a1aab1313e4e57889c568e7608acbc779de47abc314160e692928
-EBUILD gromacs-9999.ebuild 9922 BLAKE2B 18f61f3e4fae95eab4dc2de0ad5176c41ce184b3f41967b3f41024f3d783e95180c49450ee82d1d3800ac90fd2687db17fc998b0bc0c41945995e2139dd6997a SHA512 d1769d09da13fe12e05d083bd30d95cf5656a7b72b4e8e1916952387283c7b22e6e74dff395cdc9704f04e5a2365a5e31d41ec17c2ef0211d7c7e75638dac9a7
+EBUILD gromacs-9999.ebuild 9932 BLAKE2B 45040b96ec2454338a1085048ef3b9c22a18b20167993de547b0f0226124bdb4be9b8b6acc19a998373d8438ea10a4e1e364c46f10def7e84b2d0542807b7e30 SHA512 a926a895411c07f18262f8f4a785028551ad5d1b1644429b112be5c1d9f14a830f07de7a0acff11582093fb0ee33c4122b67ce96e568736f76d11f20f7b6665a
 MISC metadata.xml 1149 BLAKE2B c2a231776a6e0e3b62c8ca9e05ee0012b5c90ff3d752034ff1f32e46c0cb5240f1a45a78ad0d8cf62c46ddcdd689aa50f9bbe955547f800baf7c037872295e98 SHA512 0799ce85673f6c8161fe18eeb6303844a0de41ea6c164c6bf16c42e7619c248c8d840dcffd55785699dbfd433d0b086c8982fc36a2414b3fdb687578602b6c83
diff --git a/sci-chemistry/gromacs/gromacs-2021.2.ebuild b/sci-chemistry/gromacs/gromacs-2021.2.ebuild
index 16a2bffe6a33..e8cbb127fefd 100644
--- a/sci-chemistry/gromacs/gromacs-2021.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.2.ebuild
@@ -44,7 +44,7 @@ CDEPEND="
 		x11-libs/libICE
 		)
 	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0 )
 	hwloc? ( sys-apps/hwloc )
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index 2323f9d1d8b6..19c3097b599b 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -44,7 +44,7 @@ CDEPEND="
 		x11-libs/libICE
 		)
 	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0 )
 	hwloc? ( sys-apps/hwloc )
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 2323f9d1d8b6..19c3097b599b 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -44,7 +44,7 @@ CDEPEND="
 		x11-libs/libICE
 		)
 	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0 )
 	hwloc? ( sys-apps/hwloc )
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d98e862ad8d6..14ed69d3b472 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 2b19502e8597..8296f8972b08 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,8 +16,6 @@ DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d
 DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b638f2559259f09a6cbbe80da8c2937b1c50cfa2c3b2c6adf99b5bbf537678f817e44bc72962f36364913ae6cc524ae8a8 SHA512 b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4
-EBUILD vtk-8.2.0-r1.ebuild 9716 BLAKE2B 4e4ec0345e9edd664fb58e74678eb003f3aaefde46535c937135f9aa27320424c75da3adab8b56fad10341e421067ac5add84c7e8b35fb2f95c8a99ee07506a9 SHA512 e7b67a0f8251aef9ed41472431758c7f0450112c76935908666f34550f1a95784ff2da08e01140ad8f87acedf3e7ca59835b33ad9be35a4a322effbacbede13c
-EBUILD vtk-8.2.0-r2.ebuild 10533 BLAKE2B b72995a463065f531e86bddf0fd7c86b6e34e74b6080642882da342428f4c51f31fcf05b3bc1ce4780933f97c8b5131cc1d042ee128ffc8dec5f210802759810 SHA512 bd0539e0da4d98a005317c1a8fdd1519d2c1ea400d59778351cded4ff53f9bb6580ac8b8b2b8f2d7096470c7640102d1cde5a0c7282bf90a13c31d55925f17b0
-EBUILD vtk-8.2.0.ebuild 9415 BLAKE2B f1784bad98faef85b698e73889943c1177783bd2b356baac8b7024f536c7f64e7343a0d26c003a948fa9917f8946a7482bcddf836a0334927185f38d6d98a37a SHA512 f4c5d23f72f69994241337e0bc20a936c64d3c0d5fb785b3da72d7e6612de4f35f98dbc2e4b6e670388051952cacc1d4827a0b0ea92ce909123a35606e9dc1c7
+EBUILD vtk-8.2.0-r3.ebuild 10466 BLAKE2B cf908d91b4720e34ce18ef6c102324966da22054cf01d828320171acccf7c8d973bf923e1cf320ef34de02e750ebf0babaaa424ffb4f544dc6987e67b79f9fcc SHA512 386faa68182d280b75fa5274572b364f29f74d02033d1884b80500530cf34db059f25df9f290b7dda9d0258301a00ee914807a3c9458421228c0fb6f16ae8e3e
 EBUILD vtk-9.0.1.ebuild 13690 BLAKE2B cc4d8764f7b37bd28c7490f51b10b21faaec308ad4768817a3c1aa55c8694187a40bb6ca18274402c1e5781c2a066d276abaca5429492364cef53cf4cbee566d SHA512 3dbb44fb1fef2c2004013d76e7f84f0dab470787943585dc48b0d9066197ff68bd3bac753e5d409e95b08a73c59be72e77ba705e8802de077e13d3e9e1fa2949
-MISC metadata.xml 1467 BLAKE2B 9d3762c4dbcc6b7f499350523fa3e55dd7c1f4fd5074ccdbe72c68a0c275758e5e4db187574dfc9180345e81ea263373232f826de8d55aa966fd3378569bf200 SHA512 6c8bf52de0c5591af316acc5c8a008893445241fd638d645733146af78fbbc2b0109e267be4e9b8fb8ec8841e5003ae7fdb9c948d3db0b0a24163d6380722078
+MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index b7fedcbd9163..8fc9a950f8f6 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -27,7 +27,6 @@
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
     <flag name="views">Building Views modules</flag>
     <flag name="web">Install web component</flag>
-    <flag name="xdmf2">Support for xdmf2 formatted data</flag>
     <flag name="R">Enable support for dev-lang/R</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
deleted file mode 100644
index 4d29ebbccca6..000000000000
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-# Short package version
-SPV="$(ver_cut 1-2)"
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
-	odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
-	video_cards_nvidia views web +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-cpp/eigen
-	dev-db/sqlite
-	dev-libs/double-conversion:0=
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.11
-	>=media-libs/freetype-2.5.4
-	media-libs/glew:0=
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf:0=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	all-modules? ( dev-libs/pegtl )
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		$(python_gen_cond_dep '
-			python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtx11extras:5
-		$(python_gen_cond_dep '
-			python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		$(python_gen_cond_dep '
-			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	xdmf2? ( sci-libs/xdmf2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
-	"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
-	"${FILESDIR}"/${P}-fno-common.patch # bug 721048
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
-	"${FILESDIR}"/${P}-pugixml.patch
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf pugixml png tiff zlib; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-
-	sed -i -e '/add_subdirectory(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die
-	sed -i -e '/vtk_target_export(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PUGIXML=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
-		-DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use mpi; then
-		mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-#			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake_src_install
-
-	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.2.0-r2.ebuild b/sci-libs/vtk/vtk-8.2.0-r3.ebuild
similarity index 98%
rename from sci-libs/vtk/vtk-8.2.0-r2.ebuild
rename to sci-libs/vtk/vtk-8.2.0-r3.ebuild
index 4335d1c44a2f..63e8d2b3d602 100644
--- a/sci-libs/vtk/vtk-8.2.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r3.ebuild
@@ -90,7 +90,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/sip[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:5[${PYTHON_MULTI_USEDEP}]
 		')
 	)
 	qt5? (
@@ -280,7 +280,6 @@ src_configure() {
 			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
 			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
 			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-#			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
 			-DVTK_USE_SYSTEM_SIX=ON
 		)
 	fi
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
deleted file mode 100644
index 0eab965aa3f4..000000000000
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ /dev/null
@@ -1,346 +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} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-# Short package version
-SPV="$(ver_cut 1-2)"
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
-	odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
-	video_cards_nvidia views web +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-cpp/eigen
-	dev-db/sqlite
-	dev-libs/double-conversion:0=
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	dev-libs/pugixml
-	>=media-libs/freetype-2.5.4
-	media-libs/glew:0=
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf:0=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		$(python_gen_cond_dep '
-			python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtx11extras:5
-		$(python_gen_cond_dep '
-			python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		$(python_gen_cond_dep '
-			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	xdmf2? ( sci-libs/xdmf2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
-	"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
-	"${FILESDIR}"/${P}-fno-common.patch # bug 721048
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf png tiff zlib; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
-		-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use mpi; then
-		mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake_src_install
-
-	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a4aad804b50c..709d27bc035a 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 22ffbbdd0aed..aa834378eb82 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,5 +1,6 @@
 AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
-DIST giac_1.7.0-5.tar.gz 82481999 BLAKE2B b322c7008fc6fd687ef11355d3c1dfe48abdbbff6415968d4476dd7760e03f5d174e2ab88f87d638a77c16762d977b5e211b54a71529cf65af0ad4c7d6d16403 SHA512 39e0d1fca0497365ddebe9eba871bbcff790cbcb33f2a61bfbf0e018f300d7429eee7d97a446f0cbb45f2e8abe3af4ed77e3c58a74e919b9f907959f270df355
-EBUILD giac-1.7.0.5.ebuild 4194 BLAKE2B 007f9fa8fa746b612de657f745823c9136b493ad605f401345d841297e9b2744c7ca3803f2a1a448e1f24d732471561eade99bd56da5d4ee256c50e82b64bb39 SHA512 6cab89d4980088f43a53ae130070e25c7a4d1c2181d7f72faa8e8cfdfb29c0d8fe6e451016de787c1275b4c960b256479199da85c963e40a58d2c99ad32d9eca
+AUX giac-1.7.0.13-xcas-desktop.patch 890 BLAKE2B 31e33a52fdcb70c610edf21f046d112df3702e1d4f635cd4956bbe17d928839c9a0a87cb5ba5d6aeff94213b482ce22bd497d1d258aaa8abd6d8fc0116031f15 SHA512 269c733edc899051fc3de23021c322a3099499dfeb559ab1cada0964258a91a9735e620b480560226e5a3b492f2f5654062ee9c2c5479ae9789b012e7a5055ca
+DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
+EBUILD giac-1.7.0.13.ebuild 4243 BLAKE2B 4274b4dcb6752d1a033f6561ea3bed336db5e2e606463946ac109e0e9aa6c3530b981fea631a9257236a0de0d4e874b1028a969564185b05a8917cebc9480610 SHA512 1bd27ea2ef3f44eb4b3a9337a61baa37191668a3f2ff9dc6478a942aa77478b838085dfb1f4e711318066c76fb26a51555f549590e3840374eb6a022875a5319
 MISC metadata.xml 1314 BLAKE2B c38eadb22de3e64b39e144c8dd2e2c359b88ea7910390ea6044af9f8f83a6db08cb4f0142d1217ddd0f4ff051f2bb94f846a789adc521d02d4c704763da1c50a SHA512 7554640bd7ab2b2c1cb77d492d044d419b178497f8b5a6165168f4c3ab0c421121e98b0f0f25d3d10479a8fcd6635f28cfdae4562d6e0b5143b541155f697077
diff --git a/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch b/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
new file mode 100644
index 000000000000..bc542b0a615c
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
@@ -0,0 +1,33 @@
+From 51fa4502039ec09d4a9e1d6b2fa73e5a1f789f94 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 15 Jun 2021 08:31:06 -0400
+Subject: [PATCH 1/1] xcas.desktop: fix "Version" field.
+
+The "Version" field in a desktop file refers to the version of the
+specification, not the version of the software it launches:
+
+  https://specifications.freedesktop.org/desktop-entry-spec
+
+This issue has already been fixed upstream:
+
+  https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2716
+
+and will be part of the next release.
+---
+ xcas.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xcas.desktop b/xcas.desktop
+index 9e1b648..fad99cd 100644
+--- a/xcas.desktop
++++ b/xcas.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=1.7
++Version=1.0
+ Keywords=computer algebra system;CAS;
+ Keywords[fr]=calcul formel;CAS;
+ Name=Xcas
+-- 
+2.31.1
+
diff --git a/sci-mathematics/giac/giac-1.7.0.5.ebuild b/sci-mathematics/giac/giac-1.7.0.13.ebuild
similarity index 98%
rename from sci-mathematics/giac/giac-1.7.0.5.ebuild
rename to sci-mathematics/giac/giac-1.7.0.13.ebuild
index 8dcab375adc8..2d6ab4387bf3 100644
--- a/sci-mathematics/giac/giac-1.7.0.5.ebuild
+++ b/sci-mathematics/giac/giac-1.7.0.13.ebuild
@@ -49,6 +49,7 @@ BDEPEND="dev-tex/hevea
 PATCHES=(
 	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
 	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
+	"${FILESDIR}/${PN}-1.7.0.13-xcas-desktop.patch"
 )
 
 REQUIRED_USE="test? ( gui )"
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 2bf9c92848cb..928214b13906 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index a4cda177d79a..a29b4c50a719 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,3 +1,5 @@
+AUX fityk-1.3.1-c++17.patch 12771 BLAKE2B 72c94df37767a17abe241bca6cfd3d62ca55902f1c1f4923a0cd268aa85366188bba849a03107dc953596c5c836a4e32819fd089dd07f8ceff33aad2adfde251 SHA512 bfacfc05f7d33ccc8648329c0b9c3ad72b8ad9b9a915c585128f681cf973fcb5ba8364a25067a534ac0a880bca6d4a3a733f9cba6d3d6127188bf3ffbd016e65
+AUX fityk-1.3.1-fix-gtk3.patch 887 BLAKE2B 3cb5efcda7d696c491bc5d4b4215714b19fc0e876cc59c5b37999c6950e1a26ab979cf0a4c50bd7cbe4a3bde26b4b394b07819381a6b11eff957f375a5d49f90 SHA512 a835ad7ef3ae084ac11195924eb4305cf1dcb8282fa393719c7bfd4983fcf51143744954051ee5b0dfc7956322890d1391ee5c4e3b0fcd27924cc042db5a0cdb
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
-EBUILD fityk-1.3.1-r100.ebuild 1095 BLAKE2B 9b9c881a159e38b8c3d38fc9743dbc348d47517885ba046b1f6c58dc0518457ebc431d82d492eee1f7fa996b820f9fca7df39b1df5a6336b36b7fabbba80950a SHA512 7c3afc1bc38cef2597a2d29caa5b802f1bd3d8d339cccad79b5965068ca12221c90ad0d976cb0db8f2c843c1e6a593acc33df5e838df215a474ca1dc1a1fb520
+EBUILD fityk-1.3.1-r101.ebuild 1192 BLAKE2B ae3186a4293cb255425d3ca67bccf7e51176e95d7289ebd319832f9d200678ba38510b49f1d200d6ed911ab476554b67ad9edcfe1720a013a6ab6e099b24e4da SHA512 72673ebb78b8e9c17440c193312d62c928a2e7f69a69a4bdf6417829f24a325ebc9f0846b111154ea18de6f2b3d2e451b50b79745566627fd2531d8e0127010a
 MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
new file mode 100644
index 000000000000..66c43207fbfb
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
@@ -0,0 +1,352 @@
+Backport from
+https://github.com/wojdyr/fityk/pull/38
+
+--- a/fityk/fityk.cpp
++++ b/fityk/fityk.cpp
+@@ -129,8 +129,7 @@
+     delete p_;
+ }
+ 
+-void Fityk::execute(string const& s)  throw(SyntaxError, ExecuteError,
+-                                            ExitRequestedException)
++void Fityk::execute(string const& s)
+ {
+     try {
+         priv_->parse_and_execute_line(s);
+@@ -139,8 +138,7 @@
+     CATCH_EXECUTE_ERROR
+ }
+ 
+-string Fityk::get_info(string const& s, int dataset)  throw(SyntaxError,
+-                                                            ExecuteError)
++string Fityk::get_info(string const& s, int dataset)
+ {
+     try {
+         string result;
+@@ -152,8 +150,7 @@
+     return "";
+ }
+ 
+-realt Fityk::calculate_expr(string const& s, int dataset)  throw(SyntaxError,
+-                                                                  ExecuteError)
++realt Fityk::calculate_expr(string const& s, int dataset)
+ {
+     try {
+         Lexer lex(s.c_str());
+@@ -209,7 +206,7 @@
+     return priv_->mgr.functions()[n];
+ }
+ 
+-vector<Func*> Fityk::get_components(int dataset, char fz)  throw(ExecuteError)
++vector<Func*> Fityk::get_components(int dataset, char fz)
+ {
+     const Model *model = priv_->dk.get_model(hd(priv_, dataset));
+     const vector<int>& indexes = model->get_fz(fz).idx;
+@@ -220,7 +217,7 @@
+     return ret;
+ }
+ 
+-realt Fityk::get_model_value(realt x, int dataset)  throw(ExecuteError)
++realt Fityk::get_model_value(realt x, int dataset)
+ {
+     try {
+         return priv_->dk.get_model(hd(priv_, dataset))->value(x);
+@@ -230,7 +227,6 @@
+ }
+ 
+ vector<realt> Fityk::get_model_vector(vector<realt> const& x, int dataset)
+-                                                          throw(ExecuteError)
+ {
+     vector<realt> xx(x);
+     vector<realt> yy(x.size(), 0.);
+@@ -241,7 +237,7 @@
+     return yy;
+ }
+ 
+-const Var* Fityk::get_variable(string const& name)  throw(ExecuteError)
++const Var* Fityk::get_variable(string const& name)
+ {
+     try {
+         string vname;
+@@ -274,7 +270,6 @@
+ }
+ 
+ void Fityk::load(LoadSpec const& spec, int dataset)
+-                     throw(ExecuteError)
+ {
+     if (dataset == DEFAULT_DATASET)
+         dataset = priv_->dk.default_idx();
+@@ -290,7 +285,7 @@
+                       vector<realt> const& x,
+                       vector<realt> const& y,
+                       vector<realt> const& sigma,
+-                      string const& title)     throw(ExecuteError)
++                      string const& title)
+ {
+     try {
+         priv_->dk.data(dataset)->load_arrays(x, y, sigma, title);
+@@ -299,7 +294,6 @@
+ }
+ 
+ void Fityk::add_point(realt x, realt y, realt sigma, int dataset)
+-                                                          throw(ExecuteError)
+ {
+     try {
+         priv_->dk.data(hd(priv_, dataset))->add_one_point(x, y, sigma);
+@@ -307,7 +301,7 @@
+     CATCH_EXECUTE_ERROR
+ }
+ 
+-vector<Point> const& Fityk::get_data(int dataset)  throw(ExecuteError)
++vector<Point> const& Fityk::get_data(int dataset)
+ {
+     static const vector<Point> empty;
+     try {
+@@ -335,23 +329,21 @@
+ }
+ 
+ void Fityk::set_option_as_string(const string& opt, const string& val)
+-                                                            throw(ExecuteError)
+ {
+     priv_->mutable_settings_mgr()->set_as_string(opt, val);
+ }
+ 
+ void Fityk::set_option_as_number(const string& opt, double val)
+-                                                            throw(ExecuteError)
+ {
+     priv_->mutable_settings_mgr()->set_as_number(opt, val);
+ }
+ 
+-string Fityk::get_option_as_string(const string& opt) const  throw(ExecuteError)
++string Fityk::get_option_as_string(const string& opt) const
+ {
+     return priv_->settings_mgr()->get_as_string(opt, /*quote_str=*/false);
+ }
+ 
+-double Fityk::get_option_as_number(const string& opt) const  throw(ExecuteError)
++double Fityk::get_option_as_number(const string& opt) const
+ {
+     return priv_->settings_mgr()->get_as_number(opt);
+ }
+@@ -366,7 +358,7 @@
+     return priv_->ui()->get_input_from_user(prompt);
+ }
+ 
+-realt Fityk::get_wssr(int dataset)  throw(ExecuteError)
++realt Fityk::get_wssr(int dataset)
+ {
+     try {
+         return get_wssr_or_ssr(priv_, dataset, true);
+@@ -375,7 +367,7 @@
+     return 0.;
+ }
+ 
+-realt Fityk::get_ssr(int dataset)  throw(ExecuteError)
++realt Fityk::get_ssr(int dataset)
+ {
+     try {
+         return get_wssr_or_ssr(priv_, dataset, false);
+@@ -384,7 +376,7 @@
+     return 0.;
+ }
+ 
+-realt Fityk::get_rsquared(int dataset)  throw(ExecuteError)
++realt Fityk::get_rsquared(int dataset)
+ {
+     try {
+         if (dataset == ALL_DATASETS) {
+@@ -402,7 +394,7 @@
+     return 0.;
+ }
+ 
+-int Fityk::get_dof(int dataset)  throw(ExecuteError)
++int Fityk::get_dof(int dataset)
+ {
+     try {
+         return priv_->get_fit()->get_dof(get_datasets_(priv_, dataset));
+@@ -412,7 +404,6 @@
+ }
+ 
+ vector<vector<realt> > Fityk::get_covariance_matrix(int dataset)
+-                                                           throw(ExecuteError)
+ {
+     try {
+         vector<Data*> dss = get_datasets_(priv_, dataset);
+--- a/fityk/fityk.h
++++ b/fityk/fityk.h
+@@ -118,10 +118,8 @@
+ 
+     virtual const std::string& get_template_name() const = 0;
+     virtual std::string get_param(int n) const = 0;
+-    virtual const std::string& var_name(const std::string& param) const
+-                                                    throw(ExecuteError) = 0;
+-    virtual realt get_param_value(const std::string& param) const
+-                                                    throw(ExecuteError) = 0;
++    virtual const std::string& var_name(const std::string& param) const = 0;
++    virtual realt get_param_value(const std::string& param) const = 0;
+     virtual realt value_at(realt x) const = 0;
+ protected:
+     Func(const std::string name_) : name(name_) {}
+@@ -177,26 +175,23 @@
+     // @{
+ 
+     /// execute command; throws exception on error
+-    void execute(std::string const& s) throw(SyntaxError, ExecuteError,
+-                                             ExitRequestedException);
++    void execute(std::string const& s);
+ 
+ 
+     /// load data from file (path should be ascii or utf8, col=0 is index)
+-    void load(LoadSpec const& spec, int dataset=DEFAULT_DATASET)
+-                  throw(ExecuteError);
++    void load(LoadSpec const& spec, int dataset=DEFAULT_DATASET);
+     void load(std::string const& path, int dataset=DEFAULT_DATASET)
+-      throw(ExecuteError) { load(LoadSpec(path), dataset); }
++      { load(LoadSpec(path), dataset); }
+ 
+     /// load data from arrays
+     void load_data(int dataset,
+                    std::vector<realt> const& x,
+                    std::vector<realt> const& y,
+                    std::vector<realt> const& sigma,
+-                   std::string const& title="")  throw(ExecuteError);
++                   std::string const& title="");
+ 
+     /// add one data point to dataset
+-    void add_point(realt x, realt y, realt sigma, int dataset=DEFAULT_DATASET)
+-                                                     throw(ExecuteError);
++    void add_point(realt x, realt y, realt sigma, int dataset=DEFAULT_DATASET);
+ 
+     // @}
+ 
+@@ -220,14 +215,10 @@
+ 
+     /// @name settings
+     // @{
+-    void set_option_as_string(const std::string& opt, const std::string& val)
+-                                                         throw(ExecuteError);
+-    void set_option_as_number(const std::string& opt, double val)
+-                                                         throw(ExecuteError);
+-    std::string get_option_as_string(const std::string& opt) const
+-                                                         throw(ExecuteError);
+-    double get_option_as_number(const std::string& opt) const
+-                                                         throw(ExecuteError);
++    void set_option_as_string(const std::string& opt, const std::string& val);
++    void set_option_as_number(const std::string& opt, double val);
++    std::string get_option_as_string(const std::string& opt) const;
++    double get_option_as_number(const std::string& opt) const;
+     // @}
+ 
+     /// @name input/output
+@@ -253,12 +244,10 @@
+     // @{
+ 
+     /// return output of the info command
+-    std::string get_info(std::string const& s, int dataset=DEFAULT_DATASET)
+-                                            throw(SyntaxError, ExecuteError);
++    std::string get_info(std::string const& s, int dataset=DEFAULT_DATASET);
+ 
+     /// return expression value, similarly to the print command
+-    realt calculate_expr(std::string const& s, int dataset=DEFAULT_DATASET)
+-                                            throw(SyntaxError, ExecuteError);
++    realt calculate_expr(std::string const& s, int dataset=DEFAULT_DATASET);
+ 
+     //(planned)
+     /// returns dataset titles
+@@ -273,8 +262,7 @@
+     int get_default_dataset() const;
+ 
+     /// get data points
+-    std::vector<Point> const& get_data(int dataset=DEFAULT_DATASET)
+-                                                         throw(ExecuteError);
++    std::vector<Point> const& get_data(int dataset=DEFAULT_DATASET);
+ 
+     /// returns number of simple-variables (parameters that can be fitted)
+     int get_parameter_count() const;
+@@ -286,7 +274,7 @@
+     std::vector<Var*> all_variables() const;
+ 
+     /// returns variable $name
+-    const Var* get_variable(std::string const& name)  throw(ExecuteError);
++    const Var* get_variable(std::string const& name);
+ 
+     /// returns all %functions
+     std::vector<Func*> all_functions() const;
+@@ -295,17 +283,14 @@
+     const Func* get_function(const std::string& name) const;
+ 
+     /// returns %functions used in dataset
+-    std::vector<Func*> get_components(int dataset=DEFAULT_DATASET, char fz='F')
+-                                                         throw(ExecuteError);
++    std::vector<Func*> get_components(int dataset=DEFAULT_DATASET, char fz='F');
+ 
+     /// returns the value of the model for a given dataset at x
+-    realt get_model_value(realt x, int dataset=DEFAULT_DATASET)
+-                                                         throw(ExecuteError);
++    realt get_model_value(realt x, int dataset=DEFAULT_DATASET);
+ 
+     /// multiple point version of the get_model_value()
+     std::vector<realt>
+-    get_model_vector(std::vector<realt> const& x, int dataset=DEFAULT_DATASET)
+-                                                         throw(ExecuteError);
++    get_model_vector(std::vector<realt> const& x, int dataset=DEFAULT_DATASET);
+ 
+     /// get coordinates of rectangle set by the plot command
+     /// side is one of L(eft), R(ight), T(op), B(ottom)
+@@ -317,20 +302,20 @@
+     // @{
+ 
+     /// get WSSR for given dataset or for all datasets
+-    realt get_wssr(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    realt get_wssr(int dataset=ALL_DATASETS);
+ 
+     /// get SSR for given dataset or for all datasets
+-    realt get_ssr(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    realt get_ssr(int dataset=ALL_DATASETS);
+ 
+     /// get R-squared for given dataset or for all datasets
+-    realt get_rsquared(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    realt get_rsquared(int dataset=ALL_DATASETS);
+ 
+     /// get number of degrees-of-freedom for given dataset or for all datasets
+-    int get_dof(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    int get_dof(int dataset=ALL_DATASETS);
+ 
+     /// get covariance matrix (for given dataset or for all datasets)
+     std::vector<std::vector<realt> >
+-    get_covariance_matrix(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    get_covariance_matrix(int dataset=ALL_DATASETS);
+     // @}
+ 
+     /// UiApi contains functions used by CLI and may be used to implement
+--- a/fityk/func.cpp
++++ b/fityk/func.cpp
+@@ -197,7 +197,7 @@
+     return n;
+ }
+ 
+-realt Function::get_param_value(const string& param) const  throw(ExecuteError)
++realt Function::get_param_value(const string& param) const
+ {
+     realt a;
+     if (!param.empty() && islower(param[0]))
+--- a/fityk/func.h
++++ b/fityk/func.h
+@@ -86,8 +86,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wdeprecated"
+ #endif
+-    virtual realt get_param_value(const std::string& param) const
+-                            throw(ExecuteError); // exc. spec. is used by SWIG
++    virtual realt get_param_value(const std::string& param) const;
+ 
+     realt numarea(realt x1, realt x2, int nsteps) const;
+ 
+@@ -101,7 +100,6 @@
+     // implementation of members of Func
+     virtual const std::string& get_template_name() const { return tp_->name; }
+     virtual const std::string& var_name(const std::string& param) const
+-                        throw(ExecuteError) // exc. spec. is used by SWIG
+                         { return used_vars_.get_name(get_param_nr(param)); }
+ #ifdef __clang__
+ #pragma clang diagnostic pop
diff --git a/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch
new file mode 100644
index 000000000000..7b64f7f582fa
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch
@@ -0,0 +1,31 @@
+From 85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5 Mon Sep 17 00:00:00 2001
+From: Marcin Wojdyr <wojdyr@gmail.com>
+Date: Sun, 17 Jan 2021 19:18:47 +0100
+Subject: [PATCH] allow building with wxGTK3 (closes #32)
+
+It works, but with some problems.
+
+The separator in wxSplitterWindow is not updated, as per:
+http://trac.wxwidgets.org/ticket/16890
+
+wxSpinCtrl is much wider (it has [+][-] instead of arrows)
+---
+ wxgui/app.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/wxgui/app.cpp b/wxgui/app.cpp
+index 526c8f14..1041eccf 100644
+--- a/wxgui/app.cpp
++++ b/wxgui/app.cpp
+@@ -8,11 +8,6 @@
+ #include <wx/filesys.h>
+ #include <wx/tooltip.h>
+ 
+-#ifdef __WXGTK3__
+-#error "Not everything is working with wxGTK3. Use default wxGTK instead, " \
+-       "based on GTK+2. If you want to test it, just remove this #error."
+-#endif
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <vector>
diff --git a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild b/sci-visualization/fityk/fityk-1.3.1-r101.ebuild
similarity index 87%
rename from sci-visualization/fityk/fityk-1.3.1-r100.ebuild
rename to sci-visualization/fityk/fityk-1.3.1-r101.ebuild
index 8a9af85ba44e..541fb7bba06b 100644
--- a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1-r101.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
-WX_GTK_VER=3.0
+WX_GTK_VER=3.0-gtk3
 
 inherit lua-single wxwidgets xdg
 
@@ -16,7 +16,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gnuplot nlopt readline wxwidgets"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 DEPEND="
@@ -30,6 +29,11 @@ RDEPEND="${DEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
 BDEPEND="dev-lang/swig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-gtk3.patch
+	"${FILESDIR}"/${P}-c++17.patch # bug 787317
+)
+
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 541d72c5942f..5b5071eabebc 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index f4a7ccb17927..d2baf39921a0 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91ae84c5bdc6f8f69063a54bd192332f5dd1d22ee5a737243eb5fb74cf0362eace1b50a73f7c1d0557a8cba146dea01 SHA512 ce120239b411c6e177af0e22a16b583ac3ae8903ba13579878942492e4e221355da28f737d6c78811312bfcc888af7c8dba6c153673f4e1542cc2aceedf2d2c9
 DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
-EBUILD bleachbit-4.0.0.ebuild 1480 BLAKE2B ef7caa1f0f56776df47511c805009d53d8078c6567ea2aa2aa21fae2ead5766ba93208e0eda3cc4a5e4a868e1f1d0d76109d8a440df1a952fdca45e149bad795 SHA512 da9661c2ed01f32902cc2524959540d3abfdda8c82240f7436681c288992deabbc85cf5fb2e67a3c1568567accbd489a466b8e27adb35ff39f22790ff174e175
 EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055
 MISC metadata.xml 556 BLAKE2B 3d2e34427ddd2e3ba55b12f247feac62e522fea8f952e69af43eeeed04a246d851b04fdfa16e169f5804eff20938bc545f0040b9133a1622cb4fe5b764b549f1 SHA512 1e58cf757be397a69a57e4ede9feaed4ba495a9c094fbe690062ea5623cb955434e9926d12ddf5f0f651a40a0a2775d168e3f8343b64bac4efb514e403a3fe77
diff --git a/sys-apps/bleachbit/bleachbit-4.0.0.ebuild b/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
deleted file mode 100644
index 5313459d551b..000000000000
--- a/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
+++ /dev/null
@@ -1,74 +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} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit desktop distutils-r1 virtualx
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/chardet[$PYTHON_USEDEP]
-	dev-python/pygobject:3[$PYTHON_USEDEP]
-"
-BDEPEND="
-	sys-devel/gettext
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-# tests fail under FEATURES=usersandbox
-RESTRICT="test"
-
-python_prepare_all() {
-	if use test; then
-		# avoid tests requiring internet access
-		rm tests/Test{Chaff,Update}.py || die
-
-		# fails due to non-existent $HOME/.profile
-		rm tests/TestInit.py || die
-
-		# fails on upstream Travis CI as well as on Gentoo
-		sed -e "s/test_get_proc_swaps(self)/_&/" \
-			-i tests/TestMemory.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_test() {
-	virtx emake tests
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	insinto /usr/share/bleachbit
-	doins data/app-menu.ui
-
-	doicon ${PN}.png
-	domenu org.${PN}.BleachBit.desktop
-}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 199c1691df6d..e5e47d0de32b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,11 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-1.6.0-gusb_deps.patch 2610 BLAKE2B 462e15359979cf1d4ea288161723a71f30ec6a027e4c191a78fa19446c86c6572d70d262b5475e5871f6481b2635be9fb2a2c4fe29a6132f026ac417572fcdef SHA512 9f659172b7125e7b8481e928ed7a20843f2772513e842350c57021fb8be114db0d2d7c5005ec6220eb2c8a434f3eb14cd3b8e06603366a33fc7f3a23be6191e7
+AUX fwupd-1.6.1-revert-Change-python-version-check-order.patch 1011 BLAKE2B 733c667528b52594ed7ab6ac19296ac71d961a2fdfdd45f1bc4af0540fc4b1cd520ab30ca6d7b0a48261a9966a49211f90875a6b0925d21bbdcc3c117fab3db3 SHA512 c4d1e61682f963f2c0465b49b1e944e800683003ad263e1dd7e61cf4e023f55f6bb010a51f87468aa0b4c1ea523f31a5f265e5fa0e70a10b4527243bc250f4bf
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669
 DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
 EBUILD fwupd-1.5.9-r1.ebuild 4398 BLAKE2B 8c5e659230931788d337fa7b9b9d6f86e781819d2fd96f4f061690202a1b0483b7707c641264120da3b868e1a5d6dd469818c0be6ce7d1d81235bb137f55c682 SHA512 a6697293e77036d791d370c106e0bb9de354a2776db5eca6734e976d60f5d8b3fa89c767fb1a32453db4b260d725c38e5e5e6cf147ea39d851f5d2317a3eb77f
 EBUILD fwupd-1.6.0-r1.ebuild 4377 BLAKE2B 7761382860ace3b417be28363ee7684ca70093ce61caf9ad4f29fc39c5e0d49ef8673b37cd59559ebdd9577966d70f0897b38471f82b2ab258b7efc5e7a28190 SHA512 63a48ed1b558961540e4c634353f92edcd7f05e0e35f1b11c70dcbe5fcda6dfa5feaa0eae0adb7b2f74fd27ca6afaf185814f8c1a77236fa84a70efe65a089ae
-EBUILD fwupd-1.6.1.ebuild 4343 BLAKE2B 489725a87200656c6f8de126869e40c25545929157e70fdc77b6dbe1c48202d893b61d0ce4105bce68cbdbb8546d3cb6ac7c2a56205100c239bfe2708c05b050 SHA512 a287c1cdf606bca332c2046b4d00dd3149c5c5f8b14242d15c0c9fc93af498cad58e2c8b22732b22958f1f11c5df6a5bebcd2a4951ead96e90dd66f5d65b0e34
+EBUILD fwupd-1.6.1.ebuild 4417 BLAKE2B 6c47be55cccbbd398ba0c84031c49247aca6bbe737d5d215e162eb196c1cafce858327171f13f0cd372c47674bec8e75a15eac50200dda8e2928d79991505d3f SHA512 4383a8b4f9d8dd2516afc5a7492680338dbe3b6359e9fcc331bf70396aba86896aec5f9ff978774beebf562eb6047dab0e8f66f2fa5cf7566c763a39624c5218
 MISC metadata.xml 1140 BLAKE2B 9e901230c53b487f05f290b46c53a5ee3ebd81b3aefcab2368bfc99f28e80d85554613de8cc4481047a49cf6719f1b1a442d87456ad21aecbadd573ab0959385 SHA512 93bd5bbe8a57219d825e0cc0a8ebd85534396922efcefa224d733bbd1190f201009a8223dfdf5fb2a2403439805c2205b0eef39e8a9e25d0df3733b1654b8f61
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
new file mode 100644
index 000000000000..d1c1b1408303
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
@@ -0,0 +1,25 @@
+commit 72a470fd607a40e8f23c1f2407faf69e91350783
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Tue Jun 15 14:11:24 2021 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Tue Jun 15 14:11:24 2021 +0200
+
+    Revert "meson.build: Change python version check order"
+    
+    This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
+    
+    This is causing a regression for Gentoo, https://bugs.gentoo.org/796143.
+
+diff --git a/meson.build b/meson.build
+index 5d507515..1e0e350a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
+ libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
+ gcab = find_program('gcab', required : get_option('tests'))
+ bashcomp = dependency('bash-completion', required: false)
+-python3 = find_program('python3.8', 'python3', 'python3.9')
++python3 = find_program('python3')
+ 
+ if get_option('gnutls')
+   gnutls = dependency('gnutls', version : '>= 3.6.0')
diff --git a/sys-apps/fwupd/fwupd-1.6.1.ebuild b/sys-apps/fwupd/fwupd-1.6.1.ebuild
index e0f4a52cfe55..5468692f74bd 100644
--- a/sys-apps/fwupd/fwupd-1.6.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1.ebuild
@@ -86,7 +86,8 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
+	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
+	"${FILESDIR}"/${PN}-1.6.1-revert-Change-python-version-check-order.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 049e142a691a..b2e14c5a9588 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,59 +1,101 @@
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
+DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST bytecount-0.6.0.crate 11905 BLAKE2B 7d935f86f0ab82c6c3d4974cd25ec3e193cdbea68b9534b1a461007d1486adc27274b43febd645db045cdd9b8101f93fb4b985ceb076c99a8f6efdc5e69ae855 SHA512 8e675f20b204d5828e79ba50012744b2f1b83f9d5d6355e6acb7d24cc4f7b1080ac120b94e65b6ea1d7604464ea0c6ad4f29880ff14895610889e4396f87062b
+DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
+DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
+DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
+DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319268cf17e10176aec7adb39f3d2106e80e25d8ca68e5b4e568083be75d596eaff53807385c4e8d1b59d4aed7ed08ca0 SHA512 8b3f7450789e33f1ad9306d152f1bd230e66c7e799de52046acd5b11f903e8c86cbe2f0aa2cfb0f0e60bd64b194250defe05ef2a171b707e129a2324de47a9b0
 DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
+DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
+DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
+DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST libm-0.1.4.crate 110593 BLAKE2B 5018f4efbc8fd45ff88a28e92c273bb3b48724009e17eadd0d4abb8e34b0fc8784607f71eebaa2f308dedb3185969f092d4305cd1d2cef7a53f7d8774390e38f SHA512 6bc647425ec8be5995ad4798427a86e28282b06532b8e6a53745e2a2ac16652d087b84c0946a4858a49d98995b9e543e1764765d270bf5569cd2ad92d52b81f2
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
+DIST memmap2-0.3.0.crate 18045 BLAKE2B 13d5db82f7145cefe803eaa8980f314630f6113b291729e716b5159bda132431eb1f598d6030ab59e95c64ccd87999b57aecefecb4c12e717f43e085a7d19d3d SHA512 43a4a657d5c6d54d50f9411b3a5855d07388a84f521923f264f18039b58555bfe216c1fe90418ba383ab12218937b01b17be1c337b08df3b9ee7430e0466da6f
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
+DIST packed_simd_2-0.3.5.crate 98197 BLAKE2B fcf5ae5d7a833b1b6869381efa601e7e624dce4b416762acac658162c639a093c130ec688e5fe934e3b91482a9d74c54a6cf023f0c009930197885eaa64409ff SHA512 64903209d359e9108190778ec11a2f96036fc79aa1fbb9e874b37fc359407693180d7c0bbfb8dd74022358a8a19389c764c72eb760ad0500e5621cb85f2ffc53
 DIST pcre2-0.2.3.crate 19605 BLAKE2B 6fcf5f37b5f37d77b5c3568392ac056c0dfc58e16c1d9cdf2f6cb6c2c712619d1ac75d89e1ae49086e9c0c7d9128140ae57cbe065ef0ae21b91e2aec1c2a7249 SHA512 6771b27b800e3eebc34ae5dda48ca8bf60d5c3fd46fb424a669341909491ef476427b23f0aec3ec606aa03ed9606e46daf76010a7b9e3ffe1a76faab3314e74f
 DIST pcre2-sys-0.2.2.crate 2184376 BLAKE2B 7247cfd843a74de8f2486d9e029afdf3eddfae6307983f14ab0d9c48ec487c3eeb710ae0485eab10b5ef200f8e3d8743ac9f151a5f8e07cdf3c67651e73fb1d9 SHA512 cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652
+DIST pcre2-sys-0.2.5.crate 2184907 BLAKE2B 3f249a0c0aede3b0c99a5fed1f80bac62f4591ae5aecf95e35e49fd82f66befe060343c210ac4735abf2cc29daecb656e64a467fd547f617eadf63f1c6d8bb77 SHA512 e18e14da73a84b09a2671881e12b1516f83c90ec0e4134afcab99b71688895f188e4f6bae0c7e3f18d0b7d69b3d19c44cccb4d8348fe613c2f8824edee4e35a6
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST proc-macro2-1.0.17.crate 35654 BLAKE2B 8728993d92facb86d5884a5716f697447d636ba28a3ac84e1ac7971fbe53b7fd960a5516989882eecccde20abfc9f1915c523277333ae98323b7dbc198c0fee6 SHA512 de34066c8f07ad5edaf2a7fb9b0e0e2b4d31e110a2280dce9960b20871cd69c4510ad7669634e734b3d4f06447277b62de028aad826f5a94697261a8bec2a0a9
+DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
 DIST quote-1.0.6.crate 24225 BLAKE2B e8706bf2e19b89855d5636704253d674fc9804e0d9713d1c1dccd5fe06af273f8604f80b6727f788de6416e62dde67a13abc2f3aa81cd5ea45eb0c73069ee300 SHA512 1febd6748602d4d96fbacb1f37bbc93c71d9fbeb9be7e9c6be2e871614048a1b2921c1ae702bd8db5d449308e7946ebff095689ef0bafe52af37c04936a8115e
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz 2211756 BLAKE2B 1c97a37e109f818bce8e974eb3a29eb8d1ca488e048caff658696211e8cad23728a767a2d6b97fed365d24f9545f1bc49a3e2687ab437eb4189993ad5fe30663 SHA512 814a6aa826f1183f40c5b74e66665b26e1377fe95d8b2cafceffa0b7ebf26ec89a515c74f5dbc2b9af441b2daacd239c7393047d8a75e944e42792ba451a77f9
 DIST ripgrep-12.1.1.tar.gz 480607 BLAKE2B f324a7966641843a95e7d4930507167844db2629e4b12e738df56d43edc68a707fdcc38eaa6f2445e3ddbafd13ec8888543866534b7a04724451e1457f589bba SHA512 9e2a16043be6c7727d49a44f6db7fdb41413efc869139186729985ff86dee5c6531c663352f4019b730eb3a6c46f26d46df3738d4a0cbbc39ab773f320eb9e59
+DIST ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz 2109801 BLAKE2B a2c9b967cae640bd0b71f565964443bfab5a0925b938cf94404bef29c79abab94bb81540693858de0e246217a834203b3e430d77fd23cf699af53b4c74e8eabc SHA512 cdc18bd31019fc7b8509224c2f52b230be33dee36deea2e4db1ee8c78ace406c7cd182814d056f4ce65ee533290a674822432777b61c2b4bc8cc4a4ea107cfde
+DIST ripgrep-13.0.0.tar.gz 505536 BLAKE2B fa37d3c36d56e460cdf51e544c320533f16b14fd2cd3105ad3a2db64e98d2821306da8b063e597e0441492cf3872fccdd0b5064b29a537e440227ac492304f09 SHA512 9321532e4bf633ecd200d98873b6773230d046d7bd075f223f09a68531cef4e4138f01c6b41e0f8697805963ae7e0d44d542c6d94025d9a06fbbef3562c17734
 DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
+DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
+DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.27.crate 202231 BLAKE2B 8fe663765f40cfb611e6eae5d51744adfb22adeb43da799c000b9ba856117631428341ad352608334bd57ac18aad6076e4574591ce7aa7908af90637ee363dc9 SHA512 3a3f2f6e55edf003ce13dfa35c5d1a03d875335ddb3d0093fd20c86231a246a61655e6f74f751a9265a6be18af20e794522b7b83d303ee363b891ac9a89c72ae
+DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
 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 thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 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 ripgrep-12.1.1.ebuild 2547 BLAKE2B 2f203154921a9852b6fdbba8c1f80298babeac2f35fef9afd7f771bc8ae3b8207926525ef48fbdc517dd3f516f41524f0549e6704abc5bef71aabfe246ab9800 SHA512 63fa804553bf1e8dbe861b3c5d392dca85ac66da8879f9497575f27d75e9f3d7ad5983f5c2ff45d94bc51b0506938a929c8a3fc57237c21bc45b37d999a174c6
+EBUILD ripgrep-13.0.0.ebuild 2533 BLAKE2B b8a3a2d26ea5dbef0528946c51b70565a9b882a3e01366996b12fa79f4ae39bb0f589180fae181f8d433f897e79a29482a079abd29d443b9df30eb716ed7a20d SHA512 231a71dec582d18c749db40e0f36fc9d9335d7f35ce4ba82cdc8489c7a7bca77ca4a7ad1cf9f936b9d97ffd92458b2de8dbcdcee0a47c2a47ef6951873197298
 MISC metadata.xml 610 BLAKE2B 73fe0df1821000783c6f7faf7750e8078c29f760e81a82c36f3a29da53c1aeb195af6eaf3ff347eb3116c6f625bd011e8567e5157ad72d9b9669d6da212d1a56 SHA512 3c30cdd2c10f26d840ab64c8c76e6cf1124a9b3222393b76713f9babf5a066669386268a2c7b727abc1bf1acdb51d509d9a17f657bd54a7cf2572cf2bdf8fbe2
diff --git a/sys-apps/ripgrep/ripgrep-13.0.0.ebuild b/sys-apps/ripgrep/ripgrep-13.0.0.ebuild
new file mode 100644
index 000000000000..4e691add8642
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-13.0.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.18
+atty-0.2.14
+base64-0.13.0
+bitflags-1.2.1
+bstr-0.2.16
+bytecount-0.6.2
+cc-1.0.68
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+crossbeam-channel-0.5.1
+crossbeam-utils-0.8.5
+encoding_rs-0.8.28
+encoding_rs_io-0.1.7
+fnv-1.0.7
+fs_extra-1.2.0
+glob-0.3.0
+hermit-abi-0.1.18
+itoa-0.4.7
+jemallocator-0.3.2
+jemalloc-sys-0.3.2
+jobserver-0.1.22
+lazy_static-1.4.0
+libc-0.2.97
+libm-0.1.4
+log-0.4.14
+memchr-2.4.0
+memmap2-0.3.0
+num_cpus-1.13.0
+once_cell-1.7.2
+packed_simd_2-0.3.5
+pcre2-0.2.3
+pcre2-sys-0.2.5
+pkg-config-0.3.19
+proc-macro2-1.0.27
+quote-1.0.9
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+ryu-1.0.5
+same-file-1.0.6
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.64
+strsim-0.8.0
+syn-1.0.73
+termcolor-1.1.2
+textwrap-0.11.0
+thread_local-1.1.3
+unicode-width-0.1.8
+unicode-xid-0.2.2
+walkdir-2.3.2
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo bash-completion-r1
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/BurntSushi/${PN}/releases/download/${PV}/${P}-x86_64-unknown-linux-musl.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+pcre"
+
+DEPEND=""
+
+RDEPEND="pcre? ( dev-libs/libpcre2:= )"
+
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+QA_FLAGS_IGNORED="usr/bin/rg"
+
+src_configure() {
+	# allow building on musl with dynamic linking support
+	# https://github.com/BurntSushi/rust-pcre2/issues/7
+	use pcre && export PCRE2_SYS_STATIC=0
+	myfeatures=( $(usex pcre pcre2 '') )
+	cargo_src_configure
+}
+
+src_install() {
+	cargo_src_install
+
+	# hack to find/install generated files
+	# stamp file can be present in multiple dirs if we build additional features
+	# so grab fist match only
+	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
+
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/rg.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+
+	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
+
+	# we use a manpage from pre-compiled tarball, so we can skip dependency on asciidoctor
+	doman "${WORKDIR}/${P}-x86_64-unknown-linux-musl/doc/rg.1"
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 97c5c5af3dad..9875dc8511e9 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index a746608a607b..9f8493927f11 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -25,5 +25,6 @@ EBUILD openmpi-3.1.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
+EBUILD openmpi-4.0.5-r1.ebuild 5441 BLAKE2B 3ee33cc55af1b87ae06bb9a7dba22b8e03bdbb6e0d5104f2de3e30d8cf84ee03828811ffede6fe18d066b4d97472cd5c4a878ea30b3406a1977ab3812c76f5c0 SHA512 bdad805c425f9cc5b03451be0d2d67397bf09aade29571ca37d4540700565175c4c628ff81099f1711e2c006a8a9ea6a0c64446ec23d109c55d203a6d1a3b5cc
 EBUILD openmpi-4.0.5.ebuild 5379 BLAKE2B 4f710429ea2e112c0c1500371c199e990da8b15aed1df010372efcef84cc09b740f1ed39cac64170136f7f6831e475cc4643ec4424abde0501744f9c34667174 SHA512 da2d5951249ae7c4c191c8aef70bd092dae49593db86f675578d182b4e04888b9db5d13bea062ccf2e9702a5bf210b3f51658de4770d71c97cc13246995a841a
-MISC metadata.xml 820 BLAKE2B b606cd3e91faba78d213cd55ef0f23f03085b78374b604dfa5f2f4ff3add9a6cc4c42b071579e30f9b72197c2b41dbb302d8f393881392f400296ff6b59fe0db SHA512 9025216b610924a248c80843da4e90e615078933d332ca06f4ac9c1fa46bf94a444c6b2704f1ad470f7beed797c66ee59cb961cd88e17c5b5c18d315a2233f5d
+MISC metadata.xml 960 BLAKE2B 6b4a60bb64814ddf030e39210ea97c613e2777a665355a5228bf30f128f1a51f958113093c071a9d4e89e40019eade71c68a5c2c32abfca5fa5f050fdb080c10 SHA512 e0c3b2fb31a353bebb1aaf752dee4a376aa8694522321d91851cd806a874ff20879ec2f1a1258c9379fcabdf5b75007900aa1073a3dd26f41070d9f02b4c042e
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index e319ff476a17..32314bce38b5 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -10,10 +10,12 @@
 		<flag name="cuda">Add GPU direct support</flag>
 		<flag name="heterogeneous">Enable features required for heterogeneous
 		platform support</flag>
-		<flag name="romio">Build the ROMIO MPI-IO component</flag>
+		<flag name="libompitrace">Enable support for contributed package libompitrace</flag>
 		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
 		<flag name="numa">Enable numactl to allow binding processes to CPUs</flag>
-		<flag name="vt">Enable bundled VampirTrace support</flag>
 		<flag name="pbs">Add support for the Portable Batch System (PBS)</flag>
+		<flag name="peruse">Enable PERUSE interface</flag>
+		<flag name="romio">Build the ROMIO MPI-IO component</flag>
+		<flag name="vt">Enable bundled VampirTrace support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
new file mode 100644
index 000000000000..0f2a2af8b199
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	local myconf=(
+		--enable-mpi-fortran=$(usex fortran all no)
+		--enable-orterun-prefix-by-default
+		--enable-pretty-print-stacktrace
+
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+
+		--with-hwloc="${EPREFIX}/usr"
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-libltdl="${EPREFIX}/usr"
+		--with-libevent="${EPREFIX}/usr"
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
+
+		$(use_enable cxx mpi-cxx)
+		$(use_enable heterogeneous)
+		$(use_enable ipv6)
+		$(use_enable libompitrace)
+		$(use_enable peruse)
+		$(use_enable romio io-romio)
+
+		$(use_with cma)
+
+		$(multilib_native_use_enable java mpi-java)
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
+
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_rm_pbs tm)
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ba0eeac953cd..eabfcc36e2a3 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a1980e9e5870..4ca5ba9d3c28 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_91.0.4472.101-1_amd64.deb 83554096 BLAKE2B 1850c6c32f8adacb638e03956554d9b09cb3963b199e08d086ea1e05c69b056b6c0f0658334460298679eb5ff99dc7401dcf4fe4bda604fced982f9eefec904d SHA512 44c2c076dcacce0e53a4710eee0fd3cad99b6b91afa50a69b74417bfa727736600af6f83e6b2f83cb11cfe19aab8e86ae750f23c6563830d0fce749ead652c66
-EBUILD google-chrome-91.0.4472.101.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
+DIST google-chrome-stable_91.0.4472.106-1_amd64.deb 83550348 BLAKE2B a4b7a60b8b1b43d93c7de8439e4fcc2ac007cd57d40525aae18cc59c2d6402dd6cacaec8a9dd5b9d20ebf808dc2b90f364b0cb9baff4ee26bb35e9cb26151fdf SHA512 dd6e897cfee09d71afe18369c37527cdd0c1dfe545fa5cc86476411537b02083aa18cee9d29de8e2543211463511f9ace28dbd9f90f0c4ccf385e6dbc2e69149
+EBUILD google-chrome-91.0.4472.106.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-91.0.4472.101.ebuild b/www-client/google-chrome/google-chrome-91.0.4472.106.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-91.0.4472.101.ebuild
rename to www-client/google-chrome/google-chrome-91.0.4472.106.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index e5238254e41c..c039dcc4a89c 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e3d8ad555f84..190dd43401fc 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_92.0.4515.51-1_amd64.deb 84050884 BLAKE2B 840abe283c1fa88873f06c294823825c2ed6295947f80d0b985688075a30bd752212249149756990c84c467fdc6f5ef400aaabad8cea4d20235f8e21b3914987 SHA512 58c5d121be68e6147dde370a0a68507b1542842b9efa4e16b1ed6d6fb3ef34bd58dea531ec24353edf8a4f06cb7bc230a6238279e512943d5d06ffadb1381d79
-DIST google-chrome-stable_91.0.4472.101-1_amd64.deb 83554096 BLAKE2B 1850c6c32f8adacb638e03956554d9b09cb3963b199e08d086ea1e05c69b056b6c0f0658334460298679eb5ff99dc7401dcf4fe4bda604fced982f9eefec904d SHA512 44c2c076dcacce0e53a4710eee0fd3cad99b6b91afa50a69b74417bfa727736600af6f83e6b2f83cb11cfe19aab8e86ae750f23c6563830d0fce749ead652c66
+DIST google-chrome-stable_91.0.4472.106-1_amd64.deb 83550348 BLAKE2B a4b7a60b8b1b43d93c7de8439e4fcc2ac007cd57d40525aae18cc59c2d6402dd6cacaec8a9dd5b9d20ebf808dc2b90f364b0cb9baff4ee26bb35e9cb26151fdf SHA512 dd6e897cfee09d71afe18369c37527cdd0c1dfe545fa5cc86476411537b02083aa18cee9d29de8e2543211463511f9ace28dbd9f90f0c4ccf385e6dbc2e69149
 DIST google-chrome-unstable_93.0.4535.3-1_amd64.deb 81522808 BLAKE2B f4be0c168c42d5f69a4da653ac439919746e8e26d0aa4a60b0433c22ccbf88d009974a8c79d78bb027c9e1451f343ab14dc6ac429ed4905cdca765a4e335fac7 SHA512 437cb8f750296bf36dc46e17ba54afd33411d55b224ff83c43340e29608de16b293284959e7a5599817a58fa7244f40795edf2d2e1ce75650118d4ac9ca696c9
-EBUILD chrome-binary-plugins-91.0.4472.101.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
+EBUILD chrome-binary-plugins-91.0.4472.106.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
 EBUILD chrome-binary-plugins-92.0.4515.51_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 EBUILD chrome-binary-plugins-93.0.4535.3_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.101.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.106.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.101.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.106.ebuild